diff --git a/0001-Fix-overflow-check-for-wxUIntPtr-type.patch b/0001-Fix-overflow-check-for-wxUIntPtr-type.patch deleted file mode 100644 index 677d367..0000000 --- a/0001-Fix-overflow-check-for-wxUIntPtr-type.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c72d78fb983bf2efe4041f5d3c86670b92e98565 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Sun, 4 Oct 2020 23:02:19 +0200 -Subject: [PATCH] Fix overflow check for wxUIntPtr type - -long is 32bit on 32-bit archs and on Win64 (see -https://en.cppreference.com/w/cpp/language/types ). As SIP uses -PyLong_AsLongLong internally and uses an extra bounds check only if -explicitly enabled("sip.enableoverflowchecking(True)"), the overflow -only triggers when it also overflows `long long`, i.e. when -_LONG_MAX == _LLONG_MAX. ---- - unittests/test_listctrl.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unittests/test_listctrl.py b/unittests/test_listctrl.py -index c8c2d39a..0b2e3706 100644 ---- a/unittests/test_listctrl.py -+++ b/unittests/test_listctrl.py -@@ -185,7 +185,7 @@ class listctrl_Tests(wtc.WidgetTestCase): - def test_listctrlItemData02(self): - lc = self._makeListCtrl() - with self.assertRaises(OverflowError): -- lc.SetItemData(0, wx._core._LONG_MAX + 100) -+ lc.SetItemData(0, wx._core._LLONG_MAX + 100) - - - def test_listctrlDeleteAllColumns(self): --- -2.28.0 - diff --git a/0001-Only-import-attrdict-where-needed.patch b/0001-Only-import-attrdict-where-needed.patch deleted file mode 100644 index 65fa551..0000000 --- a/0001-Only-import-attrdict-where-needed.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 60a1917825044fc3a43dc39ef8de2b944150dc8a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Sat, 25 Jun 2022 18:50:45 +0200 -Subject: [PATCH 1/4] Only import attrdict where needed - -Its only used for MSVC builds, but an unnecessary external dependency -elsewhere. ---- - buildtools/config.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/buildtools/config.py b/buildtools/config.py -index 4482ba9d..493a63c5 100644 ---- a/buildtools/config.py -+++ b/buildtools/config.py -@@ -27,8 +27,6 @@ from distutils.dep_util import newer - - import distutils.sysconfig - --from attrdict import AttrDict -- - runSilently = False - - #---------------------------------------------------------------------- -@@ -989,6 +987,8 @@ def getMSVCInfo(PYTHON, arch, set_env=False): - if MSVCinfo is not None: - return MSVCinfo - -+ from attrdict import AttrDict -+ - # Note that it starts with a monkey-patch in setuptools.msvc to - # workaround this issue: pypa/setuptools#1902 - cmd = \ --- -2.36.1 - diff --git a/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch b/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch deleted file mode 100644 index 1c273e2..0000000 --- a/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9986a0d5c24b5d45ddf571d60351f68765a8a9be Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Mon, 8 Aug 2022 22:35:58 -0400 -Subject: [PATCH] pypubsub: Replace deprecated inspect.getargspec - -inspect.getargspec was removed in Python 3.11. This is a backport of: -https://github.com/schollii/pypubsub/commit/089c7a73f85c76a3aa22e4b10c71db1bf65a8637 ---- - wx/lib/pubsub/core/callables.py | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/wx/lib/pubsub/core/callables.py b/wx/lib/pubsub/core/callables.py -index 65eb1ebe..7e798c54 100644 ---- a/wx/lib/pubsub/core/callables.py -+++ b/wx/lib/pubsub/core/callables.py -@@ -12,7 +12,7 @@ CallArgsInfo regarding its autoTopicArgName data member. - - """ - --from inspect import getargspec, ismethod, isfunction -+from inspect import ismethod, isfunction, signature, Parameter - - from .. import py2and3 - -@@ -133,19 +133,26 @@ class CallArgsInfo: - self.autoTopicArgName = None.""" - - #args, firstArgIdx, defaultVals, acceptsAllKwargs -- (allParams, varParamName, varOptParamName, defaultVals) = getargspec(func) -- if defaultVals is None: -- defaultVals = [] -- else: -- defaultVals = list(defaultVals) -+ allParams = [] -+ defaultVals = [] -+ varParamName = None -+ varOptParamName = None -+ for argName, param in signature(func).parameters.items(): -+ if param.default != Parameter.empty: -+ defaultVals.append(param.default) -+ if param.kind == Parameter.VAR_POSITIONAL: -+ varParamName = argName -+ elif param.kind == Parameter.VAR_KEYWORD: -+ varOptParamName = argName -+ else: -+ allParams.append(argName) - - self.acceptsAllKwargs = (varOptParamName is not None) - self.acceptsAllUnnamedArgs = (varParamName is not None) -- - self.allParams = allParams -- del self.allParams[0:firstArgIdx] # does nothing if firstArgIdx == 0 - - self.numRequired = len(self.allParams) - len(defaultVals) -+ assert len(self.allParams) >= len(defaultVals) - assert self.numRequired >= 0 - - # if listener wants topic, remove that arg from args/defaultVals --- -2.39.0 - diff --git a/ba0d8cfcec3d3b0112d1c54991853e6003f2fbf6.patch b/ba0d8cfcec3d3b0112d1c54991853e6003f2fbf6.patch deleted file mode 100644 index ae279a0..0000000 --- a/ba0d8cfcec3d3b0112d1c54991853e6003f2fbf6.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ba0d8cfcec3d3b0112d1c54991853e6003f2fbf6 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Mon, 7 Nov 2022 11:49:27 -0500 -Subject: [PATCH] wscript: Use EXT_SUFFIX when available to fix build on Py - 3.11 - -This is a backport of a an upstream fix in waf's check_python_headers(). - -See: https://gitlab.com/ita1024/waf/-/commit/8d6cbb3657bdbf2ad5ef33b8ba51f29747743e1d ---- - wscript | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/wscript b/wscript -index 6b53bcd5e..048a3df6d 100644 ---- a/wscript -+++ b/wscript -@@ -383,7 +383,7 @@ def my_check_python_headers(conf): - if not pybin: - conf.fatal('Could not find the python executable') - -- v = 'prefix SO LDFLAGS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET LDSHARED CFLAGS'.split() -+ v = 'prefix SO EXT_SUFFIX LDFLAGS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET LDSHARED CFLAGS'.split() - try: - lst = conf.get_python_variables(["get_config_var('%s') or ''" % x for x in v]) - except RuntimeError: -@@ -397,7 +397,7 @@ def my_check_python_headers(conf): - if dct[x]: - conf.env[x] = conf.environ[x] = dct[x] - -- env['pyext_PATTERN'] = '%s' + dct['SO'] # not a mistake -+ env['pyext_PATTERN'] = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 - - # Check for python libraries for embedding - all_flags = dct['LDFLAGS'] + ' ' + dct['CFLAGS'] diff --git a/python-wxPython.changes b/python-wxPython.changes index d494b10..ab34290 100644 --- a/python-wxPython.changes +++ b/python-wxPython.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 11 14:47:53 UTC 2023 - Stefan Brüns + +- Update to release 4.2.1 + * No changelog provided +- Drop upstream patches: + * 0001-pypubsub-Replace-deprecated-inspect.getargspec.patch + * 0001-Fix-overflow-check-for-wxUIntPtr-type.patch + * 0001-Only-import-attrdict-where-needed.patch + * ba0d8cfcec3d3b0112d1c54991853e6003f2fbf6.patch + ------------------------------------------------------------------- Sat Jan 28 09:38:44 UTC 2023 - Dirk Müller diff --git a/python-wxPython.spec b/python-wxPython.spec index 18f4d3b..9caefff 100644 --- a/python-wxPython.spec +++ b/python-wxPython.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package python-wxPython # # Copyright (c) 2023 SUSE LLC # @@ -81,7 +81,7 @@ ExclusiveArch: donotbuild %endif Name: %{pprefix}-wxPython -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: The "Phoenix" variant of the wxWidgets Python bindings License: GPL-2.0-or-later @@ -93,20 +93,12 @@ Source1: python-wxPython-rpmlintrc Source2: repack # PATCH-FIX-OPENSUSE Patch1: use_stl_build.patch -# PATCH-FIX-UPSTREAM -Patch2: 0001-Only-import-attrdict-where-needed.patch # PATCH-FIX-UPSTREAM - https://github.com/wxWidgets/Phoenix/pull/2232 Patch4: 0003-Make-pip-usage-in-wxget-optional.patch # PATCH-FIX-OPENSUSE Patch5: 0004-Fix-time_t-ETG-typedef-extend-DateTime.FromTimeT-tes.patch -# PATCH-FIX-UPSTREAM - fix python 3.11 support -Patch6: https://github.com/wxWidgets/Phoenix/commit/ba0d8cfcec3d3b0112d1c54991853e6003f2fbf6.patch # PATCH-FIX-OPENSUSE - Test fixes/additions: Patch112: 0001-Check-HSV-values-in-image-test.patch -# PATCH-FIX-UPSTREAM - https://github.com/wxWidgets/Phoenix/pull/2233 -Patch113: 0001-Fix-overflow-check-for-wxUIntPtr-type.patch -# PATCH-FIX-UPSTREAM - https://github.com/wxWidgets/Phoenix/pull/2228 -Patch114: 0001-pypubsub-Replace-deprecated-inspect.getargspec.patch BuildRequires: %{python_module base} BuildRequires: %{python_module devel} BuildRequires: %{python_module requests} diff --git a/wxPython-4.2.0.tar.gz b/wxPython-4.2.0.tar.gz deleted file mode 100644 index 5a9eb49..0000000 --- a/wxPython-4.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6acf173f2da47a196d7382f2bc2e9e7ab1b60aad2e1b070c852e6f65014d249 -size 69608910 diff --git a/wxPython-4.2.1.tar.gz b/wxPython-4.2.1.tar.gz new file mode 100644 index 0000000..6e2050d --- /dev/null +++ b/wxPython-4.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:750c7be19eb3e7fa1cb06cbeb71a26cf97f3d32ec9b40deb78e6e50a4d297253 +size 203383932