dev-python/wxpython: add 4.2.2

Bug: https://bugs.gentoo.org/923418
Bug: https://bugs.gentoo.org/924057
Closes: https://bugs.gentoo.org/909973
Signed-off-by: Quincy Fleming <quincyf467@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39465
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Quincy Fleming
2025-02-26 18:01:05 +00:00
committed by Sam James
parent 1c8ca88115
commit 15b4e232d1
5 changed files with 205 additions and 0 deletions

View File

@@ -1,2 +1,3 @@
DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
DIST wxPython-4.2.1.tar.gz 73724359 BLAKE2B d9569ea172c7279e0b2cfcb3cdcd5d1faab5324e2648c9b0f8c8b838fb2355dc6af28c4593e5dd0cfa02573133bf15a58a6ffa9711d854925a9cada0985dc7f8 SHA512 ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438
DIST wxPython-4.2.2.tar.gz 57358880 BLAKE2B 325256e0d57f868453ed48ea4580a1ea6763acffacb7cd937cf440c55f43fc540dab867a947fb2c9eb353855888aaa370d85103b888bd1339cf5abe7302aba19 SHA512 08b74285b94f21ebf30fef8c9ebf8cfd074dd3976209372bb5b704b0b792038f9af484dd1378894052eedb0ce603af6935b7d00d695da4e4a15e1ea3bdb3520f

View File

@@ -0,0 +1,16 @@
https://bugs.gentoo.org/924057
--- a/sip/cpp/sip_corewxAppTraits.cpp
+++ b/sip/cpp/sip_corewxAppTraits.cpp
@@ -471,7 +471,11 @@
PyErr_Clear();
Py_BEGIN_ALLOW_THREADS
+ #ifdef __GLIBC__
sipRes = new ::wxString((sipSelfWasArg ? sipCpp->::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
+ #else
+ sipRes = new ::wxString("");
+ #endif
Py_END_ALLOW_THREADS
if (PyErr_Occurred())

View File

@@ -0,0 +1,38 @@
Created by Quincy Fleming
https://bugs.gentoo.org/909973
--- a/setup.py
+++ b/setup.py
@@ -113,6 +113,7 @@
"""
user_options = [
('skip-build', None, 'skip building the C/C++ code (assumes it has already been done)'),
+ ('buildpy-options=', None, 'string of commands and options passed to build.py'),
]
boolean_options = ['skip-build']
@@ -120,6 +121,7 @@
def initialize_options(self):
orig_build.initialize_options(self)
self.skip_build = '--skip-build' in sys.argv
+ self.buildpy_options = 'build'
def finalize_options(self):
orig_build.finalize_options(self)
@@ -135,7 +137,7 @@
'message and the wxWidgets and Phoenix build steps in the future.\n')
# Use the same Python that is running this script.
- cmd = ['"{}"'.format(sys.executable), '-u', 'build.py', 'build']
+ cmd = ['"{}"'.format(sys.executable), '-u', 'build.py',self.buildpy_options]
cmd = ' '.join(cmd)
runcmd(cmd)
@@ -143,7 +145,6 @@
# build/lib folder like normal.
orig_build.run(self)
-
def _cleanup_symlinks(cmd):
# Clean out any libwx* symlinks in the build_lib folder, as they will
# turn into copies in the egg since zip files can't handle symlinks.

View File

@@ -0,0 +1,14 @@
https://bugs.gentoo.org/949510#c4
https://github.com/wxWidgets/Phoenix/commit/de9aa4be5bb49adf82991c7582ea3c42ed505bf7.patch
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -85,7 +85,7 @@
PKGDIR = 'wx'
# The name of the top-level package
- SIP_ABI = '12.9'
+ SIP_ABI = '12.14'
SIP_TRACE = False
# ---------------------------------------------------------------

View File

@@ -0,0 +1,136 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} )
PYPI_NO_NORMALIZE=1
PYPI_PN="wxPython"
WX_GTK_VER="3.2-gtk3"
inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
DESCRIPTION="A blending of the wxWindows C++ class library with Python"
HOMEPAGE="
https://www.wxpython.org/
https://github.com/wxWidgets/Phoenix/
https://pypi.org/project/wxPython/
"
LICENSE="wxWinLL-3"
SLOT="4.0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="test webkit"
RESTRICT="!test? ( test )"
# wxPython doesn't seem to be able to optionally disable features. webkit is
# optionally patched out because it's so huge, but other elements are not,
# which makes us have to require all features from wxGTK
DEPEND="
>=x11-libs/wxGTK-3.2.6:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
media-libs/libpng:=
media-libs/tiff:=
media-libs/libjpeg-turbo:=
"
RDEPEND="
${DEPEND}
"
BDEPEND="
app-text/doxygen
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/sip-6.8.5[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
test? (
${VIRTUALX_DEPEND}
dev-python/appdirs[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
PATCHES=(
"${FILESDIR}/${PN}-4.2.0-flags.patch"
"${FILESDIR}/${PN}-4.2.1-x86-time.patch"
"${FILESDIR}/${P}-sip-6.10.0.patch"
"${FILESDIR}/${P}-setuppy.patch"
)
python_prepare_all() {
if ! use webkit; then
eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
fi
# sip assumes unconditional C99 support since 6.8.4
# which breaks when trying to use "sip/siplib/bool.cpp"
# https://github.com/Python-SIP/sip/commit/29fb3df49ff37df7aab9d5666fd72de95ac9e7f8
if has_version ">=dev-python/sip-6.8.4"; then
sed -i '\|sip/siplib/bool\.cpp|d' wscript || die
fi
local build_options="build_py --use_syswx --no_magic --jobs="$(makeopts_jobs)" --verbose --release"
DISTUTILS_ARGS=(
--verbose
build
--buildpy-options="${build_options}"
)
distutils-r1_python_prepare_all
}
src_configure() {
setup-wxwidgets
}
python_compile() {
#Patch will fail if copy of refreshed sip file is not restored if using multiple
#python implementations
DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg sip --nodoc || die
cp "${S}/sip/cpp/sip_corewxAppTraits.cpp" "${S}" || die
eapply "${FILESDIR}/${P}-no-stacktrace.patch" || die
distutils-r1_python_compile
cp "${S}/sip_corewxAppTraits.cpp" "${S}/sip/cpp/" || die
}
python_test() {
local EPYTEST_DESELECT=(
# virtx probably
unittests/test_display.py::display_Tests::test_display
unittests/test_frame.py::frame_Tests::test_frameRestore
unittests/test_mousemanager.py::mousemanager_Tests::test_mousemanager1
unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardChar
unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardKeyDownUp
unittests/test_uiaction.py::uiaction_MouseTests
# assertion (TODO)
unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
unittests/test_lib_agw_piectrl.py::lib_agw_piectrl_Tests::test_lib_agw_piectrlCtor
# seems to rely on state from a previous test (sigh)
unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
# requires Spanish localization
unittests/test_intl.py::intl_Tests::test_intlGetString
# TODO
unittests/test_tipwin.py::tipwin_Tests::test_tipwinCtor
unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
unittests/test_windowid.py::IdManagerTest::test_newIdRef03
)
local EPYTEST_IGNORE=()
if ! use webkit; then
EPYTEST_IGNORE+=( unittests/test_webview.py )
fi
# We use pytest-forked as opensuse does to avoid tests corrupting each
# other.
virtx epytest --forked -n "$(makeopts_jobs)" unittests
}