commit: 20e4a78f858ef07e3941610d65222027a5bf488a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jul 24 13:01:12 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jul 24 13:01:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e4a78f
dev-python/wxpython: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/wxpython/Manifest | 1 - .../wxpython/files/wxpython-4.0.6-no-webkit.patch | 27 ------- .../files/wxpython-4.0.6-skip-broken-tests.patch | 91 ---------------------- .../files/wxpython-4.0.7-ultimatelistctrl.patch | 85 -------------------- dev-python/wxpython/wxpython-4.0.7-r4.ebuild | 91 ---------------------- 5 files changed, 295 deletions(-) diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest index 197729320098..7487d3ee61f7 100644 --- a/dev-python/wxpython/Manifest +++ b/dev-python/wxpython/Manifest @@ -1,2 +1 @@ -DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f diff --git a/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch deleted file mode 100644 index 795de3a933ff..000000000000 --- a/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru wxPython-4.0.5-orig/wscript wxPython-4.0.5/wscript ---- wxPython-4.0.5-orig/wscript 2019-05-18 22:03:12.000000000 -0400 -+++ wxPython-4.0.5/wscript 2019-05-22 07:59:46.522966555 -0400 -@@ -230,15 +230,6 @@ - uselib_store='WXGL', mandatory=True, - msg='Finding libs for WXGL') - -- if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'): -- wv_libs = '--libs webview,core,net' -- else: -- wv_libs = '--libs core,net' -- conf.check_cfg(path=conf.options.wx_config, package='', -- args='--cxxflags ' + wv_libs + rpath, -- uselib_store='WXWEBVIEW', mandatory=True, -- msg='Finding libs for WXWEBVIEW') -- - if isDarwin: - conf.check_cfg(path=conf.options.wx_config, package='', - args='--cxxflags --libs core,net' + rpath, -@@ -591,7 +582,6 @@ - makeETGRule(bld, 'etg/_stc.py', '_stc', 'WXSTC') - makeETGRule(bld, 'etg/_html.py', '_html', 'WXHTML') - makeETGRule(bld, 'etg/_glcanvas.py', '_glcanvas', 'WXGL') -- makeETGRule(bld, 'etg/_html2.py', '_html2', 'WXWEBVIEW') - makeETGRule(bld, 'etg/_xml.py', '_xml', 'WXXML') - makeETGRule(bld, 'etg/_xrc.py', '_xrc', 'WXXRC') - makeETGRule(bld, 'etg/_richtext.py', '_richtext', 'WXHTML WXRICHTEXT') diff --git a/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch b/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch deleted file mode 100644 index 22a56162726b..000000000000 --- a/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -ru wxPython-4.0.6-orig/unittests/test_frame.py wxPython-4.0.6/unittests/test_frame.py ---- wxPython-4.0.6-orig/unittests/test_frame.py 2019-05-21 19:12:12.000000000 -0400 -+++ wxPython-4.0.6/unittests/test_frame.py 2019-05-24 10:15:51.350004356 -0400 -@@ -50,7 +50,7 @@ - f.Close() - - -- def test_frameRestore(self): -+ def xtest_frameRestore(self): - f = wx.Frame(self.frame, title="Title", pos=(50,50), size=(100,100)) - f.Show() - f.Maximize() -diff -ru wxPython-4.0.6-orig/unittests/test_graphics.py wxPython-4.0.6/unittests/test_graphics.py ---- wxPython-4.0.6-orig/unittests/test_graphics.py 2019-05-21 19:12:12.000000000 -0400 -+++ wxPython-4.0.6/unittests/test_graphics.py 2019-05-24 10:16:06.520256643 -0400 -@@ -23,7 +23,7 @@ - gc = wx.GraphicsContext.Create(img) - self.assertTrue(gc.IsOk()) - -- def test_gcCreate4(self): -+ def xtest_gcCreate4(self): - class MyPanel(wx.Panel): - def __init__(self, parent): - super(MyPanel, self).__init__(parent) -diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py wxPython-4.0.6/unittests/test_lib_pubsub_provider.py ---- wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py 2019-05-21 19:12:12.000000000 -0400 -+++ wxPython-4.0.6/unittests/test_lib_pubsub_provider.py 2019-05-24 10:16:49.649969339 -0400 -@@ -49,7 +49,7 @@ - - class lib_pubsub_Except(wtc.PubsubTestCase): - -- def test1(self): -+ def xtest1(self): - - self.pub.addTopicDefnProvider(my_topics, self.pub.TOPIC_TREE_FROM_CLASS) - -diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py ---- wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py 2019-05-21 19:12:12.000000000 -0400 -+++ wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py 2019-05-24 10:17:18.276438743 -0400 -@@ -215,7 +215,7 @@ - assert 1 == topicMgr.getNumDefnProviders() - topicMgr.clearDefnProviders() - -- def test20_UseProvider(self): -+ def xtest20_UseProvider(self): - # - # Test the use of definition providers for topics. We create - # two so we can check that more than one can work together. -diff -ru wxPython-4.0.6-orig/unittests/test_sizer.py wxPython-4.0.6/unittests/test_sizer.py ---- wxPython-4.0.6-orig/unittests/test_sizer.py 2019-05-21 19:12:12.000000000 -0400 -+++ wxPython-4.0.6/unittests/test_sizer.py 2019-05-24 10:18:03.937181671 -0400 -@@ -71,7 +71,7 @@ - self.assertTrue(items[1].IsSpacer()) - self.assertTrue(items[2].Border == 5) - -- def test_iter(self): -+ def xtest_iter(self): - bs = wx.BoxSizer() - widgetlist = [wx.Panel(self.frame) for _ in range(5)] - -diff -ru wxPython-4.0.6-orig/unittests/test_utils.py wxPython-4.0.6/unittests/test_utils.py ---- wxPython-4.0.6-orig/unittests/test_utils.py 2019-05-21 19:12:12.000000000 -0400 -+++ wxPython-4.0.6/unittests/test_utils.py 2019-05-24 11:14:09.399035368 -0400 -@@ -34,7 +34,7 @@ - with wx.BusyCursor(): - self.myYield() - -- def test_utilsSomeOtherStuff(self): -+ def xtest_utilsSomeOtherStuff(self): - wx.GetBatteryState() - wx.GetPowerType() - wx.GetKeyState(wx.WXK_F1) -diff -ru wxPython-4.0.6-orig/unittests/test_windowid.py wxPython-4.0.6/unittests/test_windowid.py ---- wxPython-4.0.6-orig/unittests/test_windowid.py 2019-05-21 19:12:12.000000000 -0400 -+++ wxPython-4.0.6/unittests/test_windowid.py 2019-05-24 10:18:24.158508491 -0400 -@@ -28,12 +28,12 @@ - assert isinstance(ref, wx.WindowIDRef) - - -- def test_newIdRef03(self): -+ def xtest_newIdRef03(self): - """Check that Auto ID Management is enabled (--enable-autoidman)""" - # This test is expected to fail if autoID mangagement is turned on -- # because a reference to the ID is not being saved, so it will be -+ # because a reference to the ID is not being saved, so it will be - # unreserved when the first widget is destroyed. -- -+ - id = wx.Window.NewControlId() - b = wx.Button(self.frame, id, 'button') - b.Destroy() diff --git a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch deleted file mode 100644 index 9d1cc7649e1f..000000000000 --- a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch +++ /dev/null @@ -1,85 +0,0 @@ -From https://github.com/wxWidgets/Phoenix/commit/3eb9eb32dc3285435039f6c420c398665372a1ad -From 3eb9eb32dc3285435039f6c420c398665372a1ad Mon Sep 17 00:00:00 2001 -From: Glen Whitney <g...@studioinfinity.org> -Date: Tue, 31 Aug 2021 11:06:27 -0700 -Subject: [PATCH] fix: Correct types of arguments to - ScrolledWindow.SetScrollbars - ---- - demo/Mask.py | 2 +- - demo/OGL.py | 2 +- - wx/lib/agw/ultimatelistctrl.py | 14 +++++++------- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/demo/Mask.py b/demo/Mask.py -index 5f0c2cdde..109b8f30b 100644 ---- a/demo/Mask.py -+++ b/demo/Mask.py -@@ -56,7 +56,7 @@ def __init__(self, parent): - mask = wx.Mask(self.bmp_withcolourmask, wx.WHITE) - self.bmp_withcolourmask.SetMask(mask) - -- self.SetScrollbars(20, 20, 700/20, 460/20) -+ self.SetScrollbars(20, 20, 700//20, 460//20) - - self.Bind(wx.EVT_PAINT, self.OnPaint) - -diff --git a/demo/OGL.py b/demo/OGL.py -index 72ca543dd..d475e5011 100644 ---- a/demo/OGL.py -+++ b/demo/OGL.py -@@ -272,7 +272,7 @@ def __init__(self, parent, log, frame): - - maxWidth = 1000 - maxHeight = 1000 -- self.SetScrollbars(20, 20, maxWidth/20, maxHeight/20) -+ self.SetScrollbars(20, 20, maxWidth//20, maxHeight//20) - - self.log = log - self.frame = frame -diff --git a/wx/lib/agw/ultimatelistctrl.py b/wx/lib/agw/ultimatelistctrl.py -index c60867684..14fc41f86 100644 ---- a/wx/lib/agw/ultimatelistctrl.py -+++ b/wx/lib/agw/ultimatelistctrl.py -@@ -9654,8 +9654,8 @@ def RecalculatePositions(self, noRefresh=False): - self._linesPerPage = clientHeight//lineHeight - - self.SetScrollbars(SCROLL_UNIT_X, lineHeight, -- (self.GetHeaderWidth()-decrement)/SCROLL_UNIT_X, -- (entireHeight + lineHeight - 1)/lineHeight, -+ (self.GetHeaderWidth()-decrement)//SCROLL_UNIT_X, -+ (entireHeight + lineHeight - 1)//lineHeight, - self.GetScrollPos(wx.HORIZONTAL), - self.GetScrollPos(wx.VERTICAL), - True) -@@ -9676,8 +9676,8 @@ def RecalculatePositions(self, noRefresh=False): - decrement = SCROLL_UNIT_X - - self.SetScrollbars(SCROLL_UNIT_X, SCROLL_UNIT_Y, -- (self.GetHeaderWidth()-decrement)/SCROLL_UNIT_X, -- (entireHeight + SCROLL_UNIT_Y - 1)/SCROLL_UNIT_Y, -+ (self.GetHeaderWidth()-decrement)//SCROLL_UNIT_X, -+ (entireHeight + SCROLL_UNIT_Y - 1)//SCROLL_UNIT_Y, - self.GetScrollPos(wx.HORIZONTAL), - self.GetScrollPos(wx.VERTICAL), - True) -@@ -9728,8 +9728,8 @@ def RecalculatePositions(self, noRefresh=False): - line._gi.ExtendWidth(widthMax) - - self.SetScrollbars(SCROLL_UNIT_X, lineHeight, -- (x + SCROLL_UNIT_X)/SCROLL_UNIT_X, -- (y + lineHeight)/lineHeight, -+ (x + SCROLL_UNIT_X)//SCROLL_UNIT_X, -+ (y + lineHeight)//lineHeight, - self.GetScrollPos(wx.HORIZONTAL), - self.GetScrollPos(wx.VERTICAL), - True) -@@ -9797,7 +9797,7 @@ def RecalculatePositions(self, noRefresh=False): - break # Everything fits, no second try required. - - self.SetScrollbars(SCROLL_UNIT_X, lineHeight, -- (entireWidth + SCROLL_UNIT_X)/SCROLL_UNIT_X, -+ (entireWidth + SCROLL_UNIT_X)//SCROLL_UNIT_X, - 0, - self.GetScrollPos(wx.HORIZONTAL), - 0, diff --git a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild b/dev-python/wxpython/wxpython-4.0.7-r4.ebuild deleted file mode 100644 index 7b34ac3aec81..000000000000 --- a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild +++ /dev/null @@ -1,91 +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_{9..10} ) -PYPI_NO_NORMALIZE=1 -PYPI_PN="wxPython" -WX_GTK_VER="3.0-gtk3" - -inherit distutils-r1 multiprocessing virtualx wxwidgets pypi - -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE="https://www.wxpython.org/"; -SRC_URI="$(pypi_sdist_url --no-normalize "${PYPI_PN}" "${PV}.post2")" - -LICENSE="wxWinLL-3" -SLOT="4.0" -KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="test webkit" -# Tests broken: #726812, #722716 -RESTRICT="test" -#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 -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:=" - -BDEPEND="${RDEPEND} - app-doc/doxygen - dev-python/setuptools[${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}] - )" - -S="${WORKDIR}/${PYPI_PN}-${PV}.post2" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch" - "${FILESDIR}/${P}-ultimatelistctrl.patch" -) - -python_prepare_all() { - if ! use webkit; then - eapply "${FILESDIR}/${PN}-4.0.6-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 - ${PYTHON} build.py build_py \ - --use_syswx \ - --no_magic \ - --jobs=$(makeopts_jobs) \ - --release || die -} - -python_install() { - distutils-r1_python_install --skip-build -} - -python_test() { - virtx epytest unittests -}
