From 549650d4086430bcc0b5da744aea6fa4c15180f6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 24 Sep 2023 23:19:30 -0400 Subject: [PATCH 01/37] perl-Alien-wxWidgets: remove package Nothing requires this package, it depends on an old and to-be-removed vesion of wxWidgets, and it doesn't seem to have been updated since it was added 5 years ago. --- srcpkgs/perl-Alien-wxWidgets/template | 14 -------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 srcpkgs/perl-Alien-wxWidgets/template diff --git a/srcpkgs/perl-Alien-wxWidgets/template b/srcpkgs/perl-Alien-wxWidgets/template deleted file mode 100644 index 91322529fcb7f..0000000000000 --- a/srcpkgs/perl-Alien-wxWidgets/template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'perl-Alien-wxWidgets' -pkgname=perl-Alien-wxWidgets -version=0.69 -revision=3 -build_style=perl-ModuleBuild -hostmakedepends="perl perl-Module-Build perl-Module-Pluggable perl-LWP-Protocol-https perl-Net-SSLeay" -makedepends="perl-Alien wxWidgets-devel" -depends="perl perl-Module-Pluggable perl-Alien wxWidgets perl-LWP-Protocol-https" -short_desc="Alien::wxWidgets - building, finding and using wxWidgets binaries" -maintainer="Orphaned " -license="Artistic-1.0-Perl, GPL-1.0-or-later" -homepage="https://metacpan.org/release/Alien-wxWidgets" -distfiles="${CPAN_SITE}/Alien/${pkgname#perl-}-${version}.tar.gz" -checksum=53224e4bbbefff4cf7b63ed9a62963893b9ffd4965d70d96710348f8676de249 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index edf3aa545694b..582b0944c8c62 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -437,6 +437,7 @@ replaces=" orage<=4.12.1_7 parallel-rust<=0.11.3_2 paraview<=5.8.1_3 + perl-Alien-wxWidgets<=0.69_3 perl-Gtk2-Ex-Simple-List<=0.50_4 perl-Gtk2-ImageView<=0.05_8 perl-Gtk2-Notify<=0.05_8 From c6e36d27abf919c4df84767236f3a1b3b88a3db6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 24 Sep 2023 23:21:42 -0400 Subject: [PATCH 02/37] pcsx2: remove package This package only builds for i686* and depends on an old and to-be-removed version of wxWidgets. --- ...20a9e048e4bd9d7760cb72e6335aee8155d4.patch | 42 ------------------- srcpkgs/pcsx2/template | 27 ------------ srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch delete mode 100644 srcpkgs/pcsx2/template diff --git a/srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch b/srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch deleted file mode 100644 index 1a76bc1fa6809..0000000000000 --- a/srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6b7f20a9e048e4bd9d7760cb72e6335aee8155d4 Mon Sep 17 00:00:00 2001 -From: John Zimmermann -Date: Thu, 2 Jul 2020 12:24:45 +0200 -Subject: [PATCH] Allow running on systems without wx stackwalkler - -closes #2796 ---- - pcsx2/gui/AppAssert.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git pcsx2/gui/AppAssert.cpp pcsx2/gui/AppAssert.cpp -index a282715c4e..4ce151f86f 100644 ---- a/pcsx2/gui/AppAssert.cpp -+++ b/pcsx2/gui/AppAssert.cpp -@@ -19,6 +19,7 @@ - - #include - -+#if wxUSE_STACKWALKER - class StackDump : public wxStackWalker - { - protected: -@@ -94,6 +95,7 @@ static wxString pxGetStackTrace( const FnChar_t* calledFrom ) - dump.Walk( 3 ); - return dump.GetStackTrace(); - } -+#endif - - #ifdef __WXDEBUG__ - -@@ -122,7 +124,11 @@ bool AppDoAssert( const DiagnosticOrigin& origin, const wxChar *msg ) - static bool disableAsserts = false; - if( disableAsserts ) return false; - -+#if wxUSE_STACKWALKER - wxString trace( pxGetStackTrace(origin.function) ); -+#else -+ wxString trace( "Warning: Platform doesn't support wx stackwalker" ); -+#endif - wxString dbgmsg( origin.ToString( msg ) ); - - wxMessageOutputDebug().Printf( L"%s", WX_STR(dbgmsg) ); diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template deleted file mode 100644 index 59f8dfcdce71d..0000000000000 --- a/srcpkgs/pcsx2/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'pcsx2' -archs="i686*" -lib32mode="full" -nopie=yes - -pkgname=pcsx2 -version=1.6.0 -revision=2 -build_style=cmake -# store all data that pcsx2 has to access into /usr/lib, so it can be accessed -# on multilib setups. when/if pcsx2 supports 64-bit builds, GAMEINDEX_DIR should -# be moved to /usr/share/pcsx2 -configure_args="-DGLSL_API=1 -DSDL2_API=TRUE -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 - -DXDG_STD=1 -DDISABLE_ADVANCE_SIMD=1 - -DPLUGIN_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2 - -DGAMEINDEX_DIR=/usr/lib${XBPS_TARGET_WORDSIZE}/pcsx2" -hostmakedepends="pkg-config sparsehash perl" -makedepends="alsa-lib-devel SDL2-devel glu-devel glew-devel libaio-devel - libcanberra-devel libjpeg-turbo-devel wxWidgets-devel portaudio-devel soundtouch-devel - libpcap-devel glib-devel" -depends="desktop-file-utils" -short_desc="Sony PlayStation 2 emulator" -maintainer="Selfsigned " -license="GPL-3.0-or-later, GPL-2.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later" -homepage="http://www.pcsx2.net" -distfiles="https://github.com/PCSX2/pcsx2/archive/v${version}.tar.gz" -checksum=c09914020e494640f187f46d017f9d142ce2004af763b9a6c5c3a9ea09e5281c diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 582b0944c8c62..b176739157e3c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -441,6 +441,7 @@ replaces=" perl-Gtk2-Ex-Simple-List<=0.50_4 perl-Gtk2-ImageView<=0.05_8 perl-Gtk2-Notify<=0.05_8 + pcsx2<=1.6.0_2 pgadmin3<=1.22.2_14 phonon-backend-gstreamer<=4.9.0_2 phonon-backend-vlc<=0.9.1_3 From 1e5167386c3bd2dc94037b5a41b09b85c0847f69 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 24 Sep 2023 23:24:33 -0400 Subject: [PATCH 03/37] dispcalGUI: remove package This package depends on long-past-EOL Python 2 and an old and to-be-removed version of wxWidgets. --- srcpkgs/dispcalGUI/patches/error.patch | 33 -------------------------- srcpkgs/dispcalGUI/template | 25 ------------------- srcpkgs/dispcalGUI/update | 1 - srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 srcpkgs/dispcalGUI/patches/error.patch delete mode 100644 srcpkgs/dispcalGUI/template delete mode 100644 srcpkgs/dispcalGUI/update diff --git a/srcpkgs/dispcalGUI/patches/error.patch b/srcpkgs/dispcalGUI/patches/error.patch deleted file mode 100644 index 169fc528b138e..0000000000000 --- a/srcpkgs/dispcalGUI/patches/error.patch +++ /dev/null @@ -1,33 +0,0 @@ -Reason: error(3) does not exist on musl, and on glibc the signature -is (int, int, char*, ...) and not (char*, ...). -Therefore the current code either results in garbled output or -doesn't work at all. Replace it with a simple printf. - ---- ---- a/DisplayCAL/RealDisplaySizeMM.c 2018-07-25 16:47:01.000000000 +0200 -+++ b/DisplayCAL/RealDisplaySizeMM.c 2018-07-25 16:47:01.000000000 +0200 -@@ -822,13 +822,13 @@ - sprintf(desc1, "_ICC_PROFILE_%d",disps[ndisps]->uscreen); - - if ((disps[ndisps]->icc_atom = XInternAtom(mydisplay, desc1, False)) == None) -- error("Unable to intern atom '%s'",desc1); -+ fprintf(stderr, "Unable to intern atom '%s'",desc1); - - debugrr2((errout,"Root atom '%s'\n",desc1)); - - /* Create the atom of the output that may contain the associated ICC profile */ - if ((disps[ndisps]->icc_out_atom = XInternAtom(mydisplay, "_ICC_PROFILE", False)) == None) -- error("Unable to intern atom '%s'","_ICC_PROFILE"); -+ fprintf(stderr, "Unable to intern atom '%s'","_ICC_PROFILE"); - - /* Grab the EDID from the output */ - { -@@ -993,7 +993,7 @@ - sprintf(desc1, "_ICC_PROFILE_%d",disps[i]->uscreen); - - if ((disps[i]->icc_atom = XInternAtom(mydisplay, desc1, False)) == None) -- error("Unable to intern atom '%s'",desc1); -+ fprintf(stderr, "Unable to intern atom '%s'",desc1); - - /* See if we can locate the EDID of the monitor for this screen */ - for (j = 0; j < 2; j++) { diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template deleted file mode 100644 index 05086b97e5a26..0000000000000 --- a/srcpkgs/dispcalGUI/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'dispcalGUI' -pkgname=dispcalGUI -version=3.8.9.3 -revision=5 -_name="DisplayCAL" -build_style=python2-module -hostmakedepends="python" -makedepends="python-devel libXxf86vm-devel libXinerama-devel libXrandr-devel" -depends="python-dbus python-numpy wxPython argyllcms" -short_desc="Display Calibration and Characterization" -maintainer="lemmi " -license="GPL-3.0-or-later" -homepage="https://displaycal.net/" -changelog="https://displaycal.net/CHANGES.html" -distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz" -checksum=7c34dfbd9f66f24f1d4c88de4a5a0de688aad719f095874b6259637d30893bea - -pre_configure() { - sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop -} - -post_install() { - find ${DESTDIR}/usr/ -exec chmod a+r \{\} + - find ${DESTDIR}/usr/ -type d -exec chmod a+x \{\} + -} diff --git a/srcpkgs/dispcalGUI/update b/srcpkgs/dispcalGUI/update deleted file mode 100644 index 6942393945c36..0000000000000 --- a/srcpkgs/dispcalGUI/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="${_name}" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b176739157e3c..99fc49592d2ce 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -85,6 +85,7 @@ replaces=" deepin-turbo<=0.0.3_1 deepin-voice-recorder<=5.0.0_2 dht-node<=0.2.0_3 + dispcalGUI<=3.8.9.3_5 distcc-gtk<=3.3.3_6 djmount<=0.71_8 dleyna-core<=0.6.0_2 From 28e21b033f2c9c7484e014e9a4b743081a908c61 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 24 Sep 2023 23:26:53 -0400 Subject: [PATCH 04/37] wxPython: remove package --- srcpkgs/wxPython-devel | 1 - srcpkgs/wxPython/template | 47 --------------------------------------- 2 files changed, 48 deletions(-) delete mode 120000 srcpkgs/wxPython-devel delete mode 100644 srcpkgs/wxPython/template diff --git a/srcpkgs/wxPython-devel b/srcpkgs/wxPython-devel deleted file mode 120000 index e396d5ae370d6..0000000000000 --- a/srcpkgs/wxPython-devel +++ /dev/null @@ -1 +0,0 @@ -wxPython \ No newline at end of file diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template deleted file mode 100644 index 891ddc164552b..0000000000000 --- a/srcpkgs/wxPython/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'wxPython' -pkgname=wxPython -version=3.0.2.0 -revision=11 -hostmakedepends="pkg-config" -makedepends=" - zlib-devel libpng-devel libjpeg-turbo-devel tiff-devel expat-devel gtk+-devel - libSM-devel MesaLib-devel glu-devel - libnotify-devel python-devel wxWidgets-devel" -depends="python" -short_desc="Python Bindings for the wxWidgets GUI toolkit library" -maintainer="Orphaned " -license="WxWindows-exception-3.1" -homepage="https://www.wxpython.org/" -distfiles="${SOURCEFORGE_SITE}/wxpython/${pkgname}-src-${version}.tar.bz2" -checksum=d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 - -if [ -n "${CROSS_BUILD}" ]; then - hostmakedepends+=" python" - CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py2_ver}" -fi - -pre_configure() { - mv wxPython/wx/tools/Editra/{editra,Editra} -} - -do_build() { - cd wxPython - python2.7 setup.py build -} - -do_install() { - cd wxPython - # The path where includes are going to be installed is prefixed with WXPREFIX obtained - # from 'wx-config --prefix' but in a cross build this is '$XBPS_CROSS_BASE/usr'. - sed -i -e "s|WXPREFIX +|'/usr' +|" config.py - python2.7 setup.py install --root=${DESTDIR} - vlicense ../docs/licence.txt LICENSE -} - -wxPython-devel_package() { - depends="wxWidgets-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - } -} From af82b296f4e527b688f270759c16082cee0438a0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 24 Sep 2023 23:28:40 -0400 Subject: [PATCH 05/37] wxWidgets: remove package --- common/shlibs | 19 ----- srcpkgs/wxWidgets-devel | 1 - .../patches/nonfatal-abi-check.patch | 18 ----- .../wxWidgets/patches/wxGTK-collision.patch | 79 ------------------- srcpkgs/wxWidgets/template | 66 ---------------- srcpkgs/wxWidgets/update | 2 - 6 files changed, 185 deletions(-) delete mode 120000 srcpkgs/wxWidgets-devel delete mode 100644 srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch delete mode 100644 srcpkgs/wxWidgets/patches/wxGTK-collision.patch delete mode 100644 srcpkgs/wxWidgets/template delete mode 100644 srcpkgs/wxWidgets/update diff --git a/common/shlibs b/common/shlibs index 2d7f32eee393b..c428153380e03 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1561,26 +1561,7 @@ libfprint.so.0 libfprint0-1.0_1 libfprint-2.so.2 libfprint-1.90.7_1 libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1 -libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1 -libwx_base_xml-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2_html-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2_aui-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2_core-3.0.so.0 wxWidgets-3.0.0_1 -libwx_base_net-3.0.so.0 wxWidgets-3.0.0_1 -libwx_base-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_gl-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_stc-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_adv-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_qa-3.0.so.0 wxWidgets-3.0.0_1 libwx_baseu_net-3.0.so.0 wxWidgets-common-3.0.4_1 -libwx_gtk2u_core-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_richtext-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_propgrid-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_html-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_xrc-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_aui-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_ribbon-3.0.so.0 wxWidgets-3.0.0_1 -libwx_gtk2u_media-3.0.so.0 wxWidgets-3.0.1_1 libmspack.so.0 libmspack-0.4alpha_1 libslim.so.1.3.6 slim-1.3.6_1 libmediaart-2.0.so.0 libmediaart-1.9.1_1 diff --git a/srcpkgs/wxWidgets-devel b/srcpkgs/wxWidgets-devel deleted file mode 120000 index 0e979bb789d11..0000000000000 --- a/srcpkgs/wxWidgets-devel +++ /dev/null @@ -1 +0,0 @@ -wxWidgets \ No newline at end of file diff --git a/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch deleted file mode 100644 index bb93f0a26156c..0000000000000 --- a/srcpkgs/wxWidgets/patches/nonfatal-abi-check.patch +++ /dev/null @@ -1,18 +0,0 @@ -Taken from -https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch - -diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp ---- a/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 -+++ b/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 -@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con - msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), - lib.c_str(), progName.c_str(), prog.c_str()); - -- wxLogFatalError(msg.c_str()); -- -- // normally wxLogFatalError doesn't return -- return false; -+ wxLogWarning(msg.c_str()); - } - #undef wxCMP - diff --git a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch deleted file mode 100644 index 5ec31ebaceb1d..0000000000000 --- a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naur Makefile.in Makefile.in ---- a/Makefile.in 2014-10-06 23:33:44.000000000 +0200 -+++ b/Makefile.in 2014-11-19 10:48:18.752319058 +0100 -@@ -15279,9 +15279,11 @@ - - install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install - $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) -+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin3.m4) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) - $(DYLIB_RPATH_INSTALL) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - for f in setup.h $(RCDEFS_H); do \ -@@ -16177,7 +16179,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -16185,7 +16187,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - -@@ -16202,7 +16204,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/msw/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - -diff -Naur build/bakefiles/wx.bkl build/bakefiles/wx.bkl ---- a/build/bakefiles/wx.bkl 2014-10-06 23:33:44.000000000 +0200 -+++ b/build/bakefiles/wx.bkl 2014-11-19 10:32:21.692283955 +0100 -@@ -137,7 +137,7 @@ - - - $(SRCDIR)/locale -- wxstd -+ wxstd$(WX_RELEASE_NODOT) - - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW -diff -Naur src/common/translation.cpp src/common/translation.cpp ---- a/src/common/translation.cpp 2014-10-06 23:33:44.000000000 +0200 -+++ b/src/common/translation.cpp 2014-11-19 11:02:21.067788665 +0100 -@@ -1471,7 +1471,7 @@ - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not -diff -Naur utils/wxrc/Makefile.in utils/wxrc/Makefile.in ---- a/utils/wxrc/Makefile.in 2014-10-06 23:33:44.000000000 +0200 -+++ b/utils/wxrc/Makefile.in 2014-11-19 10:49:55.410110669 +0100 -@@ -125,7 +125,6 @@ - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template deleted file mode 100644 index 480c3e15e3524..0000000000000 --- a/srcpkgs/wxWidgets/template +++ /dev/null @@ -1,66 +0,0 @@ -# Template file for 'wxWidgets' -pkgname=wxWidgets -version=3.0.5.1 -revision=6 -build_style=gnu-configure -configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack - --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview" -hostmakedepends="pkg-config" -makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-devel - libXinerama-devel libmspack-devel SDL2-devel glu-devel - gstreamer1-devel gst-plugins-base1-devel" -depends="wxWidgets-common>=${version}" -short_desc="WxWidgets GUI toolkit library (version 3)" -maintainer="Martin Riese " -license="WxWindows-exception-3.1" -homepage="https://www.wxwidgets.org/" -distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" -checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807 - -post_install() { - local _config="gtk2-unicode-3.0" - # remove files that are already in wxWidgets-common - rm -f ${DESTDIR}/usr/lib/libwx_baseu* - rm -rf ${DESTDIR}/usr/bin/wxrc* - rm -rf ${DESTDIR}/usr/share - find ${DESTDIR}/usr/include -type f -not -name tabartgtk.h \ - -not -name fontdlgg.h -not -name notifmsg.h -exec rm -f {} \; - for f in "" generic gtk; do - rm ${DESTDIR}/usr/include/wx-3.0/wx/$f/notifmsg.h - done - # remove all occurrences of $XBPS_CROSS_TRIPLET - # wx-config: - # - mark this build as native build - # - ignore --host option; breaks configure scripts when - # cross compiling (isn’t necessary in our case anyway) - if [ -n "$CROSS_BUILD" ]; then - rename "${XBPS_CROSS_TRIPLET}-" "" \ - ${DESTDIR}/usr/lib/wx/config/* \ - ${DESTDIR}/usr/lib/wx/include/* - rename -- "-${XBPS_CROSS_TRIPLET}" "" ${DESTDIR}/usr/lib/* - - sed -i -e "s/${XBPS_CROSS_TRIPLET}-//g" \ - -e "s/-${XBPS_CROSS_TRIPLET}//g" \ - -e "s,$XBPS_CROSS_BASE,,g" \ - ${DESTDIR}/usr/lib/wx/config/${_config} - - fi - sed -i -e 's,^bindir=.*,bindir=${exec_prefix}/bin,' \ - -e 's/is_cross() { .* }/is_cross() { false; }/g' \ - -e '/--\*=\*)/i --host=\*) continue;;' \ - -e "s,/usr/lib,\${exec_prefix}/lib,g" \ - ${DESTDIR}/usr/lib/wx/config/${_config} - ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0 - ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config -} - -wxWidgets-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${sourcepkg}-common-devel>=${version}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/bin - vmove "usr/lib/*.so" - vmove usr/lib/wx - } -} diff --git a/srcpkgs/wxWidgets/update b/srcpkgs/wxWidgets/update deleted file mode 100644 index 77e290e7e646e..0000000000000 --- a/srcpkgs/wxWidgets/update +++ /dev/null @@ -1,2 +0,0 @@ -# development version -ignore='3.1.*' From c2ed5e5fc3ad42de24e635026e63a0e19e4a9035 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:04:33 -0400 Subject: [PATCH 06/37] wxWidgets-gtk3: update to 3.2.2.1. --- common/shlibs | 32 +++++++-------- .../patches/nonfatal-abi-check.patch | 21 +++++----- srcpkgs/wxWidgets-gtk3/template | 39 ++++++++++++++----- 3 files changed, 56 insertions(+), 36 deletions(-) diff --git a/common/shlibs b/common/shlibs index c428153380e03..c10711e8bf83f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1559,9 +1559,6 @@ libofx.so.7 libofx-0.10.1_1 libsigsegv.so.2 libsigsegv-2.10_2 libfprint.so.0 libfprint0-1.0_1 libfprint-2.so.2 libfprint-1.90.7_1 -libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1 -libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1 -libwx_baseu_net-3.0.so.0 wxWidgets-common-3.0.4_1 libmspack.so.0 libmspack-0.4alpha_1 libslim.so.1.3.6 slim-1.3.6_1 libmediaart-2.0.so.0 libmediaart-1.9.1_1 @@ -3474,19 +3471,22 @@ libmozjs-78.so.0 mozjs78-78.1.0_1 libebur128.so.1 libebur128-1.2.4_1 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1 libgtksourceview-5.so.0 gtksourceview5-5.2.0_1 -libwx_gtk3u_propgrid-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_qa-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_core-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_html-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_adv-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_richtext-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_xrc-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_webview-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_aui-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1 +libwx_baseu_xml-3.2.so.0 wxWidgets-common-3.2.2.1_1 +libwx_baseu-3.2.so.0 wxWidgets-common-3.2.2.1_1 +libwx_baseu_net-3.2.so.0 wxWidgets-common-3.2.2.1_1 +libwx_gtk3u_adv-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_aui-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_core-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_gl-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_html-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_media-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_propgrid-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_qa-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_ribbon-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_richtext-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_stc-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_webview-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 +libwx_gtk3u_xrc-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1 libtepl-6.so.2 tepl-6.4.0_1 libnomacsCore.so.3 nomacs-3.10.2_4 libaudit.so.1 libaudit-2.8.4_1 diff --git a/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch b/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch index bb93f0a26156c..9ca241ba8b1ff 100644 --- a/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch +++ b/srcpkgs/wxWidgets-gtk3/patches/nonfatal-abi-check.patch @@ -1,18 +1,19 @@ -Taken from +Adapted from a prior patch which was taken from https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch -diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp ---- a/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 -+++ b/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 -@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con - msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), - lib.c_str(), progName.c_str(), prog.c_str()); +diff -up a/src/common/appbase.cpp b/src/common/appbase.cpp +--- a/src/common/appbase.cpp ++++ b/src/common/appbase.cpp +@@ -850,11 +850,8 @@ + wxString prog = wxString::FromAscii(optionsSignature); + wxString progName = wxString::FromAscii(componentName); -- wxLogFatalError(msg.c_str()); +- wxLogFatalError(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), ++ wxLogWarning(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib, progName, prog); - - // normally wxLogFatalError doesn't return - return false; -+ wxLogWarning(msg.c_str()); } - #undef wxCMP + return true; diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template index ae5105a89c145..eac05ec7f02bd 100644 --- a/srcpkgs/wxWidgets-gtk3/template +++ b/srcpkgs/wxWidgets-gtk3/template @@ -1,22 +1,42 @@ # Template file for 'wxWidgets-gtk3' pkgname=wxWidgets-gtk3 -version=3.0.5.1 -revision=6 -build_style=gnu-configure -configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl - --with-libmspack --with-libnotify --enable-mediactrl" +version=3.2.2.1 +revision=1 +build_style=cmake +configure_args=" + -DwxBUILD_TOOLKIT=gtk3 + -DwxUSE_OPENGL=ON + -DwxUSE_LIBMSPACK=ON + -DwxUSE_GTKPRINT=ON + -DwxUSE_UNICODE=ON + -DwxUSE_MEDIACTRL=ON + -DwxUSE_REGEX=sys + -DwxUSE_ZLIB=sys + -DwxUSE_EXPAT=sys + -DwxUSE_LIBJPEG=sys + -DwxUSE_LIBPNG=sys + -DwxUSE_LIBTIFF=sys + -DwxUSE_LIBLZMA=sys + -DwxUSE_LIBNOTIFY=sys + -DwxUSE_LIBSDL=sys +" hostmakedepends="pkg-config" makedepends="SDL2-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel - libmspack-devel libnotify-devel tiff-devel webkit2gtk-devel glu-devel" -short_desc="The wxWidgets GUI toolkit library compiled with gtk3 support" + libmspack-devel libnotify-devel tiff-devel webkit2gtk-devel glu-devel + gst-plugins-bad1-devel libsecret-devel pcre2-devel liblzma-devel gspell-devel + libcurl-devel zlib-devel expat-devel libpng-devel" +short_desc="Cross-platform GUI library (built with GTK+ 3.0)" maintainer="Helmut Pozimski " license="custom:wxWindows" homepage="https://www.wxwidgets.org" distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" -checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807 +checksum=dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02 post_install() { - local _config="gtk3-unicode-3.0" + local _patch="${version#*.*.}" + local _majmin="${version%."${_patch}"}" + local _config="gtk3-unicode-${_majmin}" + # remove all occurrences of $XBPS_CROSS_TRIPLET in wx-config: # - mark this build as native build if [ "$CROSS_BUILD" ]; then @@ -45,7 +65,6 @@ wxWidgets-common_package() { short_desc+=" - common files" pkg_install() { vmove "usr/lib/libwx_baseu*.so.*" - vmove usr/share vlicense docs/licendoc.txt vlicense docs/licence.txt } From 72deebd75c7ffc93933a5ff41ec928209f62b021 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:19 -0400 Subject: [PATCH 07/37] 0ad: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/0ad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index 8cf4a75721619..597a7082b9389 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.26 -revision=7 +revision=8 archs="x86_64* i686* aarch64* armv7l* ppc64le*" hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel From cef4352668cf14da1d3b05748ed747ac6be5353f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:19 -0400 Subject: [PATCH 08/37] Aegisub: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/Aegisub/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template index daf35749ce7c6..d80e63f027e32 100644 --- a/srcpkgs/Aegisub/template +++ b/srcpkgs/Aegisub/template @@ -1,7 +1,7 @@ # Template file for 'Aegisub' pkgname=Aegisub version=3.3.2 -revision=10 +revision=11 build_style=cmake build_helper=cmake-wxWidgets-gtk3 cmake_builddir="BUILD" From 0430c92bf3b576f95761d5e368bf8b567fd514a8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:19 -0400 Subject: [PATCH 09/37] CubicSDR: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/CubicSDR/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template index c224fc1379bf1..92d0d3b9090fd 100644 --- a/srcpkgs/CubicSDR/template +++ b/srcpkgs/CubicSDR/template @@ -1,7 +1,7 @@ # Template file for 'CubicSDR' pkgname=CubicSDR version=0.2.7 -revision=2 +revision=3 build_style=cmake build_helper="cmake-wxWidgets-gtk3" configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA) From da57cb1fa08dce9460b146b09aefe08bd5ebe863 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:19 -0400 Subject: [PATCH 10/37] DarkRadiant: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/DarkRadiant/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template index 8830b3a61c06b..219ac3d66adef 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -1,7 +1,7 @@ # Template file for 'DarkRadiant' pkgname=DarkRadiant version=3.8.0 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config ruby-asciidoctor" From d931848050e16e89f32909f81f143ff367fec196 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:19 -0400 Subject: [PATCH 11/37] LimeSuite: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/LimeSuite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template index fe963be85f860..f13d5e40a04c8 100644 --- a/srcpkgs/LimeSuite/template +++ b/srcpkgs/LimeSuite/template @@ -1,7 +1,7 @@ # Template file for 'LimeSuite' pkgname=LimeSuite version=22.09.1 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args=" From e197956ac89950e0c4daa5599167bda53bf6ffb7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:19 -0400 Subject: [PATCH 12/37] OpenCPN: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/OpenCPN/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template index ee67dbaff01c2..93aa892056b3b 100644 --- a/srcpkgs/OpenCPN/template +++ b/srcpkgs/OpenCPN/template @@ -1,7 +1,7 @@ # Template file for 'OpenCPN' pkgname=OpenCPN version=5.2.0 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON From 44100edeb5c70e4e93de056b332b57a5bc259d83 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:19 -0400 Subject: [PATCH 13/37] PrusaSlicer: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/PrusaSlicer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index bac5d6d574053..6ae1df0d87a19 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,7 +1,7 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer version=2.5.2 -revision=2 +revision=3 build_style=cmake build_helper="qemu cmake-wxWidgets-gtk3" # Pre-Compiled Headers seems to be slower From 19198c061c86818c99aba44942c70fa13c800287 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:19 -0400 Subject: [PATCH 14/37] SLADE: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/SLADE/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index 8b680574c3b9e..a88c2e4bc7814 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -1,7 +1,7 @@ # Template file for 'SLADE' pkgname=SLADE version=3.2.1 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config p7zip which" From 86bc32198095fff1758d465109af2fe0d54588fc Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:20 -0400 Subject: [PATCH 15/37] WoeUSB: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/WoeUSB/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/WoeUSB/template b/srcpkgs/WoeUSB/template index b946b52bcc1b8..2da95d5702ea7 100644 --- a/srcpkgs/WoeUSB/template +++ b/srcpkgs/WoeUSB/template @@ -1,7 +1,7 @@ # Template file for 'WoeUSB' pkgname=WoeUSB version=3.3.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake gettext libtool" From d8bf162feb766e6890f742fa36f0a8144cc7a78e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:20 -0400 Subject: [PATCH 16/37] audacity: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/audacity/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template index 28e9c4a3528f1..ec6c984a06759 100644 --- a/srcpkgs/audacity/template +++ b/srcpkgs/audacity/template @@ -1,7 +1,7 @@ # Template file for 'audacity' pkgname=audacity version=2.4.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system --with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3" From b343c87f86b85161e6705f0f9b3bc79d0f47746d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:20 -0400 Subject: [PATCH 17/37] boinc: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/boinc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index ecd2a1100b015..65bbbe7540d50 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -1,7 +1,7 @@ # Template file for 'boinc' pkgname=boinc version=7.22.0 -revision=2 +revision=3 _majorver=${version%.*} build_style=gnu-configure hostmakedepends="automake libtool pkg-config xorgproto shared-mime-info" From 5623a273662162073cfa0d9550a2bc88920b7d5a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:20 -0400 Subject: [PATCH 18/37] codeblocks: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/codeblocks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index 6c6c31dfd3e1e..46466d990bed1 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -1,7 +1,7 @@ # Template file for 'codeblocks' pkgname=codeblocks version=20.03 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins --with-boost=${XBPS_CROSS_BASE}/usr From 652af464a639a22e247e7dcfb1afcddf5cdb6675 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:20 -0400 Subject: [PATCH 19/37] codelite: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/codelite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index b0bf8f57736a4..140fe20d0d26b 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -1,7 +1,7 @@ # Template file for 'codelite' pkgname=codelite version=16.0.0 -revision=3 +revision=4 create_wrksrc=yes build_style=cmake build_helper=cmake-wxWidgets-gtk3 From d2d0d6601b303f6c3a32e3e381c641d83f5bb360 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:20 -0400 Subject: [PATCH 20/37] diff-pdf: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/diff-pdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template index 1b1c1b690814c..dff1f22362cbd 100644 --- a/srcpkgs/diff-pdf/template +++ b/srcpkgs/diff-pdf/template @@ -1,7 +1,7 @@ # Template file for 'diff-pdf' pkgname=diff-pdf version=0.5.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" From 477e457074a657b2f013d9400514f5d26048b767 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:20 -0400 Subject: [PATCH 21/37] erlang: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/erlang/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index 411f921f59f48..2b752ef7896dc 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,7 +1,7 @@ # Template file for 'erlang' pkgname=erlang version=26.1 -revision=1 +revision=2 build_style=gnu-configure make_install_target="install install-docs" hostmakedepends="autoconf libxslt perl tar" From 977632f2e71f1e41105bea71b9bfc4dae89bafc8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:21 -0400 Subject: [PATCH 22/37] filezilla: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/filezilla/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index c8d7feab7b4f5..21a5b44004c55 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,7 +1,7 @@ # Template file for 'filezilla' pkgname=filezilla version=3.65.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck --with-wx-config=wx-config-gtk3" From 9571a0b965d1fe16c12f03d77942cd8114e1f194 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:21 -0400 Subject: [PATCH 23/37] gnuplot: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/gnuplot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template index ad0dbf053d002..4d1ed212115a6 100644 --- a/srcpkgs/gnuplot/template +++ b/srcpkgs/gnuplot/template @@ -1,7 +1,7 @@ # Template file for 'gnuplot' pkgname=gnuplot version=5.4.9 -revision=1 +revision=2 configure_args="--with-readline=builtin" hostmakedepends="pkg-config lua52" makedepends="zlib-devel libX11-devel gd-devel lua52-devel" From 90b186c4c7dc5ad41d35d30c7250afd6fd0f87b7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:21 -0400 Subject: [PATCH 24/37] golly: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/golly/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template index 691f999a6eddd..1fd406b6a2f55 100644 --- a/srcpkgs/golly/template +++ b/srcpkgs/golly/template @@ -1,7 +1,7 @@ # Template file for 'golly' pkgname=golly version=4.1 -revision=2 +revision=3 build_wrksrc="gui-wx" build_style=gnu-makefile make_build_args="-f makefile-gtk GOLLYDIR=/usr/share/golly LUALIB=-llua5.4 From 57c6e1a9a6b9f044539ab3c27d182e62f16e7446 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:21 -0400 Subject: [PATCH 25/37] hugin: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/hugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 943d23d1a932f..73720781c7191 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2022.0.0 -revision=8 +revision=9 build_style=cmake build_helper=cmake-wxWidgets-gtk3 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" From b9d7d67d7b97502dcb41caedfe7b2aab098bf02e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:21 -0400 Subject: [PATCH 26/37] kicad: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/kicad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index 1c34c498afbd8..1fb6dd434da42 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,7 +1,7 @@ # Template file for 'kicad' pkgname=kicad version=7.0.1 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON From 690cca23e6ecb82b1f89714af3284ff90edea37c Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:21 -0400 Subject: [PATCH 27/37] mediainfo: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/mediainfo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template index e80da59ead880..1b82376b3fbda 100644 --- a/srcpkgs/mediainfo/template +++ b/srcpkgs/mediainfo/template @@ -1,7 +1,7 @@ # Template file for 'mediainfo' pkgname=mediainfo version=22.12 -revision=1 +revision=2 configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake libtool pkg-config" makedepends="libmediainfo-devel zlib-devel wxWidgets-gtk3-devel" From 7932cd7f97d6de5473f553dc0232d6d65ba9c306 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:21 -0400 Subject: [PATCH 28/37] openbabel: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/openbabel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openbabel/template b/srcpkgs/openbabel/template index 41db848d74e4c..77bbea28ff696 100644 --- a/srcpkgs/openbabel/template +++ b/srcpkgs/openbabel/template @@ -1,7 +1,7 @@ # Template file for 'openbabel' pkgname=openbabel version=3.1.1 -revision=1 +revision=2 _ver=${version//./-} build_style=cmake build_helper=cmake-wxWidgets-gtk3 From 4d5549687709aa9c53bafac1c2b3c79ad7f60422 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:22 -0400 Subject: [PATCH 29/37] passwordsafe: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/passwordsafe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index 88ffa41f474bc..f83d1fe5cb1f5 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -1,7 +1,7 @@ # Template file for 'passwordsafe' pkgname=passwordsafe version=1.16.0 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 # build process uses perl to generate core_st.cpp and zip to generate help files From fb4201f62c25301727fbd63bbf2e918b8a8faaba Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:22 -0400 Subject: [PATCH 30/37] poedit: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/poedit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 49e7efe965476..09ad192af236d 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=3.3.2 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" From 9206bff6f114373288f1ba7f44f0de96a859f3bd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:22 -0400 Subject: [PATCH 31/37] spek-alternative: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/spek-alternative/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spek-alternative/template b/srcpkgs/spek-alternative/template index d65086b8f008c..72747cbb0a024 100644 --- a/srcpkgs/spek-alternative/template +++ b/srcpkgs/spek-alternative/template @@ -1,7 +1,7 @@ # Template file for 'spek-alternative' pkgname=spek-alternative version=0.8.2.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake gettext-devel intltool libtool pkg-config wxWidgets-common" makedepends="ffmpeg-devel wxWidgets-gtk3-devel" From 0165d5746dd7f73c248387de0b6dd341b91b5e16 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:22 -0400 Subject: [PATCH 32/37] tqsl: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/tqsl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tqsl/template b/srcpkgs/tqsl/template index 61389b05e62d4..2c4aabc217615 100644 --- a/srcpkgs/tqsl/template +++ b/srcpkgs/tqsl/template @@ -1,7 +1,7 @@ # Template file for 'tqsl' pkgname=tqsl version=2.6.5 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="wxWidgets-gtk3-devel" From 9b3e77d8b46b5f10e75c0ea63558eaa8f5fc2865 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:22 -0400 Subject: [PATCH 33/37] treesheets: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/treesheets/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/treesheets/template b/srcpkgs/treesheets/template index d5f62699af4a2..f02d13fd6bafb 100644 --- a/srcpkgs/treesheets/template +++ b/srcpkgs/treesheets/template @@ -1,7 +1,7 @@ # Template file for 'treesheets' pkgname=treesheets version=1.0.2 -revision=1 +revision=2 build_style=cmake build_helper="cmake-wxWidgets-gtk3" makedepends="wxWidgets-gtk3-devel" From 0ab0eb8280505ba7e341afdc19691283ea15a560 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:22 -0400 Subject: [PATCH 34/37] vba-m: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/vba-m/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 4115a9f621481..486e4609a19d6 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -2,7 +2,7 @@ pkgname=vba-m reverts=1292_2 version=2.1.7 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE -DCMAKE_BUILD_TYPE=Release" hostmakedepends="gettext pkg-config unzip zip yasm wxWidgets-gtk3-devel" From 64e02685496d2c563e0f2256ed7e74ad79e08692 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:22 -0400 Subject: [PATCH 35/37] winusb: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/winusb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/winusb/template b/srcpkgs/winusb/template index 64ec8fce12b00..5ed1b80048846 100644 --- a/srcpkgs/winusb/template +++ b/srcpkgs/winusb/template @@ -1,7 +1,7 @@ # Template file for 'winusb' pkgname=winusb version=1.0.11 -revision=10 +revision=11 archs="i686* x86_64*" build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" From 767612ec6694c0e727816d1c7db5ca662e79bb05 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:23 -0400 Subject: [PATCH 36/37] wxMaxima: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/wxMaxima/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wxMaxima/template b/srcpkgs/wxMaxima/template index 1e512c39644b9..c391d781c6fd1 100644 --- a/srcpkgs/wxMaxima/template +++ b/srcpkgs/wxMaxima/template @@ -1,7 +1,7 @@ # Template file for 'wxMaxima' pkgname=wxMaxima version=20.02.4 -revision=1 +revision=2 build_style=cmake configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3" hostmakedepends="gettext perl desktop-file-utils doxygen po4a" From a418fec201f429fb4f2b5446bf7a66ee3d6d4489 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Sep 2023 00:18:23 -0400 Subject: [PATCH 37/37] xchm: rebuild with wxWidgets-gtk3-3.2.2.1 --- srcpkgs/xchm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xchm/template b/srcpkgs/xchm/template index 02900b43385ec..06782c1f97743 100644 --- a/srcpkgs/xchm/template +++ b/srcpkgs/xchm/template @@ -1,7 +1,7 @@ # Template file for 'xchm' pkgname=xchm version=1.34 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake gettext-devel tar"