* update python-wxpython to 1:4.2.2-2

This commit is contained in:
Alexander Baldeck 2024-12-29 23:53:16 +01:00
parent 205b359149
commit a8cf590fd3
6 changed files with 41 additions and 96 deletions

View File

@ -0,0 +1,31 @@
pkgbase = python-wxpython
pkgdesc = Cross-platform GUI toolkit
pkgver = 4.2.2
pkgrel = 2
epoch = 1
url = https://www.wxpython.org
arch = x86_64
arch = powerpc64le
arch = powerpc64
arch = powerpc
arch = riscv64
license = custom:wxWindows
checkdepends = xorg-server-xvfb
checkdepends = python-pytest-forked
checkdepends = python-numpy
makedepends = mesa
makedepends = glu
makedepends = webkit2gtk
makedepends = python-requests
makedepends = python-setuptools
makedepends = python-attrdict
makedepends = sip
makedepends = doxygen
makedepends = waf
depends = wxwidgets-gtk3
depends = python-six
optdepends = python-pypubsub: Alternative to the deprecated wx.lib.pubsub API
source = https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-4.2.2.tar.gz
sha512sums = 08b74285b94f21ebf30fef8c9ebf8cfd074dd3976209372bb5b704b0b792038f9af484dd1378894052eedb0ce603af6935b7d00d695da4e4a15e1ea3bdb3520f
pkgname = python-wxpython

View File

@ -0,0 +1,5 @@
[python-wxpython]
source = "pypi"
pypi = "wxpython"
from_pattern = "(\\d+)\\.(\\d+)\\.(\\d+)\\.post(\\d+)"
to_pattern = "\\1.\\2.\\3.\\4"

View File

@ -5,7 +5,7 @@
pkgname=python-wxpython
_pkgname=wxPython
pkgver=4.2.1
pkgver=4.2.2
_pkgver="${pkgver%.*}"
_post="${pkgver##*.}"
pkgrel=2
@ -16,30 +16,17 @@ license=('custom:wxWindows')
url='https://www.wxpython.org'
depends=('wxwidgets-gtk3' 'python-six')
optdepends=('python-pypubsub: Alternative to the deprecated wx.lib.pubsub API')
makedepends=('mesa' 'glu' 'webkit2gtk' 'python-requests' 'python-setuptools' 'sip' 'doxygen' 'waf')
makedepends=('mesa' 'glu' 'webkit2gtk' 'python-requests' 'python-setuptools' 'python-attrdict' 'sip' 'doxygen' 'waf')
checkdepends=('xorg-server-xvfb' 'python-pytest-forked' 'python-numpy')
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$pkgver.tar.gz"
wxpython-4.2.0-cython-3.patch
wxpython-4.2.1-argpase-python.patch
wxpython-doxygen-1.9.7.patch)
sha512sums=('ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438'
'1f99e75cc2a50f2de54312cfd148095f89e9ae1b0d110e750a73887bc66982c569bc2cf3e6f0dff3a717f5bdbe20a883cbc2ae381589de116b6bf3d053b9ab08'
'afc8a9e68c1cb7795cbf9949c2395aec304c6467a7e1bfb78915f78f1ad1c785f91caae8f4ac7dca0df4c38be87d0289a67f9a6f9dd56db5beec0ae2c2601c51'
'5d9072ea0f7f2adfaa22c43fd218c1d132c57ba12c655742042a9dae6e77e6418d883fc102aeb0e5821eaa8067a5967c96eca9c2621f686b980192cb3c3bed64')
prepare() {
cd $_pkgname-$pkgver
patch -Np1 -i ${srcdir}/wxpython-4.2.0-cython-3.patch
patch -Np1 -i ${srcdir}/wxpython-4.2.1-argpase-python.patch
patch -Np1 -i ${srcdir}/wxpython-doxygen-1.9.7.patch
}
source=("https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$pkgver.tar.gz")
sha512sums=('08b74285b94f21ebf30fef8c9ebf8cfd074dd3976209372bb5b704b0b792038f9af484dd1378894052eedb0ce603af6935b7d00d695da4e4a15e1ea3bdb3520f')
build() {
cd $_pkgname-$pkgver
# rm -r sip/{cpp,gen}/* # Recreate sip files with current wxWidgets - broken with doxygen 1.9.7 https://github.com/wxWidgets/Phoenix/issues/2414
SIP=/usr/bin/sip DOXYGEN=/usr/bin/doxygen WAF=/usr/bin/waf \
python build.py --nodoc sip build --use_syswx --release --python=/usr/bin/python
python build.py --nodoc sip build --use_syswx --release
}
check() {

View File

@ -1,19 +0,0 @@
https://bugs.gentoo.org/911703
https://github.com/wxWidgets/Phoenix/pull/2441
From aeb557d01e7cd37176ebbf0f1ae6d0b53c115378 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
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)

View File

@ -1,11 +0,0 @@
--- wxPython-4.2.1/wscript.orig 2024-05-25 12:40:13.339500355 +0200
+++ wxPython-4.2.1/wscript 2024-05-25 12:40:19.942850204 +0200
@@ -40,8 +40,6 @@
opt.add_option('--debug', dest='debug', action='store_true', default=False,
help='Turn on debugger-related compile options.')
- opt.add_option('--python', dest='python', default='', action='store',
- help='Full path to the Python executable to use.')
opt.add_option('--wx_config', dest='wx_config', default='wx-config', action='store',
help='Full path to the wx-config script to be used for this build.')
opt.add_option('--no_magic', dest='no_magic', action='store_true', default=False,

View File

@ -1,48 +0,0 @@
From 6a049ccc0ad96f25c3f7d8540b218ffe8921d8c5 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Tue, 5 Dec 2023 23:42:21 -0500
Subject: [PATCH] Support building with Doxygen 1.9.7
Doxygen 1.9.7 made some changes whereby some method definitions are now
defined in separate XML files, with a "refid" that links to them. In
order to support this, we need to follow these "refids" to pick up the
method definition from the separate group XML files.
---
etgtools/extractors.py | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/etgtools/extractors.py b/etgtools/extractors.py
index 8c992cb14..5ae1361f9 100644
--- a/etgtools/extractors.py
+++ b/etgtools/extractors.py
@@ -62,6 +62,8 @@ def extract(self, element):
# class. Should be overridden in derived classes to get what each one
# needs in addition to the base.
self.name = element.find(self.nameTag).text
+ if self.name is None:
+ self.name = ''
if '::' in self.name:
loc = self.name.rfind('::')
self.name = self.name[loc+2:]
@@ -1574,12 +1576,21 @@ def addElement(self, element):
extractingMsg(kind, element)
for node in element.findall('sectiondef/memberdef'):
self.addElement(node)
+ for node in element.findall('sectiondef/member'):
+ node = self.resolveRefid(node)
+ self.addElement(node)
else:
raise ExtractorError('Unknown module item kind: %s' % kind)
return item
+ def resolveRefid(self, node):
+ from etgtools import XMLSRC
+ refid = node.get('refid')
+ fname = os.path.join(XMLSRC, refid.rsplit('_', 1)[0]) + '.xml'
+ root = et.parse(fname).getroot()
+ return root.find(".//memberdef[@id='{}']".format(refid))
def addCppFunction(self, type, name, argsString, body, doc=None, **kw):