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,80 +1,78 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- DISTVERSION= 24.3.4.6 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel PKGNAMESUFFIX= -wx DIST_SUBDIR= erlang MAINTAINER= erlang@FreeBSD.org COMMENT= Erlang bindings for wxWindows WWW= https://www.erlang.org/ LICENSE= APACHE20 BUILD_DEPENDS= erlang>=24.0:lang/erlang RUN_DEPENDS= erlang>=24.0:lang/erlang USES= autoreconf:build gl gmake perl5 xorg 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 \ --with-wx-config=${WX_CONFIG} \ --without-javac \ --without-odbc MAKE_JOBS_UNSAFE= yes PLIST_SUB= DEBUGGER_VERSION=${DEBUGGER_VERSION} \ ET_VERSION=${ET_VERSION} \ OBSERVER_VERSION=${OBSERVER_VERSION} \ WX_VERSION=${WX_VERSION} DEBUGGER_VERSION= 5.2.1 ET_VERSION= 1.6.5 OBSERVER_VERSION= 2.11.1 WX_VERSION= 2.1.4 WX_APPS= wx debugger et observer pre-configure: @if [ ! $$(${CAT} ${WRKSRC}/lib/debugger/vsn.mk | ${GREP} -E "DEBUGGER_VSN *=" | ${CUT} -w -f3) = ${DEBUGGER_VERSION} ]; then \ ${ECHO_MSG} "===> DEBUGGER_VERSION (${DEBUGGER_VERSION}) in Makefile does not match value in lib/debugger/vsn.mk"; exit 1; \ fi @if [ ! $$(${CAT} ${WRKSRC}/lib/et/vsn.mk | ${GREP} -E "ET_VSN *=" | ${CUT} -w -f3) = ${ET_VERSION} ]; then \ ${ECHO_MSG} "===> ET_VERSION (${ET_VERSION}) in Makefile does not match value in lib/et/vsn.mk"; exit 1; \ fi @if [ ! $$(${CAT} ${WRKSRC}/lib/observer/vsn.mk | ${GREP} -E "OBSERVER_VSN *=" | ${CUT} -w -f3) = ${OBSERVER_VERSION} ]; then \ ${ECHO_MSG} "===> OBSERVER_VERSION (${OBSERVER_VERSION}) in Makefile does not match value in lib/observer/vsn.mk"; exit 1; \ fi @if [ ! $$(${CAT} ${WRKSRC}/lib/wx/vsn.mk | ${GREP} -E "WX_VSN *=" | ${CUT} -w -f3) = ${WX_VERSION} ]; then \ ${ECHO_MSG} "===> WX_VERSION (${WX_VERSION}) in Makefile does not match value in lib/wx/vsn.mk"; exit 1; \ fi do-build: .for app in wx debugger et observer cd ${WRKSRC}/lib/${app} && ${SETENV} ERL_LIBS=${WRKSRC}/lib ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET} .endfor ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/erl_gl.so ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/wxe_driver.so ${MV} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/*.so ${WRKSRC}/lib/wx/priv ${RMDIR} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET} do-install: .for app in ${WX_APPS} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${app}-$$(${CUT} -w -f3 ${WRKSRC}/lib/${app}/vsn.mk) ${FIND} ${WRKSRC}/lib/${app} -type d -empty -delete .for dir in src include priv ebin cd ${WRKSRC}/lib/${app} && if [ -d ${dir} ]; then \ ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${app}-$$(${CUT} -w -f3 vsn.mk); \ fi .endfor .endfor .include 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")); +