diff options
| author | Sam James <sam@gentoo.org> | 2025-02-18 22:09:19 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-02-18 22:09:37 +0000 |
| commit | 2a8e6ca015fa6107230f131d1232bfe2bb55bcbd (patch) | |
| tree | 5f92dcabb889f3ed9a4f8e5f8f361346667092a1 /dev-python/wxpython | |
| parent | b8176a0ef9ee1113f0b7c45dab6bbd751da0484a (diff) | |
| download | gentoo-2a8e6ca015fa6107230f131d1232bfe2bb55bcbd.tar.gz gentoo-2a8e6ca015fa6107230f131d1232bfe2bb55bcbd.tar.bz2 gentoo-2a8e6ca015fa6107230f131d1232bfe2bb55bcbd.zip | |
dev-python/wxpython: fix build w/ >=dev-python/sip-6.10.0
Closes: https://bugs.gentoo.org/949510
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-python/wxpython')
| -rw-r--r-- | dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch | 23 | ||||
| -rw-r--r-- | dev-python/wxpython/wxpython-4.2.1-r2.ebuild | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch b/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch new file mode 100644 index 000000000000..5d6751d7a8d4 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/949510#c4 +https://github.com/wxWidgets/Phoenix/commit/de9aa4be5bb49adf82991c7582ea3c42ed505bf7.patch + +From de9aa4be5bb49adf82991c7582ea3c42ed505bf7 Mon Sep 17 00:00:00 2001 +From: Scott Talbert <swt@techie.net> +Date: Sun, 9 Feb 2025 17:50:08 -0500 +Subject: [PATCH] Update SIP ABI version to 12.14 + +We haven't supported 12.8 since before we upgraded to SIP 6.6+. +However, SIP has not been correctly generating the correct module +version until very recently, so generating 12.8 doesn't actually compile +with current wxPython. +--- a/buildtools/config.py ++++ b/buildtools/config.py +@@ -88,7 +88,7 @@ class Configuration(object): + PKGDIR = 'wx' + # The name of the top-level package + +- SIP_ABI = '12.8' ++ SIP_ABI = '12.14' + SIP_TRACE = False + + # --------------------------------------------------------------- diff --git a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild index ec62390a1579..0a82fba9a074 100644 --- a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild +++ b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.2.1-integer-division-for-randint.patch" "${FILESDIR}/${PN}-4.2.1-x86-time.patch" "${FILESDIR}/${PN}-4.2.1-doxygen-1.9.7.patch" + "${FILESDIR}/${PN}-4.2.1-sip-6.10.0.patch" ) python_prepare_all() { |