From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- dev-python/wxpython/Manifest | 2 + .../files/wxpython-4.0.7-ultimatelistctrl.patch | 85 ++++++++++++++++++++ dev-python/wxpython/wxpython-4.0.7-r2.ebuild | 92 ++++++++++++++++++++++ 3 files changed, 179 insertions(+) create mode 100644 dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch create mode 100644 dev-python/wxpython/wxpython-4.0.7-r2.ebuild (limited to 'dev-python/wxpython') diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest index 3e2a1beb5ab5..330996afedaa 100644 --- a/dev-python/wxpython/Manifest +++ b/dev-python/wxpython/Manifest @@ -1,5 +1,7 @@ AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a +AUX wxpython-4.0.7-ultimatelistctrl.patch 4121 BLAKE2B 0fdf74a0131c9d5c49dd867c3867ac212d26f4d877dc4f4e48680d90956c1027bbc776d19edd235d8f1e4b619d616c4ca1ab28b45a3b2dc79aa97a59c48adb2f SHA512 9d766d9724613e269215db81ecaad7d836b65c4d17f8b522bd688881bce1176241965d05539886da42755f0c7be65ef55c4ce340c21fddd512abb6577ece5482 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4 EBUILD wxpython-4.0.7-r1.ebuild 2311 BLAKE2B 563169aac0ee52d5270eaaceb298d19aca4c6ba00afd96a7a43a9474f21733aabfc91a4ce64c7d52f0ee57fa26b64b77cf2a8d556f08d2b226db9cd8191b11e8 SHA512 dc2659b721faa6f3c9d36cc05659eb6350efa9e7fd6c633be6c67487cca2cc93ab49bdf7a8f43a994d6873ae82a9c773c4f0d9724240a26e405403488977c8a4 +EBUILD wxpython-4.0.7-r2.ebuild 2370 BLAKE2B 67fcfa85c57f917bba174c34dc9a2572fa1c25f1029c493a4b38e66ec90b917c95df65226b7ec6830cfb046974e999f8488cf8ce5cca3a370ccbac0a877ef8d8 SHA512 1d19e718f80238a9b67cafc4db3c47f5604dcaa71d98f3391a5c6afd39a9c097f6ae7967bd863294cad14c0199dc91ecd992b8ee3e3a15de5a197680ef4c0361 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa diff --git a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch new file mode 100644 index 000000000000..9d1cc7649e1f --- /dev/null +++ b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch @@ -0,0 +1,85 @@ +From https://github.com/wxWidgets/Phoenix/commit/3eb9eb32dc3285435039f6c420c398665372a1ad +From 3eb9eb32dc3285435039f6c420c398665372a1ad Mon Sep 17 00:00:00 2001 +From: Glen Whitney +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-r2.ebuild b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild new file mode 100644 index 000000000000..2e17a2286297 --- /dev/null +++ b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +WX_GTK_VER="3.0-gtk3" + +DISTUTILS_IN_SOURCE_BUILD="1" + +inherit distutils-r1 multiprocessing virtualx wxwidgets + +MY_PN="wxPython" +MY_PV="${PV}.post2" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="https://www.wxpython.org/" +SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz" + +LICENSE="wxWinLL-3" +SLOT="4.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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:0= + media-libs/tiff:0 + media-libs/libjpeg-turbo:0" + +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}/${MY_PN}-${MY_PV}" + +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 +} -- cgit v1.2.3