From ff9b39f22cda90fbacb312fc5be3fe7d83b04350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Bartoletti?= Date: Sat, 15 Oct 2022 21:19:48 +0200 Subject: [PATCH] lang/erlang-wx: use wx 3.2 PR: 265093 --- lang/erlang-wx/Makefile | 6 ++---- .../files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp | 11 +++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 lang/erlang-wx/files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile index ef132e9e472d..5c3972371a3b 100644 --- a/lang/erlang-wx/Makefile +++ b/lang/erlang-wx/Makefile @@ -1,7 +1,7 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- DISTVERSION= 24.3.4.6 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel PKGNAMESUFFIX= -wx @@ -21,9 +21,7 @@ USE_GITHUB= yes GH_PROJECT= otp USE_GL= gl glu USE_PERL5= build -USE_WX= 3.1+ - -WX_COMPS= wx +USE_WX= 3.2+ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-threads \ diff --git a/lang/erlang-wx/files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp b/lang/erlang-wx/files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp new file mode 100644 index 000000000000..11f2b1475b49 --- /dev/null +++ b/lang/erlang-wx/files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp @@ -0,0 +1,11 @@ +--- lib/wx/c_src/gen/wxe_wrapper_7.cpp.orig 2022-10-15 17:50:46 UTC ++++ lib/wx/c_src/gen/wxe_wrapper_7.cpp +@@ -2339,7 +2339,7 @@ void wxToolBar_AddTool_4(WxeApp *app, wxeMemEnv *memen + } else Badarg("Options"); + }; + if(!This) throw wxe_badarg("This"); +- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(toolId,label,*bitmap,shortHelp,kind); ++ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(toolId,label,(wxBitmapBundle)*bitmap,shortHelp,kind); + wxeReturn rt = wxeReturn(memenv, Ecmd.caller, true); + rt.send( rt.make_ref(app->getRef((void *)Result,memenv), "wx")); +