From 039ed44201bbf5bb80f9ade434d04fe835d5dffa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 4 Nov 2023 13:33:51 -0700 Subject: python3-wxgtk4: upgrade 4.2.0 -> 4.2.1 Signed-off-by: Khem Raj --- ...sub-Replace-deprecated-inspect.getargspec.patch | 65 ---------------------- .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb | 39 ------------- .../python3-wxgtk4/python3-wxgtk4_4.2.1.bb | 38 +++++++++++++ 3 files changed, 38 insertions(+), 104 deletions(-) delete mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch delete mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb (limited to 'meta-python/recipes-devtools/python3-wxgtk4') diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch deleted file mode 100644 index 9bec4c5ba6..0000000000 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch +++ /dev/null @@ -1,65 +0,0 @@ -Upstream-Status: Backport [https://github.com/wxWidgets/Phoenix/commit/9986a0d5] - -Signed-off-by: Kai Kang - -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.34.1 - diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb deleted file mode 100644 index bf87b0a73d..0000000000 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Python3 interface to the wxWidgets Cross-platform C++ GUI toolkit." -HOMEPAGE = "http://www.wxpython.org" - -LICENSE = "LGPL-2.0-only & WXwindows" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bdabf9e11191e2b9d3b6aef5f338ec00" - -DEPENDS = "python3-attrdict3-native python3-six-native wxwidgets-native \ - wxwidgets \ - " - -PYPI_PACKAGE = "wxPython" - -SRC_URI += "file://add-back-option-build-base.patch \ - file://wxgtk-fixup-build-scripts.patch \ - file://not-overwrite-cflags-cxxflags.patch \ - file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \ - file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \ - " -SRC_URI[sha256sum] = "663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7" - -S = "${WORKDIR}/wxPython-${PV}" - -inherit pypi setuptools3 pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR} --baselib=${baselib}'" - -RDEPENDS:${PN} = "\ - python3-difflib \ - python3-image \ - python3-numpy \ - python3-pillow \ - python3-pip \ - python3-pprint \ - python3-pycairo \ - python3-six \ - python3-xml \ -" diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb new file mode 100644 index 0000000000..fb011cb71b --- /dev/null +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Python3 interface to the wxWidgets Cross-platform C++ GUI toolkit." +HOMEPAGE = "http://www.wxpython.org" + +LICENSE = "LGPL-2.0-only & WXwindows" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bdabf9e11191e2b9d3b6aef5f338ec00" + +DEPENDS = "python3-attrdict3-native python3-six-native wxwidgets-native \ + wxwidgets \ + " + +PYPI_PACKAGE = "wxPython" + +SRC_URI += "file://add-back-option-build-base.patch \ + file://wxgtk-fixup-build-scripts.patch \ + file://not-overwrite-cflags-cxxflags.patch \ + file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \ + " +SRC_URI[sha256sum] = "e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c" + +S = "${WORKDIR}/wxPython-${PV}" + +inherit pypi setuptools3 pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR} --baselib=${baselib}'" + +RDEPENDS:${PN} = "\ + python3-difflib \ + python3-image \ + python3-numpy \ + python3-pillow \ + python3-pip \ + python3-pprint \ + python3-pycairo \ + python3-six \ + python3-xml \ +" -- cgit v1.2.3-54-g00ecf