On Sun, Nov 22 2020, Daniel Dickman <didick...@gmail.com> wrote: > This is a minor point release for wxWidgets but upstream says it is a > highly recommended upgrade bringing about 2 years of bug fixes and > improvements. > > I've compile tested about 30 consumers of wxWidgets on amd64.
That is good. It would be good to get more runtime testing though. > ok? There is a newer release upstream. https://github.com/wxWidgets/wxWidgets/releases/tag/v3.0.5.1 This release bumps the shared lib minor version (as should have been done in 3.0.5, you can check it with /usr/src/lib/check_sym) and fixes a bogus assertion in the gtk backend. https://trac.wxwidgets.org/ticket/18688 So I think we should move directly to 3.0.5.1 and bump SHARED_LIBS. Here's the diff I had ~2 weeks ago, but I didn't make progress since. Assorted improvements: - move build to python3 (only used to generate some source files) - sync WANTLIB I'm going to test a few programs built against 3.0.4 to see if the minor bump is actually correct. More tests are welcome, with programs built against 3.0.4 or 3.0.5.1. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/wxWidgets/Makefile,v retrieving revision 1.67 diff -u -p -r1.67 Makefile --- Makefile 9 Nov 2020 23:09:10 -0000 1.67 +++ Makefile 22 Nov 2020 16:05:28 -0000 @@ -3,32 +3,31 @@ COMMENT-main = C++ cross-platform GUI toolkit COMMENT-media = wxMediaCtrl class for wxWidgets -V = 3.0.4 +V = 3.0.5.1 DISTNAME = wxWidgets-${V} PKGNAME-main = wxWidgets-gtk3-${V} PKGNAME-media = wxWidgets-media-${V} -REVISION = 2 CATEGORIES = x11 MASTER_SITES = https://github.com/wxWidgets/wxWidgets/releases/download/v$V/ EXTRACT_SUFX = .tar.bz2 # XXX always keep those in sync, see SO_VERSION -SHARED_LIBS += wx_baseu-3.0 0.0 # 0.0 -SHARED_LIBS += wx_baseu_net-3.0 0.0 # 0.0 -SHARED_LIBS += wx_baseu_xml-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_adv-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_aui-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_core-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_gl-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_html-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_media-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_propgrid-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_qa-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_ribbon-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_richtext-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_stc-3.0 0.0 # 0.0 -SHARED_LIBS += wx_gtk3u_xrc-3.0 0.0 # 0.0 +SHARED_LIBS += wx_baseu-3.0 0.1 +SHARED_LIBS += wx_baseu_net-3.0 0.1 +SHARED_LIBS += wx_baseu_xml-3.0 0.1 +SHARED_LIBS += wx_gtk3u_adv-3.0 0.1 +SHARED_LIBS += wx_gtk3u_aui-3.0 0.1 +SHARED_LIBS += wx_gtk3u_core-3.0 0.1 +SHARED_LIBS += wx_gtk3u_gl-3.0 0.1 +SHARED_LIBS += wx_gtk3u_html-3.0 0.1 +SHARED_LIBS += wx_gtk3u_media-3.0 0.1 +SHARED_LIBS += wx_gtk3u_propgrid-3.0 0.1 +SHARED_LIBS += wx_gtk3u_qa-3.0 0.1 +SHARED_LIBS += wx_gtk3u_ribbon-3.0 0.1 +SHARED_LIBS += wx_gtk3u_richtext-3.0 0.1 +SHARED_LIBS += wx_gtk3u_stc-3.0 0.1 +SHARED_LIBS += wx_gtk3u_xrc-3.0 0.1 HOMEPAGE = https://www.wxwidgets.org/ @@ -41,6 +40,7 @@ MULTI_PACKAGES = -main -media COMPILER = base-clang ports-gcc base-gcc MODULES = lang/python +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} MODPY_RUNDEP = No MODPY_ADJ_FILES = src/stc/gen_iface.py @@ -55,8 +55,8 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \ WANTLIB-main += ${COMPILER_LIBCXX} GL GLU SDL2 SM X11 Xxf86vm atk-1.0 WANTLIB-main += c cairo cairo-gobject expat gdk-3 gdk_pixbuf-2.0 gio-2.0 -WANTLIB-main += glib-2.0 gobject-2.0 gthread-2.0 gtk-3 iconv intl jpeg m -WANTLIB-main += mspack notify pango-1.0 pangocairo-1.0 png tiff z +WANTLIB-main += glib-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz iconv intl +WANTLIB-main += jpeg m mspack notify pango-1.0 pangocairo-1.0 png tiff z LIB_DEPENDS-media = ${LIB_DEPENDS} \ multimedia/gstreamer1/plugins-base \ Index: distinfo =================================================================== RCS file: /cvs/ports/x11/wxWidgets/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo 2 Jan 2019 12:41:48 -0000 1.11 +++ distinfo 22 Nov 2020 16:05:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (wxWidgets-3.0.4.tar.bz2) = lhV/mI0mG3No5TQK+hoMrZQ3aPNZKcIoQfYsJbF79/A= -SIZE (wxWidgets-3.0.4.tar.bz2) = 20204622 +SHA256 (wxWidgets-3.0.5.1.tar.bz2) = RA9uc89a+yy/mvEM7I2mzdPTmY1SdZilPbhwmVJKyAc= +SIZE (wxWidgets-3.0.5.1.tar.bz2) = 19739206 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/x11/wxWidgets/patches/patch-Makefile_in,v retrieving revision 1.11 diff -u -p -r1.11 patch-Makefile_in --- patches/patch-Makefile_in 21 Jan 2019 18:55:07 -0000 1.11 +++ patches/patch-Makefile_in 22 Nov 2020 16:05:28 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2019/ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -15219,12 +15219,12 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___html +@@ -15215,12 +15215,12 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___html @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS @@ -13,12 +13,12 @@ Index: Makefile.in @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ --@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.4.0 +-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.5.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).$(SO_VERSION) @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ - @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.4.0.$(SO_SUFFIX) + @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.5.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) -@@ -15527,7 +15527,6 @@ distclean: clean +@@ -15522,7 +15522,6 @@ distclean: clean @COND_MONOLITHIC_1_SHARED_1@install_monodll: $(__monodll___depname) @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -26,7 +26,7 @@ Index: Makefile.in @COND_MONOLITHIC_1_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_1_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd)) -@@ -15562,7 +15561,6 @@ distclean: clean +@@ -15557,7 +15556,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1@install_basedll: $(__basedll___depname) @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -34,7 +34,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd)) -@@ -15599,7 +15597,6 @@ distclean: clean +@@ -15594,7 +15592,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1@install_netdll: $(__netdll___depname) @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -42,7 +42,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd)) -@@ -15636,7 +15633,6 @@ distclean: clean +@@ -15631,7 +15628,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: $(__coredll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -50,7 +50,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd)) -@@ -15673,7 +15669,6 @@ distclean: clean +@@ -15668,7 +15664,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: $(__advdll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -58,7 +58,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd)) -@@ -15710,7 +15705,6 @@ distclean: clean +@@ -15705,7 +15700,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll: $(__mediadll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -66,7 +66,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd)) -@@ -15747,7 +15741,6 @@ distclean: clean +@@ -15742,7 +15736,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll: $(__htmldll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -74,7 +74,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd)) -@@ -15784,7 +15777,6 @@ distclean: clean +@@ -15779,7 +15772,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@install_webviewdll: $(__webviewdll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -82,7 +82,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ (cd $(DESTDIR)$(libdir) ; $(__webviewdll___so_symlinks_inst_cmd)) -@@ -15821,7 +15813,6 @@ distclean: clean +@@ -15816,7 +15808,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll: $(__qadll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -90,7 +90,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@ (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd)) -@@ -15858,7 +15849,6 @@ distclean: clean +@@ -15853,7 +15844,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1@install_xmldll: $(__xmldll___depname) @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -98,7 +98,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd)) -@@ -15895,7 +15885,6 @@ distclean: clean +@@ -15890,7 +15880,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll: $(__xrcdll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -106,7 +106,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) -@@ -15932,7 +15921,6 @@ distclean: clean +@@ -15927,7 +15916,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll: $(__auidll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -114,7 +114,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd)) -@@ -15969,7 +15957,6 @@ distclean: clean +@@ -15964,7 +15952,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@install_ribbondll: $(__ribbondll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -122,7 +122,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@ (cd $(DESTDIR)$(libdir) ; $(__ribbondll___so_symlinks_inst_cmd)) -@@ -16006,7 +15993,6 @@ distclean: clean +@@ -16001,7 +15988,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@install_propgriddll: $(__propgriddll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -130,7 +130,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@ (cd $(DESTDIR)$(libdir) ; $(__propgriddll___so_symlinks_inst_cmd)) -@@ -16043,7 +16029,6 @@ distclean: clean +@@ -16038,7 +16024,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll: $(__richtextdll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -138,7 +138,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@ (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd)) -@@ -16080,7 +16065,6 @@ distclean: clean +@@ -16075,7 +16060,6 @@ distclean: clean @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll: $(__stcdll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @@ -146,7 +146,7 @@ Index: Makefile.in @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) -@@ -16117,7 +16101,6 @@ distclean: clean +@@ -16112,7 +16096,6 @@ distclean: clean @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: $(__gldll___depname) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/x11/wxWidgets/patches/patch-configure,v retrieving revision 1.5 diff -u -p -r1.5 patch-configure --- patches/patch-configure 21 Jan 2019 18:55:07 -0000 1.5 +++ patches/patch-configure 22 Nov 2020 16:05:28 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.5 2019/01/ Index: configure --- configure.orig +++ configure -@@ -40002,6 +40002,11 @@ EOF +@@ -39051,6 +39051,11 @@ fi USE_SOVERSION=1 USE_SOVERLINUX=1 USE_SOTWOSYMLINKS=1 Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/x11/wxWidgets/pkg/PLIST-main,v retrieving revision 1.6 diff -u -p -r1.6 PLIST-main --- pkg/PLIST-main 2 Jan 2019 12:41:48 -0000 1.6 +++ pkg/PLIST-main 22 Nov 2020 16:05:28 -0000 @@ -765,9 +765,10 @@ lib/wx/include/gtk3-unicode-3.0/wx/setup share/aclocal/wxwin.m4 share/bakefile/ share/bakefile/presets/ +${MODPY_COMMENT}share/bakefile/presets/${MODPY_PYCACHE}/ +share/bakefile/presets/${MODPY_PYCACHE}wx_presets.${MODPY_PYC_MAGIC_TAG}pyc share/bakefile/presets/wx.bkl share/bakefile/presets/wx_presets.py -share/bakefile/presets/wx_presets.pyc share/bakefile/presets/wx_unix.bkl share/bakefile/presets/wx_win32.bkl share/bakefile/presets/wx_xrc.bkl -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
