Thu Oct 6 19:35:04 2022 UTC ()
wxGTK32: updated to 3.2.1

3.2.1

Coming soon after 3.2.0, this is mostly a bug fix release, with just one noteworthy new feature: the addition of wxFileDialog::AddShortcut() function. However it fixes some important regressions and other problems:

Fix crash in applications calling g_log_set_writer_func() with recent glib.
Several fixes to alpha channel handling in wxMSW bitmaps.
Generate key and focus events for wxSearchCtrl in wxOSX.
Fix creating wxRadioBox without any items in wxOSX.
Fix regression with AUI floating pane positioning.
Avoid new warnings given by gcc 12.
Fix building with MSVS 2022 standard-conforming preprocessor.
Work around MSVS 2022 optimizer bug that broke wxImage resizing.
NetBSD build fixes.


(adam)
diff -r1.17 -r1.18 pkgsrc/x11/wxGTK32/Makefile
diff -r1.5 -r1.6 pkgsrc/x11/wxGTK32/PLIST
diff -r1.2 -r1.3 pkgsrc/x11/wxGTK32/PLIST.Darwin
diff -r1.2 -r1.3 pkgsrc/x11/wxGTK32/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/x11/wxGTK32/distinfo
diff -r1.2 -r0 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_init.cmake
diff -r1.2 -r0 pkgsrc/x11/wxGTK32/patches/patch-configure
diff -r1.2 -r0 pkgsrc/x11/wxGTK32/patches/patch-configure.in
diff -r1.2 -r1.3 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake
diff -r1.2 -r1.3 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_lib_base_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_setup.cmake
diff -r1.1 -r0 pkgsrc/x11/wxGTK32/patches/patch-src_unix_dialup.cpp
cvs diff -r1.17 -r1.18 pkgsrc/x11/wxGTK32/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK32/Makefile 2022/10/02 11:33:43 1.17
+++ pkgsrc/x11/wxGTK32/Makefile 2022/10/06 19:35:04 1.18
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.17 2022/10/02 11:33:43 rhialto Exp $ 1# $NetBSD: Makefile,v 1.18 2022/10/06 19:35:04 adam Exp $
2 2
3DISTNAME= wxWidgets-3.2.0 3DISTNAME= wxWidgets-3.2.1
4PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK32/} 4PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK32/}
5PKGREVISION= 7 
6CATEGORIES= x11 5CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/}
8GITHUB_PROJECT= wxWidgets 7GITHUB_PROJECT= wxWidgets
9GITHUB_RELEASE= v${PKGVERSION_NOREV} 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
10EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
11 10
12MAINTAINER= dbj@NetBSD.org 11MAINTAINER= dbj@NetBSD.org
13HOMEPAGE= https://www.wxwidgets.org/ 12HOMEPAGE= https://www.wxwidgets.org/
14COMMENT= Cross-platform wxWidgets GUI library (3.2 stable branch) 13COMMENT= Cross-platform wxWidgets GUI library (3.2 stable branch)
15# LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows 14# LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows
16LICENSE= gnu-lgpl-v2 15LICENSE= gnu-lgpl-v2
17 16
18USE_TOOLS+= pkg-config msgfmt 17USE_TOOLS+= pkg-config msgfmt
@@ -105,27 +104,27 @@ SUBST_VARS.fix-paths= PREFIX @@ -105,27 +104,27 @@ SUBST_VARS.fix-paths= PREFIX
105# not needed, but configure stops if it's not found 104# not needed, but configure stops if it's not found
106.include "../../graphics/glu/buildlink3.mk" 105.include "../../graphics/glu/buildlink3.mk"
107. endif 106. endif
108.endif 107.endif
109 108
110post-build: 109post-build:
111 ${RM} ${WRKSRC}/locale/*.mo 110 ${RM} ${WRKSRC}/locale/*.mo
112 # We could do this: 111 # We could do this:
113 # ${GMAKE} -C ${WRKSRC}/locale MSGFMT=${TOOLS_PATH.msgfmt:Q} allmo 112 # ${GMAKE} -C ${WRKSRC}/locale MSGFMT=${TOOLS_PATH.msgfmt:Q} allmo
114 # But that seems to bring an unnecessary build dependency on gmake 113 # But that seems to bring an unnecessary build dependency on gmake
115 # So instead, we do: 114 # So instead, we do:
116 for f in ${WRKSRC}/locale/*.po; do \ 115 for f in ${WRKSRC}/locale/*.po; do \
117 lang=`basename $${f} .po`; \ 116 lang=`basename $${f} .po`; \
118 ${TOOLS_PATH.msgfmt:Q} -c -o "${WRKSRC}/locale/$${lang}.mo" "$${f}"; \ 117 ${TOOLS_PATH.msgfmt} -c -o "${WRKSRC}/locale/$${lang}.mo" "$${f}"; \
119 done 118 done
120 119
121post-install: 120post-install:
122 for f in ${WRKSRC}/locale/*.mo; do \ 121 for f in ${WRKSRC}/locale/*.mo; do \
123 lang=`basename $${f} .mo`; \ 122 lang=`basename $${f} .mo`; \
124 ${INSTALL_DATA_DIR} "${DESTDIR}/${PREFIX}/share/wx-3.2/locale/$${lang}/LC_MESSAGES"; \ 123 ${INSTALL_DATA_DIR} "${DESTDIR}/${PREFIX}/share/wx-3.2/locale/$${lang}/LC_MESSAGES"; \
125 ${INSTALL_DATA} "$${f}" "${DESTDIR}/${PREFIX}/share/wx-3.2/locale/$${lang}/LC_MESSAGES/wxstd.mo"; \ 124 ${INSTALL_DATA} "$${f}" "${DESTDIR}/${PREFIX}/share/wx-3.2/locale/$${lang}/LC_MESSAGES/wxstd.mo"; \
126 done 125 done
127 ${INSTALL_DATA} ${WRKSRC}/wxwin.m4 ${DESTDIR}${PREFIX}/share/wx-3.2/aclocal/wxwin.m4 126 ${INSTALL_DATA} ${WRKSRC}/wxwin.m4 ${DESTDIR}${PREFIX}/share/wx-3.2/aclocal/wxwin.m4
128 ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${PREFIX}/${DOCDIR} 127 ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${PREFIX}/${DOCDIR}
129 ${INSTALL_DATA} ${WRKSRC}/docs/lgpl.txt ${DESTDIR}${PREFIX}/${DOCDIR} 128 ${INSTALL_DATA} ${WRKSRC}/docs/lgpl.txt ${DESTDIR}${PREFIX}/${DOCDIR}
130 ${INSTALL_DATA} ${WRKSRC}/docs/changes.txt ${DESTDIR}${PREFIX}/${DOCDIR} 129 ${INSTALL_DATA} ${WRKSRC}/docs/changes.txt ${DESTDIR}${PREFIX}/${DOCDIR}
131 ${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${DESTDIR}${PREFIX}/${DOCDIR} 130 ${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${DESTDIR}${PREFIX}/${DOCDIR}
cvs diff -r1.5 -r1.6 pkgsrc/x11/wxGTK32/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK32/PLIST 2022/08/08 10:39:46 1.5
+++ pkgsrc/x11/wxGTK32/PLIST 2022/10/06 19:35:04 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2022/08/08 10:39:46 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2022/10/06 19:35:04 adam Exp $
2bin/wx-config-3.2 2bin/wx-config-3.2
3bin/wxrc-3.2 3bin/wxrc-3.2
4include/wx-3.2/wx/aboutdlg.h 4include/wx-3.2/wx/aboutdlg.h
5include/wx-3.2/wx/accel.h 5include/wx-3.2/wx/accel.h
6include/wx-3.2/wx/access.h 6include/wx-3.2/wx/access.h
7include/wx-3.2/wx/activityindicator.h 7include/wx-3.2/wx/activityindicator.h
8include/wx-3.2/wx/addremovectrl.h 8include/wx-3.2/wx/addremovectrl.h
9include/wx-3.2/wx/affinematrix2d.h 9include/wx-3.2/wx/affinematrix2d.h
10include/wx-3.2/wx/affinematrix2dbase.h 10include/wx-3.2/wx/affinematrix2dbase.h
11include/wx-3.2/wx/afterstd.h 11include/wx-3.2/wx/afterstd.h
12include/wx-3.2/wx/anidecod.h 12include/wx-3.2/wx/anidecod.h
13include/wx-3.2/wx/animate.h 13include/wx-3.2/wx/animate.h
14include/wx-3.2/wx/animdecod.h 14include/wx-3.2/wx/animdecod.h
@@ -629,72 +629,72 @@ include/wx-3.2/wx/xrc/xmlres.h @@ -629,72 +629,72 @@ include/wx-3.2/wx/xrc/xmlres.h
629include/wx-3.2/wx/xrc/xmlreshandler.h 629include/wx-3.2/wx/xrc/xmlreshandler.h
630include/wx-3.2/wx/xti.h 630include/wx-3.2/wx/xti.h
631include/wx-3.2/wx/xti2.h 631include/wx-3.2/wx/xti2.h
632include/wx-3.2/wx/xtictor.h 632include/wx-3.2/wx/xtictor.h
633include/wx-3.2/wx/xtihandler.h 633include/wx-3.2/wx/xtihandler.h
634include/wx-3.2/wx/xtiprop.h 634include/wx-3.2/wx/xtiprop.h
635include/wx-3.2/wx/xtistrm.h 635include/wx-3.2/wx/xtistrm.h
636include/wx-3.2/wx/xtitypes.h 636include/wx-3.2/wx/xtitypes.h
637include/wx-3.2/wx/xtixml.h 637include/wx-3.2/wx/xtixml.h
638include/wx-3.2/wx/zipstrm.h 638include/wx-3.2/wx/zipstrm.h
639include/wx-3.2/wx/zstream.h 639include/wx-3.2/wx/zstream.h
640lib/libwx_baseu-3.2.so 640lib/libwx_baseu-3.2.so
641lib/libwx_baseu-3.2.so.0 641lib/libwx_baseu-3.2.so.0
642lib/libwx_baseu-3.2.so.0.0.0 642lib/libwx_baseu-3.2.so.0.1.0
643lib/libwx_baseu_net-3.2.so 643lib/libwx_baseu_net-3.2.so
644lib/libwx_baseu_net-3.2.so.0 644lib/libwx_baseu_net-3.2.so.0
645lib/libwx_baseu_net-3.2.so.0.0.0 645lib/libwx_baseu_net-3.2.so.0.1.0
646lib/libwx_baseu_xml-3.2.so 646lib/libwx_baseu_xml-3.2.so
647lib/libwx_baseu_xml-3.2.so.0 647lib/libwx_baseu_xml-3.2.so.0
648lib/libwx_baseu_xml-3.2.so.0.0.0 648lib/libwx_baseu_xml-3.2.so.0.1.0
649lib/libwx_gtk3u_adv-3.2.so 649lib/libwx_gtk3u_adv-3.2.so
650lib/libwx_gtk3u_adv-3.2.so.0 650lib/libwx_gtk3u_adv-3.2.so.0
651lib/libwx_gtk3u_adv-3.2.so.0.0.0 651lib/libwx_gtk3u_adv-3.2.so.0.1.0
652lib/libwx_gtk3u_aui-3.2.so 652lib/libwx_gtk3u_aui-3.2.so
653lib/libwx_gtk3u_aui-3.2.so.0 653lib/libwx_gtk3u_aui-3.2.so.0
654lib/libwx_gtk3u_aui-3.2.so.0.0.0 654lib/libwx_gtk3u_aui-3.2.so.0.1.0
655lib/libwx_gtk3u_core-3.2.so 655lib/libwx_gtk3u_core-3.2.so
656lib/libwx_gtk3u_core-3.2.so.0 656lib/libwx_gtk3u_core-3.2.so.0
657lib/libwx_gtk3u_core-3.2.so.0.0.0 657lib/libwx_gtk3u_core-3.2.so.0.1.0
658lib/libwx_gtk3u_gl-3.2.so 658lib/libwx_gtk3u_gl-3.2.so
659lib/libwx_gtk3u_gl-3.2.so.0 659lib/libwx_gtk3u_gl-3.2.so.0
660lib/libwx_gtk3u_gl-3.2.so.0.0.0 660lib/libwx_gtk3u_gl-3.2.so.0.1.0
661lib/libwx_gtk3u_html-3.2.so 661lib/libwx_gtk3u_html-3.2.so
662lib/libwx_gtk3u_html-3.2.so.0 662lib/libwx_gtk3u_html-3.2.so.0
663lib/libwx_gtk3u_html-3.2.so.0.0.0 663lib/libwx_gtk3u_html-3.2.so.0.1.0
664lib/libwx_gtk3u_media-3.2.so 664lib/libwx_gtk3u_media-3.2.so
665lib/libwx_gtk3u_media-3.2.so.0 665lib/libwx_gtk3u_media-3.2.so.0
666lib/libwx_gtk3u_media-3.2.so.0.0.0 666lib/libwx_gtk3u_media-3.2.so.0.1.0
667lib/libwx_gtk3u_propgrid-3.2.so 667lib/libwx_gtk3u_propgrid-3.2.so
668lib/libwx_gtk3u_propgrid-3.2.so.0 668lib/libwx_gtk3u_propgrid-3.2.so.0
669lib/libwx_gtk3u_propgrid-3.2.so.0.0.0 669lib/libwx_gtk3u_propgrid-3.2.so.0.1.0
670lib/libwx_gtk3u_qa-3.2.so 670lib/libwx_gtk3u_qa-3.2.so
671lib/libwx_gtk3u_qa-3.2.so.0 671lib/libwx_gtk3u_qa-3.2.so.0
672lib/libwx_gtk3u_qa-3.2.so.0.0.0 672lib/libwx_gtk3u_qa-3.2.so.0.1.0
673lib/libwx_gtk3u_ribbon-3.2.so 673lib/libwx_gtk3u_ribbon-3.2.so
674lib/libwx_gtk3u_ribbon-3.2.so.0 674lib/libwx_gtk3u_ribbon-3.2.so.0
675lib/libwx_gtk3u_ribbon-3.2.so.0.0.0 675lib/libwx_gtk3u_ribbon-3.2.so.0.1.0
676lib/libwx_gtk3u_richtext-3.2.so 676lib/libwx_gtk3u_richtext-3.2.so
677lib/libwx_gtk3u_richtext-3.2.so.0 677lib/libwx_gtk3u_richtext-3.2.so.0
678lib/libwx_gtk3u_richtext-3.2.so.0.0.0 678lib/libwx_gtk3u_richtext-3.2.so.0.1.0
679lib/libwx_gtk3u_stc-3.2.so 679lib/libwx_gtk3u_stc-3.2.so
680lib/libwx_gtk3u_stc-3.2.so.0 680lib/libwx_gtk3u_stc-3.2.so.0
681lib/libwx_gtk3u_stc-3.2.so.0.0.0 681lib/libwx_gtk3u_stc-3.2.so.0.1.0
682lib/libwx_gtk3u_webview-3.2.so 682lib/libwx_gtk3u_webview-3.2.so
683lib/libwx_gtk3u_webview-3.2.so.0 683lib/libwx_gtk3u_webview-3.2.so.0
684lib/libwx_gtk3u_webview-3.2.so.0.0.0 684lib/libwx_gtk3u_webview-3.2.so.0.1.0
685lib/libwx_gtk3u_xrc-3.2.so 685lib/libwx_gtk3u_xrc-3.2.so
686lib/libwx_gtk3u_xrc-3.2.so.0 686lib/libwx_gtk3u_xrc-3.2.so.0
687lib/libwx_gtk3u_xrc-3.2.so.0.0.0 687lib/libwx_gtk3u_xrc-3.2.so.0.1.0
688libexec/wx-3.2/wx-config 688libexec/wx-3.2/wx-config
689libexec/wx-3.2/wxrc 689libexec/wx-3.2/wxrc
690libexec/wx-3.2/wxrc-3.2 690libexec/wx-3.2/wxrc-3.2
691share/wx-3.2/aclocal/wxwin.m4 691share/wx-3.2/aclocal/wxwin.m4
692share/wx-3.2/doc/wxWidgets/changes.txt 692share/wx-3.2/doc/wxWidgets/changes.txt
693share/wx-3.2/doc/wxWidgets/lgpl.txt 693share/wx-3.2/doc/wxWidgets/lgpl.txt
694share/wx-3.2/doc/wxWidgets/licence.txt 694share/wx-3.2/doc/wxWidgets/licence.txt
695share/wx-3.2/doc/wxWidgets/readme.txt 695share/wx-3.2/doc/wxWidgets/readme.txt
696share/wx-3.2/locale/af/LC_MESSAGES/wxstd.mo 696share/wx-3.2/locale/af/LC_MESSAGES/wxstd.mo
697share/wx-3.2/locale/an/LC_MESSAGES/wxstd.mo 697share/wx-3.2/locale/an/LC_MESSAGES/wxstd.mo
698share/wx-3.2/locale/ar/LC_MESSAGES/wxstd.mo 698share/wx-3.2/locale/ar/LC_MESSAGES/wxstd.mo
699share/wx-3.2/locale/ca/LC_MESSAGES/wxstd.mo 699share/wx-3.2/locale/ca/LC_MESSAGES/wxstd.mo
700share/wx-3.2/locale/ca@valencia/LC_MESSAGES/wxstd.mo 700share/wx-3.2/locale/ca@valencia/LC_MESSAGES/wxstd.mo
cvs diff -r1.2 -r1.3 pkgsrc/x11/wxGTK32/PLIST.Darwin (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK32/PLIST.Darwin 2022/08/08 10:39:46 1.2
+++ pkgsrc/x11/wxGTK32/PLIST.Darwin 2022/10/06 19:35:04 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.Darwin,v 1.2 2022/08/08 10:39:46 wiz Exp $ 1@comment $NetBSD: PLIST.Darwin,v 1.3 2022/10/06 19:35:04 adam Exp $
2include/wx-3.2/wx/generic/clrpickerg.h 2include/wx-3.2/wx/generic/clrpickerg.h
3include/wx-3.2/wx/generic/collpaneg.h 3include/wx-3.2/wx/generic/collpaneg.h
4include/wx-3.2/wx/generic/colrdlgg.h 4include/wx-3.2/wx/generic/colrdlgg.h
5include/wx-3.2/wx/generic/dirdlgg.h 5include/wx-3.2/wx/generic/dirdlgg.h
6include/wx-3.2/wx/generic/filedlgg.h 6include/wx-3.2/wx/generic/filedlgg.h
7include/wx-3.2/wx/generic/fontdlgg.h 7include/wx-3.2/wx/generic/fontdlgg.h
8include/wx-3.2/wx/generic/fontpickerg.h 8include/wx-3.2/wx/generic/fontpickerg.h
9include/wx-3.2/wx/generic/region.h 9include/wx-3.2/wx/generic/region.h
10include/wx-3.2/wx/osx/accel.h 10include/wx-3.2/wx/osx/accel.h
11include/wx-3.2/wx/osx/activityindicator.h 11include/wx-3.2/wx/osx/activityindicator.h
12include/wx-3.2/wx/osx/anybutton.h 12include/wx-3.2/wx/osx/anybutton.h
13include/wx-3.2/wx/osx/app.h 13include/wx-3.2/wx/osx/app.h
14include/wx-3.2/wx/osx/appprogress.h 14include/wx-3.2/wx/osx/appprogress.h
@@ -103,54 +103,54 @@ include/wx-3.2/wx/osx/stattext.h @@ -103,54 +103,54 @@ include/wx-3.2/wx/osx/stattext.h
103include/wx-3.2/wx/osx/statusbr.h 103include/wx-3.2/wx/osx/statusbr.h
104include/wx-3.2/wx/osx/taskbarosx.h 104include/wx-3.2/wx/osx/taskbarosx.h
105include/wx-3.2/wx/osx/textctrl.h 105include/wx-3.2/wx/osx/textctrl.h
106include/wx-3.2/wx/osx/textentry.h 106include/wx-3.2/wx/osx/textentry.h
107include/wx-3.2/wx/osx/tglbtn.h 107include/wx-3.2/wx/osx/tglbtn.h
108include/wx-3.2/wx/osx/timectrl.h 108include/wx-3.2/wx/osx/timectrl.h
109include/wx-3.2/wx/osx/toolbar.h 109include/wx-3.2/wx/osx/toolbar.h
110include/wx-3.2/wx/osx/tooltip.h 110include/wx-3.2/wx/osx/tooltip.h
111include/wx-3.2/wx/osx/toplevel.h 111include/wx-3.2/wx/osx/toplevel.h
112include/wx-3.2/wx/osx/uma.h 112include/wx-3.2/wx/osx/uma.h
113include/wx-3.2/wx/osx/webview_webkit.h 113include/wx-3.2/wx/osx/webview_webkit.h
114include/wx-3.2/wx/osx/webviewhistoryitem_webkit.h 114include/wx-3.2/wx/osx/webviewhistoryitem_webkit.h
115include/wx-3.2/wx/osx/window.h 115include/wx-3.2/wx/osx/window.h
116lib/libwx_osx_cocoau_adv-3.2.0.0.0.dylib 116lib/libwx_osx_cocoau_adv-3.2.so
117lib/libwx_osx_cocoau_adv-3.2.0.dylib 117lib/libwx_osx_cocoau_adv-3.2.so.0
118lib/libwx_osx_cocoau_adv-3.2.dylib 118lib/libwx_osx_cocoau_adv-3.2.so.0.1.0
119lib/libwx_osx_cocoau_aui-3.2.0.0.0.dylib 119lib/libwx_osx_cocoau_aui-3.2.so
120lib/libwx_osx_cocoau_aui-3.2.0.dylib 120lib/libwx_osx_cocoau_aui-3.2.so.0
121lib/libwx_osx_cocoau_aui-3.2.dylib 121lib/libwx_osx_cocoau_aui-3.2.so.0.1.0
122lib/libwx_osx_cocoau_core-3.2.0.0.0.dylib 122lib/libwx_osx_cocoau_core-3.2.so
123lib/libwx_osx_cocoau_core-3.2.0.dylib 123lib/libwx_osx_cocoau_core-3.2.so.0
124lib/libwx_osx_cocoau_core-3.2.dylib 124lib/libwx_osx_cocoau_core-3.2.so.0.1.0
125lib/libwx_osx_cocoau_gl-3.2.0.0.0.dylib 125lib/libwx_osx_cocoau_gl-3.2.so
126lib/libwx_osx_cocoau_gl-3.2.0.dylib 126lib/libwx_osx_cocoau_gl-3.2.so.0
127lib/libwx_osx_cocoau_gl-3.2.dylib 127lib/libwx_osx_cocoau_gl-3.2.so.0.1.0
128lib/libwx_osx_cocoau_html-3.2.0.0.0.dylib 128lib/libwx_osx_cocoau_html-3.2.so
129lib/libwx_osx_cocoau_html-3.2.0.dylib 129lib/libwx_osx_cocoau_html-3.2.so.0
130lib/libwx_osx_cocoau_html-3.2.dylib 130lib/libwx_osx_cocoau_html-3.2.so.0.1.0
131lib/libwx_osx_cocoau_media-3.2.0.0.0.dylib 131lib/libwx_osx_cocoau_media-3.2.so
132lib/libwx_osx_cocoau_media-3.2.0.dylib 132lib/libwx_osx_cocoau_media-3.2.so.0
133lib/libwx_osx_cocoau_media-3.2.dylib 133lib/libwx_osx_cocoau_media-3.2.so.0.1.0
134lib/libwx_osx_cocoau_propgrid-3.2.0.0.0.dylib 134lib/libwx_osx_cocoau_propgrid-3.2.so
135lib/libwx_osx_cocoau_propgrid-3.2.0.dylib 135lib/libwx_osx_cocoau_propgrid-3.2.so.0
136lib/libwx_osx_cocoau_propgrid-3.2.dylib 136lib/libwx_osx_cocoau_propgrid-3.2.so.0.1.0
137lib/libwx_osx_cocoau_qa-3.2.0.0.0.dylib 137lib/libwx_osx_cocoau_qa-3.2.so
138lib/libwx_osx_cocoau_qa-3.2.0.dylib 138lib/libwx_osx_cocoau_qa-3.2.so.0
139lib/libwx_osx_cocoau_qa-3.2.dylib 139lib/libwx_osx_cocoau_qa-3.2.so.0.1.0
140lib/libwx_osx_cocoau_ribbon-3.2.0.0.0.dylib 140lib/libwx_osx_cocoau_ribbon-3.2.so
141lib/libwx_osx_cocoau_ribbon-3.2.0.dylib 141lib/libwx_osx_cocoau_ribbon-3.2.so.0
142lib/libwx_osx_cocoau_ribbon-3.2.dylib 142lib/libwx_osx_cocoau_ribbon-3.2.so.0.1.0
143lib/libwx_osx_cocoau_richtext-3.2.0.0.0.dylib 143lib/libwx_osx_cocoau_richtext-3.2.so
144lib/libwx_osx_cocoau_richtext-3.2.0.dylib 144lib/libwx_osx_cocoau_richtext-3.2.so.0
145lib/libwx_osx_cocoau_richtext-3.2.dylib 145lib/libwx_osx_cocoau_richtext-3.2.so.0.1.0
146lib/libwx_osx_cocoau_stc-3.2.0.0.0.dylib 146lib/libwx_osx_cocoau_stc-3.2.so
147lib/libwx_osx_cocoau_stc-3.2.0.dylib 147lib/libwx_osx_cocoau_stc-3.2.so.0
148lib/libwx_osx_cocoau_stc-3.2.dylib 148lib/libwx_osx_cocoau_stc-3.2.so.0.1.0
149lib/libwx_osx_cocoau_webview-3.2.0.0.0.dylib 149lib/libwx_osx_cocoau_webview-3.2.so
150lib/libwx_osx_cocoau_webview-3.2.0.dylib 150lib/libwx_osx_cocoau_webview-3.2.so.0
151lib/libwx_osx_cocoau_webview-3.2.dylib 151lib/libwx_osx_cocoau_webview-3.2.so.0.1.0
152lib/libwx_osx_cocoau_xrc-3.2.0.0.0.dylib 152lib/libwx_osx_cocoau_xrc-3.2.so
153lib/libwx_osx_cocoau_xrc-3.2.0.dylib 153lib/libwx_osx_cocoau_xrc-3.2.so.0
154lib/libwx_osx_cocoau_xrc-3.2.dylib 154lib/libwx_osx_cocoau_xrc-3.2.so.0.1.0
155lib/wx/config/osx_cocoa-unicode-3.2 155lib/wx/config/osx_cocoa-unicode-3.2
156lib/wx/include/osx_cocoa-unicode-3.2/wx/setup.h 156lib/wx/include/osx_cocoa-unicode-3.2/wx/setup.h
cvs diff -r1.2 -r1.3 pkgsrc/x11/wxGTK32/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK32/buildlink3.mk 2022/08/11 05:09:34 1.2
+++ pkgsrc/x11/wxGTK32/buildlink3.mk 2022/10/06 19:35:04 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.2 2022/08/11 05:09:34 gutteridge Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2022/10/06 19:35:04 adam Exp $
2 2
3BUILDLINK_TREE+= wxGTK32 3BUILDLINK_TREE+= wxGTK32
4 4
5.if !defined(WXGTK32_BUILDLINK3_MK) 5.if !defined(WXGTK32_BUILDLINK3_MK)
6WXGTK32_BUILDLINK3_MK:= 6WXGTK32_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.wxGTK32+= wxGTK32>=3.2 8BUILDLINK_API_DEPENDS.wxGTK32+= wxGTK32>=3.2
9BUILDLINK_ABI_DEPENDS.wxGTK32?= wxGTK32>=3.2.0nb5 9BUILDLINK_ABI_DEPENDS.wxGTK32+= wxGTK32>=3.2.0nb5
10BUILDLINK_PKGSRCDIR.wxGTK32?= ../../x11/wxGTK32 10BUILDLINK_PKGSRCDIR.wxGTK32?= ../../x11/wxGTK32
11 11
12BUILDLINK_INCDIRS.wxGTK32+= include/wx-3.2 12BUILDLINK_INCDIRS.wxGTK32+= include/wx-3.2
13PREPEND_PATH+= ${PREFIX}/libexec/wx-3.2 13PREPEND_PATH+= ${PREFIX}/libexec/wx-3.2
14CONFIGURE_ARGS+= --with-wx-version=3.2 14CONFIGURE_ARGS+= --with-wx-version=3.2
15CONFIGURE_ARGS+= --with-wx-config=${PREFIX}/libexec/wx-3.2/wx-config 15CONFIGURE_ARGS+= --with-wx-config=${PREFIX}/libexec/wx-3.2/wx-config
16 16
17pkgbase := wxGTK32 17pkgbase := wxGTK32
18.include "../../mk/pkg-build-options.mk" 18.include "../../mk/pkg-build-options.mk"
19 19
20.include "../../devel/gettext-lib/buildlink3.mk" 20.include "../../devel/gettext-lib/buildlink3.mk"
21.include "../../devel/zlib/buildlink3.mk" 21.include "../../devel/zlib/buildlink3.mk"
22.include "../../mk/jpeg.buildlink3.mk" 22.include "../../mk/jpeg.buildlink3.mk"
cvs diff -r1.6 -r1.7 pkgsrc/x11/wxGTK32/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK32/distinfo 2022/08/10 05:19:57 1.6
+++ pkgsrc/x11/wxGTK32/distinfo 2022/10/06 19:35:04 1.7
@@ -1,15 +1,9 @@ @@ -1,15 +1,9 @@
1$NetBSD: distinfo,v 1.6 2022/08/10 05:19:57 dbj Exp $ 1$NetBSD: distinfo,v 1.7 2022/10/06 19:35:04 adam Exp $
2 2
3BLAKE2s (wxWidgets-3.2.0.tar.bz2) = 4029147a8e77a22e0379eeda11bc26f8fee998862aaa52819adf16a8ed4860ea 3BLAKE2s (wxWidgets-3.2.1.tar.bz2) = 0e411f31a9d91a87187f32b56eeba70298d923f0b5de0ebd125c70b7bbd0e33c
4SHA512 (wxWidgets-3.2.0.tar.bz2) = e55e7c5ac7abcacf2ecff7c22e367db17ff5a077d3d5d2aa7589e8ba7cc6695cfa48c0f00bcfdffeda8dc4f974f97a857fb61b4b300a724f7687d710fbb23967 4SHA512 (wxWidgets-3.2.1.tar.bz2) = d0294788891014672d8eb4501ae257598972407b53f38471e4f11dd20f517d0145d510c5bce006b09c5d63113fed844bdf6124b3c80453c1d37b402abc89202b
5Size (wxWidgets-3.2.0.tar.bz2) = 25296814 bytes 5Size (wxWidgets-3.2.1.tar.bz2) = 27266651 bytes
6SHA1 (patch-build_cmake_config.cmake) = 5d5b37a7a0811ac7732db5cc071813784ee3d3d6 6SHA1 (patch-build_cmake_config.cmake) = 5d5b37a7a0811ac7732db5cc071813784ee3d3d6
7SHA1 (patch-build_cmake_init.cmake) = 341f632aa7062af4c5bc4ca2695f59d2b7254ede 7SHA1 (patch-build_cmake_install.cmake) = b14a0e4ddd52fd5d73c4453fa35e1db67c1c0806
8SHA1 (patch-build_cmake_install.cmake) = 4b228cbab621ef98d93ccd2c338b7e0e9d53a9ad 8SHA1 (patch-build_cmake_utils_CMakeLists.txt) = dcf6165e260ed56a9908e9e3095c02d0537a4364
9SHA1 (patch-build_cmake_lib_base_CMakeLists.txt) = bec7be2f64bb4629a60d2b4f169e8feb215408e3 
10SHA1 (patch-build_cmake_setup.cmake) = 277ae3c5bf4f04d057402f0b626d09d1e9749ca8 
11SHA1 (patch-build_cmake_utils_CMakeLists.txt) = 44efa30750b2a6048c0c32bf16d4825c4cb9d790 
12SHA1 (patch-configure) = 679580bee6373fd63968f0ee75934cdfc42bd3b8 
13SHA1 (patch-configure.in) = 850221d02799cd875fe917f7e9c2994d0f89db29 
14SHA1 (patch-src_unix_dialup.cpp) = 1c62d37508e45a0095ef062f7d450529e9b557e7 
15SHA1 (patch-src_unix_utilsunx.cpp) = be61cc3931e8aa8cf790cfedf6f916a84970f074 9SHA1 (patch-src_unix_utilsunx.cpp) = be61cc3931e8aa8cf790cfedf6f916a84970f074
File Deleted: pkgsrc/x11/wxGTK32/patches/Attic/patch-build_cmake_init.cmake
File Deleted: pkgsrc/x11/wxGTK32/patches/Attic/patch-configure
File Deleted: pkgsrc/x11/wxGTK32/patches/Attic/patch-configure.in
cvs diff -r1.2 -r1.3 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake 2022/08/10 05:19:57 1.2
+++ pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake 2022/10/06 19:35:04 1.3
@@ -1,36 +1,32 @@ @@ -1,36 +1,32 @@
1$NetBSD: patch-build_cmake_install.cmake,v 1.2 2022/08/10 05:19:57 dbj Exp $ 1$NetBSD: patch-build_cmake_install.cmake,v 1.3 2022/10/06 19:35:04 adam Exp $
2 
3Fix use of DESTDIR 
4https://github.com/wxWidgets/wxWidgets/issues/22610 
5 2
6Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin 3Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
7 4
8--- build/cmake/install.cmake.orig 2022-07-06 14:19:50.000000000 +0000 5--- build/cmake/install.cmake.orig 2022-09-05 18:36:11.000000000 +0000
9+++ build/cmake/install.cmake 6+++ build/cmake/install.cmake
10@@ -39,11 +39,13 @@ else() 7@@ -39,11 +39,12 @@ else()
11 WORLD_EXECUTE WORLD_READ 8 WORLD_EXECUTE WORLD_READ
12 ) 9 )
13  10
14- install(DIRECTORY DESTINATION "bin") 11- install(DIRECTORY DESTINATION "bin")
15+ include(GNUInstallDirs) 12+ include(GNUInstallDirs)
16+ 
17+ install(DIRECTORY DESTINATION "${CMAKE_INSTALL_BINDIR}") 13+ install(DIRECTORY DESTINATION "${CMAKE_INSTALL_BINDIR}")
18 install(CODE "execute_process( \ 14 install(CODE "execute_process( \
19 COMMAND ${CMAKE_COMMAND} -E create_symlink \ 15 COMMAND ${CMAKE_COMMAND} -E create_symlink \
20 ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ 16 \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
21- ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ 17- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
22+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wx-config\" \ 18+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wx-config\" \
23 )" 19 )"
24 ) 20 )
25 endif() 21 endif()
26@@ -96,8 +98,8 @@ if(NOT TARGET ${UNINST_NAME}) 22@@ -96,8 +97,8 @@ if(NOT TARGET ${UNINST_NAME})
27 endif() 23 endif()
28  24
29 set(WX_EXTRA_UNINSTALL_FILES 25 set(WX_EXTRA_UNINSTALL_FILES
30- "${CMAKE_INSTALL_PREFIX}/bin/wx-config" 26- "${CMAKE_INSTALL_PREFIX}/bin/wx-config"
31- "${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}" 27- "${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}"
32+ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wx-config" 28+ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wx-config"
33+ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wxrc${EXE_SUFFIX}" 29+ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wxrc${EXE_SUFFIX}"
34 ) 30 )
35 endif() 31 endif()
36  32
cvs diff -r1.2 -r1.3 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt 2022/08/10 05:19:57 1.2
+++ pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt 2022/10/06 19:35:04 1.3
@@ -1,41 +1,30 @@ @@ -1,41 +1,30 @@
1$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.2 2022/08/10 05:19:57 dbj Exp $ 1$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.3 2022/10/06 19:35:04 adam Exp $
2 
3Fix use of DESTDIR 
4https://github.com/wxWidgets/wxWidgets/issues/22610 
5 2
6Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin 3Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
7 4
8--- build/cmake/utils/CMakeLists.txt.orig 2022-07-06 14:19:50.000000000 +0000 5--- build/cmake/utils/CMakeLists.txt.orig 2022-09-29 16:26:19.000000000 +0000
9+++ build/cmake/utils/CMakeLists.txt 6+++ build/cmake/utils/CMakeLists.txt
10@@ -25,22 +25,25 @@ if(wxUSE_XRC) 7@@ -25,9 +25,10 @@ if(wxUSE_XRC)
11  8
12 set_target_properties(wxrc PROPERTIES FOLDER "Utilities") 9 set_target_properties(wxrc PROPERTIES FOLDER "Utilities")
13  10
14+ include(GNUInstallDirs) 11+ include(GNUInstallDirs)
15+ 
16 wx_install(TARGETS wxrc 12 wx_install(TARGETS wxrc
17- RUNTIME DESTINATION "bin" 13- RUNTIME DESTINATION "bin"
18- BUNDLE DESTINATION "bin" 14- BUNDLE DESTINATION "bin"
19+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" 15+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
20+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" 16+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}"
21 ) 17 )
22  18
23- if(NOT WIN32_MSVC_NAMING) 19 if(NOT WIN32_MSVC_NAMING AND wxBUILD_INSTALL)
24+ if(NOT WIN32_MSVC_NAMING AND wxBUILD_INSTALL) 20@@ -40,8 +41,8 @@ if(wxUSE_XRC)
25 if(IPHONE) 21 # Don't use wx_install() here to preserve escaping.
26 set(EXE_SUFFIX ".app") 22 install(CODE "execute_process( \
27 else() 
28 set(EXE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX}) 
29 endif() 
30  
31- wx_install(CODE "execute_process( \ 
32+ # Don't use wx_install() here to preserve escaping. 
33+ install(CODE "execute_process( \ 
34 COMMAND ${CMAKE_COMMAND} -E create_symlink \ 23 COMMAND ${CMAKE_COMMAND} -E create_symlink \
35- ${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \ 24- \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
36- ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \ 25- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
37+ ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/${wxrc_output_name}${EXE_SUFFIX} \ 26+ \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/${wxrc_output_name}${EXE_SUFFIX}\" \
38+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wxrc${EXE_SUFFIX}\" \ 27+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wxrc${EXE_SUFFIX}\" \
39 )" 28 )"
40 ) 29 )
41 endif() 30 endif()
File Deleted: pkgsrc/x11/wxGTK32/patches/Attic/patch-build_cmake_lib_base_CMakeLists.txt
File Deleted: pkgsrc/x11/wxGTK32/patches/Attic/patch-build_cmake_setup.cmake
File Deleted: pkgsrc/x11/wxGTK32/patches/Attic/patch-src_unix_dialup.cpp