From f2e855155c4f5af5e61941d2c3067f806a55ee14 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Thu, 21 Dec 2023 23:13:31 +0000 Subject: Adding metadata --- dev-python/wxpython/Manifest | 1 + .../wxpython/files/wxpython-4.2.0-cython-3.patch | 19 ++++ .../files/wxpython-4.2.0-fix-cython3.patch | 13 --- dev-python/wxpython/metadata.xml | 10 +- dev-python/wxpython/wxpython-4.2.0-r1.ebuild | 122 -------------------- dev-python/wxpython/wxpython-4.2.0.ebuild | 123 ++++++++++++++++++++ dev-python/wxpython/wxpython-4.2.1.ebuild | 125 +++++++++++++++++++++ 7 files changed, 275 insertions(+), 138 deletions(-) create mode 100644 dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch delete mode 100644 dev-python/wxpython/files/wxpython-4.2.0-fix-cython3.patch delete mode 100644 dev-python/wxpython/wxpython-4.2.0-r1.ebuild create mode 100644 dev-python/wxpython/wxpython-4.2.0.ebuild create mode 100644 dev-python/wxpython/wxpython-4.2.1.ebuild (limited to 'dev-python/wxpython') diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest index 7487d3ee61f7..5c6a4c0dbfb4 100644 --- a/dev-python/wxpython/Manifest +++ b/dev-python/wxpython/Manifest @@ -1 +1,2 @@ DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f +DIST wxPython-4.2.1.tar.gz 73724359 BLAKE2B d9569ea172c7279e0b2cfcb3cdcd5d1faab5324e2648c9b0f8c8b838fb2355dc6af28c4593e5dd0cfa02573133bf15a58a6ffa9711d854925a9cada0985dc7f8 SHA512 ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438 diff --git a/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch b/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch new file mode 100644 index 000000000000..aff380108b8e --- /dev/null +++ b/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/911703 +https://github.com/wxWidgets/Phoenix/pull/2441 + +From aeb557d01e7cd37176ebbf0f1ae6d0b53c115378 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Tue, 25 Jul 2023 12:42:32 -0400 +Subject: [PATCH] Fix compatibility with Cython 3.0.0 + +Remove unused import which seems to be removed in Cython 3. +--- a/wx/svg/_nanosvg.pyx ++++ b/wx/svg/_nanosvg.pyx +@@ -42,7 +42,6 @@ for manipulating the SVG shape info in memory. + + import sys + +-cimport cython.object + from cpython.buffer cimport ( + Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE, + PyBuffer_Release) diff --git a/dev-python/wxpython/files/wxpython-4.2.0-fix-cython3.patch b/dev-python/wxpython/files/wxpython-4.2.0-fix-cython3.patch deleted file mode 100644 index 3961f12e3442..000000000000 --- a/dev-python/wxpython/files/wxpython-4.2.0-fix-cython3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/wx/svg/_nanosvg.pyx b/wx/svg/_nanosvg.pyx -index cda04d5ca..d1cae1aa9 100644 ---- a/wx/svg/_nanosvg.pyx -+++ b/wx/svg/_nanosvg.pyx -@@ -42,7 +42,7 @@ for manipulating the SVG shape info in memory. - - import sys - --cimport cython.object -+ - from cpython.buffer cimport ( - Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE, - PyBuffer_Release) diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml index 0d618616ba59..0bd9f9a61086 100644 --- a/dev-python/wxpython/metadata.xml +++ b/dev-python/wxpython/metadata.xml @@ -2,9 +2,13 @@ - core@liguros.net - Development + wxwidgets@gentoo.org + Gentoo wxWidgets Project + + + python@gentoo.org + Python - binaryden-overlay + gentoo-staging \ No newline at end of file diff --git a/dev-python/wxpython/wxpython-4.2.0-r1.ebuild b/dev-python/wxpython/wxpython-4.2.0-r1.ebuild deleted file mode 100644 index 806eaf8f66e6..000000000000 --- a/dev-python/wxpython/wxpython-4.2.0-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_IN_SOURCE_BUILD="1" -PYTHON_COMPAT=( python3_{10..11} ) -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/" - -LICENSE="wxWinLL-3" -SLOT="4.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="test webkit" -# Tests broken: #726812, #722716 -# Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures) -RESTRICT="!test? ( 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 -RDEPEND=" - >=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] - media-libs/libpng:= - media-libs/tiff:= - media-libs/libjpeg-turbo:= -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-doc/doxygen - dev-python/cython[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/sip-6.6.2[${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}] - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.0-no-attrdict.patch" - "${FILESDIR}/${PN}-4.2.0-flags.patch" - "${FILESDIR}/${PN}-4.2.0-fix-cython3.patch" -) - -python_prepare_all() { - if ! use webkit; then - eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch" - rm unittests/test_webview.py || die - fi - - # Most of these tests disabled below fail because of the virtx/portage - # environment, but some fail for unknown reasons. - rm unittests/test_uiaction.py \ - unittests/test_notifmsg.py \ - unittests/test_mousemanager.py \ - unittests/test_display.py \ - unittests/test_pi_import.py \ - unittests/test_lib_agw_thumbnailctrl.py \ - unittests/test_sound.py || die - - distutils-r1_python_prepare_all -} - -src_configure() { - setup-wxwidgets -} - -python_compile() { - DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die - - # Refresh the bundled/pregenerated sip files - ${PYTHON} build.py sip || die - - # Build the bindings - ${PYTHON} build.py build_py \ - --use_syswx \ - --no_magic \ - --jobs="$(makeopts_jobs)" \ - --verbose \ - --release || die -} - -python_test() { - EPYTEST_DESELECT=( - # Aborts, needs investigation - unittests/test_utils.py::utils_Tests::test_utilsSomeOtherStuff - - # Failures, need investigation - unittests/test_frame.py::frame_Tests::test_frameRestore - unittests/test_fswatcher.py::fswatcher_Tests::test_fswatcher1 - unittests/test_intl.py::intl_Tests::test_intlGetString - unittests/test_lib_busy.py::lib_busy_Tests::test_lib_busy5 - unittests/test_lib_mixins_inspection.py::wit_TestCase::test_App_OnInit - unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1 - unittests/test_lib_pubsub_topicmgr.py::lib_pubsub_TopicMgr2_GetOrCreate_DefnProv::test20_UseProvider - unittests/test_windowid.py::IdManagerTest::test_newIdRef03 - unittests/test_auibook.py::auibook_Tests::test_auibook02 - unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerPersistValue - unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore - unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric - unittests/test_auiframemanager.py::auiframemanager_Tests::test_auiframemanager02 - ) - - # We use pytest-forked as opensuse does to avoid tests corrupting each - # other. - virtx epytest --forked -n "$(makeopts_jobs)" unittests -} - -python_install() { - distutils-r1_python_install --skip-build -} diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild new file mode 100644 index 000000000000..7488b0c5e8dd --- /dev/null +++ b/dev-python/wxpython/wxpython-4.2.0.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_IN_SOURCE_BUILD="1" +PYTHON_COMPAT=( python3_{10..11} ) +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/" + +LICENSE="wxWinLL-3" +SLOT="4.0" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" +IUSE="test webkit" +# Tests broken: #726812, #722716 +# Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures) +RESTRICT="!test? ( 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 +RDEPEND=" + >=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] + media-libs/libpng:= + media-libs/tiff:= + media-libs/libjpeg-turbo:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-doc/doxygen + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/sip-6.6.2[${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}] + ) +" + +PATCHES=( + #"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch" + "${FILESDIR}/${PN}-4.2.0-no-attrdict.patch" + "${FILESDIR}/${PN}-4.2.0-flags.patch" + "${FILESDIR}/${PN}-4.2.0-cython-3.patch" +) + +python_prepare_all() { + if ! use webkit; then + eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch" + rm unittests/test_webview.py || die + fi + + # Most of these tests disabled below fail because of the virtx/portage + # environment, but some fail for unknown reasons. + rm unittests/test_uiaction.py \ + unittests/test_notifmsg.py \ + unittests/test_mousemanager.py \ + unittests/test_display.py \ + unittests/test_pi_import.py \ + unittests/test_lib_agw_thumbnailctrl.py \ + unittests/test_sound.py || die + + distutils-r1_python_prepare_all +} + +src_configure() { + setup-wxwidgets +} + +python_compile() { + DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die + + # Refresh the bundled/pregenerated sip files + ${PYTHON} build.py sip || die + + # Build the bindings + ${PYTHON} build.py build_py \ + --use_syswx \ + --no_magic \ + --jobs="$(makeopts_jobs)" \ + --verbose \ + --release || die +} + +python_test() { + EPYTEST_DESELECT=( + # Aborts, needs investigation + unittests/test_utils.py::utils_Tests::test_utilsSomeOtherStuff + + # Failures, need investigation + unittests/test_frame.py::frame_Tests::test_frameRestore + unittests/test_fswatcher.py::fswatcher_Tests::test_fswatcher1 + unittests/test_intl.py::intl_Tests::test_intlGetString + unittests/test_lib_busy.py::lib_busy_Tests::test_lib_busy5 + unittests/test_lib_mixins_inspection.py::wit_TestCase::test_App_OnInit + unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1 + unittests/test_lib_pubsub_topicmgr.py::lib_pubsub_TopicMgr2_GetOrCreate_DefnProv::test20_UseProvider + unittests/test_windowid.py::IdManagerTest::test_newIdRef03 + unittests/test_auibook.py::auibook_Tests::test_auibook02 + unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerPersistValue + unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore + unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric + unittests/test_auiframemanager.py::auiframemanager_Tests::test_auiframemanager02 + ) + + # We use pytest-forked as opensuse does to avoid tests corrupting each + # other. + virtx epytest --forked -n "$(makeopts_jobs)" unittests +} + +python_install() { + distutils-r1_python_install --skip-build +} diff --git a/dev-python/wxpython/wxpython-4.2.1.ebuild b/dev-python/wxpython/wxpython-4.2.1.ebuild new file mode 100644 index 000000000000..a609da43141e --- /dev/null +++ b/dev-python/wxpython/wxpython-4.2.1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_IN_SOURCE_BUILD="1" +PYTHON_COMPAT=( python3_{10..11} ) +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.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] + media-libs/libpng:= + media-libs/tiff:= + media-libs/libjpeg-turbo:= +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + app-doc/doxygen + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/sip-6.6.2[${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-xdist[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.0-flags.patch" + "${FILESDIR}/${PN}-4.2.0-cython-3.patch" +) + +python_prepare_all() { + if ! use webkit; then + eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch" + fi + + distutils-r1_python_prepare_all +} + +src_configure() { + setup-wxwidgets +} + +python_compile() { + DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die + + # Refresh the bundled/pregenerated sip files + "${EPYTHON}" build.py sip || die + + # Build the bindings + "${EPYTHON}" build.py build_py \ + --use_syswx \ + --no_magic \ + --jobs="$(makeopts_jobs)" \ + --verbose \ + --release || 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 +} + +python_install() { + distutils-r1_python_install --skip-build +} -- cgit v1.3.1