From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] wxWiwdgets, wxPython
Date: Mon, 25 Sep 2023 14:12:35 +0200 [thread overview]
Message-ID: <20230925121235.j9CskxJ3jTOhdf95J-im_Gscd_tldCfZotbF-JzfDuE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46237@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1001 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages wxwidgets
https://github.com/void-linux/void-packages/pull/46237
[WIP] wxWiwdgets, wxPython
Our wxWidgets/wxPython stack is pretty old, and it may be more trouble to patch for Python 3.12 than just updating these packages. Thus I would like to:
* Drop `pcsx2`, `perl-Alien-wxWidgets` and `dispcalGUI` (cc: @lemmi). The first two don't seem well-maintained, and all three rely on wxWidgets with GTK2 support that should be retired. `dispcalGUI` also requires the long-past-EOL Python 2.
* With these three dependants gone, we can remove `wxWidgets` and `wxPython`.
* This simplifies the update to `wxWidgets-gtk3` and (hopefully---I'm still working) `wxPython4`.
* While we're at it, we can transition `wxPython4` back to its proper name, just `wxPython`.
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/46237.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wxwidgets-46237.patch --]
[-- Type: text/x-diff, Size: 74968 bytes --]
From 549650d4086430bcc0b5da744aea6fa4c15180f6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 24 Sep 2023 23:19:30 -0400
Subject: [PATCH 01/44] 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 <orphan@voidlinux.org>"
-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" <ajh@sideband.org>
Date: Sun, 24 Sep 2023 23:21:42 -0400
Subject: [PATCH 02/44] 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 <me@johnnynator.dev>
-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 <wx/stackwalk.h>
-
-+#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 <selfsigned@protonmail.ch>"
-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" <ajh@sideband.org>
Date: Sun, 24 Sep 2023 23:24:33 -0400
Subject: [PATCH 03/44] 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 <lemmi@nerd2nerd.org>"
-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" <ajh@sideband.org>
Date: Sun, 24 Sep 2023 23:26:53 -0400
Subject: [PATCH 04/44] 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 <orphan@voidlinux.org>"
-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" <ajh@sideband.org>
Date: Sun, 24 Sep 2023 23:28:40 -0400
Subject: [PATCH 05/44] 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 @@
- <using module="gettext"/>
- <gettext-catalogs id="locale">
- <srcdir>$(SRCDIR)/locale</srcdir>
-- <catalog-name>wxstd</catalog-name>
-+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
- <linguas>
- 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 <grauehaare@gmx.de>"
-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 0cc958f11c22d9677d253d27fdd50bedd75b1f1d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:04:33 -0400
Subject: [PATCH 06/44] wxWidgets-gtk3: update to 3.2.2.1.
---
common/shlibs | 32 +++++++--------
.../patches/nonfatal-abi-check.patch | 21 +++++-----
srcpkgs/wxWidgets-gtk3/template | 39 ++++++++++++++-----
srcpkgs/wxWidgets-gtk3/update | 4 +-
4 files changed, 57 insertions(+), 39 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 <helmut@pozimski.eu>"
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
}
diff --git a/srcpkgs/wxWidgets-gtk3/update b/srcpkgs/wxWidgets-gtk3/update
index ac4c5f040ec44..051b6769752c6 100644
--- a/srcpkgs/wxWidgets-gtk3/update
+++ b/srcpkgs/wxWidgets-gtk3/update
@@ -1,3 +1 @@
-site="https://github.com/wxWidgets/wxWidgets/releases/latest"
-# development version
-ignore='3.1.*'
+pkgname=wxWidgets
From fbb56bc59b3717b9058dce4a0b71b08204547322 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 07:53:19 -0400
Subject: [PATCH 07/44] wxPython4: update to 4.2.1, rename to wxPython
---
srcpkgs/{wxPython4 => wxPython}/template | 30 +++---
srcpkgs/wxPython4 | 1 +
...fig-gtk3.0-to-avoid-conflict-with-wx.patch | 52 -----------
srcpkgs/wxPython4/patches/cross.patch | 12 ---
srcpkgs/wxPython4/patches/nullptr-cast.patch | 11 ---
srcpkgs/wxPython4/patches/python-3.11.patch | 92 -------------------
srcpkgs/wxPython4/patches/syntax.patch | 32 -------
srcpkgs/wxPython4/update | 1 -
8 files changed, 17 insertions(+), 214 deletions(-)
rename srcpkgs/{wxPython4 => wxPython}/template (73%)
create mode 120000 srcpkgs/wxPython4
delete mode 100644 srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
delete mode 100644 srcpkgs/wxPython4/patches/cross.patch
delete mode 100644 srcpkgs/wxPython4/patches/nullptr-cast.patch
delete mode 100644 srcpkgs/wxPython4/patches/python-3.11.patch
delete mode 100644 srcpkgs/wxPython4/patches/syntax.patch
delete mode 100644 srcpkgs/wxPython4/update
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython/template
similarity index 73%
rename from srcpkgs/wxPython4/template
rename to srcpkgs/wxPython/template
index e0edf6fb9452f..bc4873fb541aa 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython/template
@@ -1,7 +1,7 @@
-# Template file for 'wxPython4'
-pkgname=wxPython4
-version=4.0.7
-revision=7
+# Template file for 'wxPython'
+pkgname=wxPython
+version=4.2.1
+revision=1
build_style=python3-module
make_build_args="--skip-build"
make_install_args="--skip-build"
@@ -9,25 +9,21 @@ hostmakedepends="pkg-config python3-setuptools python3-pathlib2"
makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel webkit2gtk-devel
gst-plugins-base1-devel"
depends="python3 python3-six python3-numpy python3-Pillow"
-short_desc="WxWidgets GUI toolkit library (Python3 Bindings)"
+short_desc="Python bindings for wxWidgets"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:wxWindows"
homepage="http://www.wxpython.org/"
distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
-checksum=3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
+checksum=e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c
+export WXPYTHON_RELEASE=yes
if [ "$CROSS_BUILD" ]; then
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
+ export WX_CONFIG="${XBPS_WRAPPERDIR}/wx-config-gtk3"
+else
+ export WX_CONFIG=wx-config-gtk3
fi
-pre_patch() {
- # need to patch for Python 3.11, extract them now.
- cd bin
- sed '/__name__.*__main__/i sys.exit(0)' waf-* >tmp-waf
- python3 tmp-waf
- ln -s .waf3-* .waf3
-}
-
pre_build() {
chmod -R go+rX $wrksrc
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}$wrksrc"
@@ -48,3 +44,9 @@ pre_build() {
post_install() {
vlicense LICENSE.txt
}
+
+wxPython4_package() {
+ build_style=meta
+ short_desc+=" - transitional dummy package"
+ depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/wxPython4 b/srcpkgs/wxPython4
new file mode 120000
index 0000000000000..e396d5ae370d6
--- /dev/null
+++ b/srcpkgs/wxPython4
@@ -0,0 +1 @@
+wxPython
\ No newline at end of file
diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
deleted file mode 100644
index 72a678da78589..0000000000000
--- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Sat, 22 Sep 2018 20:59:29 -0700
-Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
- wxWidgets-gtk2
-
----
- build.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git build.py build.py
-index 3cd5b828..57dbd384 100755
---- a/build.py
-+++ b/build.py
-@@ -400,7 +400,7 @@ def makeOptionParser():
- ("mac_arch", ("", "Comma separated list of architectures to build on Mac")),
-
- ("use_syswx", (False, "Try to use an installed wx rather than building the "
-- "one in this source tree. The wx-config in {prefix}/bin "
-+ "one in this source tree. The wx-config-gtk3 in {prefix}/bin "
- "or the first found on the PATH determines which wx is "
- "used. Implies --no_magic.")),
- ("force_config", (False, "Run configure when building even if the script "
-@@ -1271,7 +1271,7 @@ def cmd_build_wx(options, args):
- os.path.join(wxDir(), 'configure'),
- os.path.join(wxDir(), 'setup.h.in'),
- os.path.join(wxDir(), 'version-script.in'),
-- os.path.join(wxDir(), 'wx-config.in'),
-+ os.path.join(wxDir(), 'wx-config-gtk3.in'),
- ]
- for dep in dependencies:
- if newer(dep, os.path.join(BUILD_DIR, "Makefile")):
-@@ -1424,13 +1424,13 @@ def cmd_build_py(options, args):
- os.environ['WXPYTHON_RELEASE'] = 'yes'
-
- if not isWindows:
-- WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
-+ WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3')
- if options.use_syswx:
-- wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')
-+ wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3')
- if options.prefix and os.path.exists(wxcfg):
- WX_CONFIG = wxcfg
- else:
-- WX_CONFIG = 'wx-config' # hope it is on the PATH
-+ WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH
-
-
- wafBuildBase = wafBuildDir = getWafBuildBase()
---
-2.19.0
-
diff --git a/srcpkgs/wxPython4/patches/cross.patch b/srcpkgs/wxPython4/patches/cross.patch
deleted file mode 100644
index 4f343de201cb0..0000000000000
--- a/srcpkgs/wxPython4/patches/cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: wxPython-4.0.7/build.py
-===================================================================
---- wxPython-4.0.7.orig/build.py
-+++ wxPython-4.0.7/build.py
-@@ -169,7 +169,6 @@ def main(args):
- setPythonVersion(args)
- setDevModeOptions(args)
-
-- os.environ['PYTHONPATH'] = phoenixDir()
- os.environ['PYTHONUNBUFFERED'] = 'yes'
- os.environ['WXWIN'] = wxDir()
-
diff --git a/srcpkgs/wxPython4/patches/nullptr-cast.patch b/srcpkgs/wxPython4/patches/nullptr-cast.patch
deleted file mode 100644
index d9351c714b4fc..0000000000000
--- a/srcpkgs/wxPython4/patches/nullptr-cast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sip/cpp/sip_propgridwxPGPropArgCls.cpp
-+++ b/sip/cpp/sip_propgridwxPGPropArgCls.cpp
-@@ -317,7 +317,7 @@ static int convertTo_wxPGPropArgCls(PyOb
- return sipGetState(sipTransferObj);
- }
- else if (sipPy == Py_None) {
-- *sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL));
-+ *sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty * >(NULL));
- return sipGetState(sipTransferObj);
- }
- else {
diff --git a/srcpkgs/wxPython4/patches/python-3.11.patch b/srcpkgs/wxPython4/patches/python-3.11.patch
deleted file mode 100644
index 15496bdecbca0..0000000000000
--- a/srcpkgs/wxPython4/patches/python-3.11.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur wxPython-4.0.7.orig/bin/.waf3/waflib/ConfigSet.py wxPython-4.0.7/bin/.waf3/waflib/ConfigSet.py
---- wxPython-4.0.7.orig/bin/.waf3/waflib/ConfigSet.py
-+++ wxPython-4.0.7/bin/.waf3/waflib/ConfigSet.py
-@@ -146,7 +146,7 @@
- Utils.writef(filename,''.join(buf))
- def load(self,filename):
- tbl=self.table
-- code=Utils.readf(filename,m='rU')
-+ code=Utils.readf(filename,m='r')
- for m in re_imp.finditer(code):
- g=m.group
- tbl[g(2)]=eval(g(3))
-diff -ur wxPython-4.0.7.orig/bin/.waf3/waflib/Context.py wxPython-4.0.7/bin/.waf3/waflib/Context.py
---- wxPython-4.0.7.orig/bin/.waf3/waflib/Context.py
-+++ wxPython-4.0.7/bin/.waf3/waflib/Context.py
-@@ -106,7 +106,7 @@
- cache[node]=True
- self.pre_recurse(node)
- try:
-- function_code=node.read('rU',encoding)
-+ function_code=node.read('r',encoding)
- exec(compile(function_code,node.abspath(),'exec'),self.exec_dict)
- finally:
- self.post_recurse(node)
-@@ -346,7 +346,7 @@
- pass
- module=imp.new_module(WSCRIPT_FILE)
- try:
-- code=Utils.readf(path,m='rU',encoding=encoding)
-+ code=Utils.readf(path,m='r',encoding=encoding)
- except EnvironmentError:
- raise Errors.WafError('Could not read the file %r'%path)
- module_dir=os.path.dirname(path)
-diff -ur wxPython-4.0.7.orig/bin/.waf3/waflib/Tools/python.py wxPython-4.0.7/bin/.waf3/waflib/Tools/python.py
---- wxPython-4.0.7.orig/bin/.waf3/waflib/Tools/python.py
-+++ wxPython-4.0.7/bin/.waf3/waflib/Tools/python.py
-@@ -207,7 +207,7 @@
- x='MACOSX_DEPLOYMENT_TARGET'
- if dct[x]:
- env[x]=conf.environ[x]=dct[x]
-- env.pyext_PATTERN='%s'+dct['SO']
-+ env.pyext_PATTERN='%s.so'
- num='.'.join(env.PYTHON_VERSION.split('.')[:2])
- conf.find_program([''.join(pybin)+'-config','python%s-config'%num,'python-config-%s'%num,'python%sm-config'%num],var='PYTHON_CONFIG',msg="python-config",mandatory=False)
- if env.PYTHON_CONFIG:
-diff -ur wxPython-4.0.7.orig/sip/siplib/sip.h wxPython-4.0.7/sip/siplib/sip.h
---- wxPython-4.0.7.orig/sip/siplib/sip.h
-+++ wxPython-4.0.7/sip/siplib/sip.h
-@@ -1794,7 +1794,7 @@
- int (*api_get_time)(PyObject *, sipTimeDef *);
- PyObject *(*api_from_time)(const sipTimeDef *);
- int (*api_is_user_type)(const sipWrapperType *);
-- struct _frame *(*api_get_frame)(int);
-+ PyFrameObject *(*api_get_frame)(int);
- int (*api_check_plugin_for_type)(const sipTypeDef *, const char *);
- PyObject *(*api_unicode_new)(SIP_SSIZE_T, unsigned, int *, void **);
- void (*api_unicode_write)(int, void *, int, unsigned);
-diff -ur wxPython-4.0.7.orig/sip/siplib/siplib.c wxPython-4.0.7/sip/siplib/siplib.c
---- wxPython-4.0.7.orig/sip/siplib/siplib.c
-+++ wxPython-4.0.7/sip/siplib/siplib.c
-@@ -439,7 +439,7 @@
- static int sip_api_get_time(PyObject *obj, sipTimeDef *time);
- static PyObject *sip_api_from_time(const sipTimeDef *time);
- static int sip_api_is_user_type(const sipWrapperType *wt);
--static struct _frame *sip_api_get_frame(int);
-+static PyFrameObject *sip_api_get_frame(int);
- static int sip_api_check_plugin_for_type(const sipTypeDef *td,
- const char *name);
- static PyObject *sip_api_unicode_new(SIP_SSIZE_T len, unsigned maxchar,
-@@ -13688,15 +13688,19 @@
- /*
- * Return a frame from the execution stack.
- */
--static struct _frame *sip_api_get_frame(int depth)
-+static PyFrameObject *sip_api_get_frame(int depth)
- {
-- struct _frame *frame = PyEval_GetFrame();
-+ PyFrameObject *frame = PyEval_GetFrame();
-+ Py_XINCREF(frame);
-
- while (frame != NULL && depth > 0)
- {
-- frame = frame->f_back;
-+ PyFrameObject *oframe = frame;
-+ frame = PyFrame_GetBack(frame);
-+ Py_DECREF(oframe);
- --depth;
- }
-+ Py_XDECREF(frame);
-
- return frame;
- }
diff --git a/srcpkgs/wxPython4/patches/syntax.patch b/srcpkgs/wxPython4/patches/syntax.patch
deleted file mode 100644
index 862934f996159..0000000000000
--- a/srcpkgs/wxPython4/patches/syntax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: wxPython-4.0.7/wx/lib/masked/maskededit.py
-===================================================================
---- wxPython-4.0.7.orig/wx/lib/masked/maskededit.py
-+++ wxPython-4.0.7/wx/lib/masked/maskededit.py
-@@ -2645,7 +2645,7 @@ class MaskedEditMixin:
- raise ve
- elif replace_to > end:
- #### dbg(indent=0)
-- ve = ValueError('"%s" will not fit into field %d of control "%s"' (choice, index, self.name))
-+ ve = ValueError('"%s" will not fit into field %d of control "%s"' % (choice, index, self.name))
- ve.value = choice
- ve.index = index
- raise ve
-Index: wxPython-4.0.7/wx/lib/plot/plotcanvas.py
-===================================================================
---- wxPython-4.0.7.orig/wx/lib/plot/plotcanvas.py
-+++ wxPython-4.0.7/wx/lib/plot/plotcanvas.py
-@@ -1852,12 +1852,12 @@ class PlotCanvas(wx.Panel):
- # Get ticks and textExtents for axis if required
- xticks = yticks = None
- xTextExtent = yTextExtent = (0, 0) # No text for ticks
-- if self._xSpec is not 'none':
-+ if self._xSpec != 'none':
- xticks = self._xticks(xAxis[0], xAxis[1])
- # w h of x axis text last number on axis
- xTextExtent = dc.GetTextExtent(xticks[-1][1])
-
-- if self._ySpec is not 'none':
-+ if self._ySpec != 'none':
- yticks = self._yticks(yAxis[0], yAxis[1])
- if self.logScale[1]:
- # make sure we have enough room to display SI notation.
diff --git a/srcpkgs/wxPython4/update b/srcpkgs/wxPython4/update
deleted file mode 100644
index 1527342250f66..0000000000000
--- a/srcpkgs/wxPython4/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=wxPython
From 0acd574685934dce33e3bc952197285f8a977cbb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:19 -0400
Subject: [PATCH 08/44] 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 d951667d89b11410198f50701c9591b9ad5db0d0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:19 -0400
Subject: [PATCH 09/44] 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 d48838f383f0a5ed0666f169d69dbf37e6354b08 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:19 -0400
Subject: [PATCH 10/44] 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 9b8908812947c49fa3013ae6fa95f07612c58b12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:19 -0400
Subject: [PATCH 11/44] 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 0698676165193d9250067510084ddcda569908a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:19 -0400
Subject: [PATCH 12/44] 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 6cf619bbc7ee5637b182c97c4cf26753b0522994 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:19 -0400
Subject: [PATCH 13/44] 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 d75d2b3cd2cc32adcd20fa416242409a2ae250f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:19 -0400
Subject: [PATCH 14/44] 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 28e75fa334c6b8d2c8e3a7a2fb3ac446a2d85f5c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:19 -0400
Subject: [PATCH 15/44] 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 e2ea19238907c7fc60c7a98378b88e5fc62f185e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:20 -0400
Subject: [PATCH 16/44] 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 b13bf0db86ea5eba5ea8d02d54910a3eec08a150 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:20 -0400
Subject: [PATCH 17/44] 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 0e8c25dad89ff99b6974140ace8601dc8c73ad2e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:20 -0400
Subject: [PATCH 18/44] 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 8a4aadee13be4a69068fec41b27973adccc1b434 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:20 -0400
Subject: [PATCH 19/44] 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 812655f7612aba30ed58db93d667ac50ea88508e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:20 -0400
Subject: [PATCH 20/44] 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 2dfb80d51d2053f3185db4bed3728a45a6966437 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:20 -0400
Subject: [PATCH 21/44] 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 5987d8b61db1b4b4e687625bdde32527150c18a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:20 -0400
Subject: [PATCH 22/44] 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 508269183efd4e1dbe4800d0e29ec892ed23c329 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:21 -0400
Subject: [PATCH 23/44] 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 952cfccf106a68d1d7a67326def51b83568ab66e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:21 -0400
Subject: [PATCH 24/44] 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 e6bc38e02c68a48a1c3310e00b03faebe3cafddd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:21 -0400
Subject: [PATCH 25/44] 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 5866050114f1c4331b42cbe649dcf74418ea6b91 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:21 -0400
Subject: [PATCH 26/44] 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 32c24b1a1f377a88f0b2167e3ca08c95f6e3e27f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:21 -0400
Subject: [PATCH 27/44] 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 1261395353d0e3e26e88953dc61c80b5a3541588 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:21 -0400
Subject: [PATCH 28/44] 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 3846268938dfb54e96ced6e2a489b1f548bfa65d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:21 -0400
Subject: [PATCH 29/44] 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 53f8ab344c7a4668588cdc5e3e84442a46765d0e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:22 -0400
Subject: [PATCH 30/44] 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 0a0ea4fc0401528c3bea1bf619f06fb967f171bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:22 -0400
Subject: [PATCH 31/44] 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 62973310ea7712ada6f8703b84cace48938ba88a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:22 -0400
Subject: [PATCH 32/44] 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 e945637d9734277b5cb753bfa86ceb8c522553ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:22 -0400
Subject: [PATCH 33/44] 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 b08f3f66b2c156ba20ee7f56c0ac53fe5c754306 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:22 -0400
Subject: [PATCH 34/44] 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 18be72b65e4a4a4d7d4b42ad7fbc09caab29875b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:22 -0400
Subject: [PATCH 35/44] 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 ae4e8e3c5693289a8a1ed06279baa08d03779f61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:22 -0400
Subject: [PATCH 36/44] 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 39b5c8882a9ee76fbb904869e5b8436f474a36d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:23 -0400
Subject: [PATCH 37/44] 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 4f3c1daf914d7659e59104fd1981799eebf95beb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 00:18:23 -0400
Subject: [PATCH 38/44] 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"
From 69fb1cc874a9dfc3542fb4a8658b7d367d97ad54 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 08:02:05 -0400
Subject: [PATCH 39/44] chirp: rebuild against new wxPython
---
srcpkgs/chirp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chirp/template b/srcpkgs/chirp/template
index d2386ba4966be..18b41c26b627d 100644
--- a/srcpkgs/chirp/template
+++ b/srcpkgs/chirp/template
@@ -1,10 +1,10 @@
# Template file for 'chirp'
pkgname=chirp
version=20230911
-revision=1
+revision=2
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
-depends="python3-six wxPython4 python3-pyserial python3-future python3-requests
+depends="python3-six wxPython python3-pyserial python3-future python3-requests
python3-suds python3-yattag"
short_desc="Open-source tool for programming amateur radios"
maintainer="Emil Miler <em@0x45.cz>"
From 644237d747352e9cf6748fadfa6b8d2496682381 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 08:02:51 -0400
Subject: [PATCH 40/44] grass: rebuild against new wxPython
---
srcpkgs/grass/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index 8ba03bb7bea98..ded8e40daaf10 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,7 +1,7 @@
# Template file for 'grass'
pkgname=grass
version=8.2.1
-revision=2
+revision=3
_binver=${version//./}
_binver=${_binver:0:2}
build_style=gnu-configure
@@ -11,7 +11,7 @@ hostmakedepends="flex libgdal-tools pkg-config python3-numpy python3-six tar"
makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel
fftw-devel cairo-devel glu-devel"
depends="python3-numpy python3-dateutil python3-Pillow python3-matplotlib
- python3-six python3-ply wxPython4"
+ python3-six python3-ply wxPython"
short_desc="Geographic Resources Analysis Support System - GIS"
maintainer="Alex Jarosch <research@alexj.at>"
license="GPL-2.0-or-later"
@@ -22,7 +22,7 @@ python_version=3
nocross="tries to execute target binaries"
post_install() {
- # This package is broken with wxPython4 (<=4.0.7),
- # hence the GUI is compulsorily disabled.
+ # This package is broken with wxPython (<=4.0.7) and the GUI
+ # is disabled pending further testing with newer wxPython
vsed -i "${DESTDIR}/usr/bin/grass" -e "s/\(default_gui =\).*/\1 \"text\"/"
}
From 7066f23d8df3bf61578c827791d19d435ac125d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 08:06:21 -0400
Subject: [PATCH 41/44] kicad: rebuild against new wxPython
---
srcpkgs/kicad/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 1fb6dd434da42..3c86fae2066c7 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=7.0.1
-revision=3
+revision=4
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON
@@ -9,10 +9,11 @@ configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON
-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
-DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3 tar gettext"
-makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- boost-devel libcurl-devel glm libgomp-devel libfreeglut-devel gtk+3-devel unixodbc-devel
+makedepends="wxWidgets-gtk3-devel wxPython python3-devel glew-devel
+ cairo-devel boost-devel libcurl-devel glm libgomp-devel libfreeglut-devel
+ gtk+3-devel unixodbc-devel
$(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
-depends="wxPython4"
+depends="wxPython"
short_desc="Electronic schematic and PCB design software"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
@@ -41,7 +42,7 @@ fi
nocross="execute lemon during build"
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" wxPython4"
+ hostmakedepends+=" wxPython"
configure_args+=" -DPYTHON_DEST=/${py3_sitelib}
-DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
fi
From 33d67c8dfe4368f6bbea3e1d5df48f15f72e62bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 08:06:54 -0400
Subject: [PATCH 42/44] mymcplus: rebuild against new wxPython
---
srcpkgs/mymcplus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mymcplus/template b/srcpkgs/mymcplus/template
index 930711eeb2c59..5bb08ef9ea5d4 100644
--- a/srcpkgs/mymcplus/template
+++ b/srcpkgs/mymcplus/template
@@ -1,10 +1,10 @@
# Template file for 'mymcplus'
pkgname=mymcplus
version=3.0.5
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="wxPython4 python3-PyOpenGL"
+depends="wxPython python3-PyOpenGL"
checkdepends="$depends python3-pytest"
short_desc="PlayStation 2 memory card manager"
maintainer="Andrew Benson <abenson+void@gmail.com>"
From 940d436b21770427db8201df163df767e3b7c591 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 08:07:26 -0400
Subject: [PATCH 43/44] photofilmstrip: rebuild against new wxPython
---
srcpkgs/photofilmstrip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/photofilmstrip/template b/srcpkgs/photofilmstrip/template
index d2050ac4c64c8..d2c7511629250 100644
--- a/srcpkgs/photofilmstrip/template
+++ b/srcpkgs/photofilmstrip/template
@@ -1,10 +1,10 @@
# Template file for 'photofilmstrip'
pkgname=photofilmstrip
version=4.0.0
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools gst1-python3 python3-Sphinx gettext"
-depends="python3 gst1-python3 gst1-editing-services python3-Pillow wxPython4"
+depends="python3 gst1-python3 gst1-editing-services python3-Pillow wxPython"
checkdepends="$depends"
short_desc="Slideshow creator with Ken Burns effect"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
From cffca6aeab7bdf9814ac25157a9461e08a4da4d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Sep 2023 08:07:48 -0400
Subject: [PATCH 44/44] playonlinux: rebuild against new wxPython
---
srcpkgs/playonlinux/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template
index 56207a29aa23a..394a4f2d5b3b4 100644
--- a/srcpkgs/playonlinux/template
+++ b/srcpkgs/playonlinux/template
@@ -1,10 +1,10 @@
# Template file for 'playonlinux'
pkgname=playonlinux
version=4.4
-revision=1
+revision=2
# contains pre-compiled binaries linked against glibc
archs="i686 x86_64"
-depends="icoutils netcat ImageMagick xterm wxPython4 cabextract unzip glxinfo
+depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo
gnupg xdg-user-dirs libXmu wget p7zip curl jq python3-natsort xrdb gettext
perl"
short_desc="GUI for managing Windows programs under linux"
next prev parent reply other threads:[~2023-09-25 12:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 4:42 [PR PATCH] " ahesford
2023-09-25 5:40 ` classabbyamp
2023-09-25 5:41 ` classabbyamp
2023-09-25 10:02 ` lemmi
2023-09-25 12:12 ` ahesford [this message]
2023-09-25 12:35 ` [PR PATCH] [Updated] " ahesford
2023-09-25 13:52 ` ahesford
2023-09-25 14:14 ` ahesford
2023-09-25 14:15 ` ahesford
2023-09-25 14:17 ` [PR PATCH] [Updated] " ahesford
2023-09-25 15:21 ` ahesford
2023-09-25 15:21 ` [PR PATCH] [Updated] " ahesford
2023-09-25 15:21 ` ahesford
2023-09-25 15:52 ` [PR PATCH] [Updated] " ahesford
2023-09-25 15:55 ` ahesford
2023-09-25 15:57 ` ahesford
2023-09-25 16:19 ` [PR PATCH] [Updated] " ahesford
2023-09-25 17:00 ` classabbyamp
2023-09-25 17:02 ` classabbyamp
2023-09-25 17:03 ` classabbyamp
2023-09-25 20:03 ` [PR PATCH] [Updated] [WIP] wxWidgets, wxPython ahesford
2023-09-25 20:12 ` ahesford
2023-09-25 20:18 ` [PR PATCH] [Updated] " ahesford
2023-09-25 20:35 ` ahesford
2023-09-25 20:49 ` ahesford
2023-09-25 23:53 ` ahesford
2023-09-26 3:48 ` ahesford
2023-09-26 3:50 ` ahesford
2023-09-26 13:42 ` ahesford
2023-09-26 16:06 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230925121235.j9CskxJ3jTOhdf95J-im_Gscd_tldCfZotbF-JzfDuE@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).