6 files changed, 33 insertions, 53 deletions

diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch
index f8a3061ae0..1426067d23 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch
@@ -1,4 +1,4 @@
-From b9f95c06b2e7a525f4f93d705976882e8dcba6ab Mon Sep 17 00:00:00 2001
+From b62aa1a2e3e0feced819a375be3b2187cc356284 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 20 Dec 2022 09:46:31 -0800
 Subject: [PATCH] sip: Conditionally use GetAssertStackTrace under
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/sip/cpp/sip_corewxAppTraits.cpp b/sip/cpp/sip_corewxAppTraits.cpp
-index 9c9f9d5b..1d2d2f90 100644
+index 9a9a4a66..a54e7659 100644
 --- a/sip/cpp/sip_corewxAppTraits.cpp
 +++ b/sip/cpp/sip_corewxAppTraits.cpp
 @@ -471,7 +471,11 @@ static PyObject *meth_wxAppTraits_GetAssertStackTrace(PyObject *sipSelf, PyObjec
@@ -23,7 +23,7 @@ index 9c9f9d5b..1d2d2f90 100644
  
              Py_BEGIN_ALLOW_THREADS
 +#if wxUSE_STACKWALKER
-             sipRes = new  ::wxString((sipSelfWasArg ? sipCpp-> ::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
+             sipRes = new ::wxString((sipSelfWasArg ? sipCpp->::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
 +#else
 +            sipRes = new  ::wxString("");
 +#endif
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch
deleted file mode 100644
index 4782e74ef3..0000000000
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5234a454a1b9f11f83e59909fb2972176497e02c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 9 May 2024 17:35:11 -0700
-Subject: [PATCH] sip: Fix build with gcc-14
-
-Fixes -Wincompatible-pointer-types
-sip/siplib/siplib.c:3900:20: error: assignment to 'sipSimpleWrapper *' {aka 'struct _sipSimpleWrapper *'} from incompatible pointer type 'PyObject *' {aka 'struct _object *'} [-Wincompatible-pointer-types]
-|  3900 |             *selfp = va_arg(va, PyObject *);
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- sip/siplib/siplib.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c
-index 95563e5c..ae3fac60 100644
---- a/sip/siplib/siplib.c
-+++ b/sip/siplib/siplib.c
-@@ -3897,7 +3897,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
-     {
-     case '#':
-             /* A ctor has an argument with the /Transfer/ annotation. */
--            *selfp = va_arg(va, PyObject *);
-+            *selfp = (sipSimpleWrapper *)va_arg(va, PyObject *);
-             break;
- 
-     case 'B':
--- 
-2.45.0
-
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/add-back-option-build-base.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/add-back-option-build-base.patch
index a46f3f870a..2622df24e2 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/add-back-option-build-base.patch
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/add-back-option-build-base.patch
@@ -1,4 +1,7 @@
-Add back default user options for cross build.
+From bc08fddaf4b23073b2afbc045a26aedc4d2c6470 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Wed, 30 Mar 2022 17:39:33 +0800
+Subject: [PATCH] Add back default user options for cross build.
 
 Upstream-Status: Pending [oe specific]
 
@@ -8,10 +11,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index a215da7..dccfeb3 100644
+index 99ee6612..fad5aba8 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -105,7 +105,7 @@ class wx_build(orig_build):
+@@ -111,7 +111,7 @@ class wx_build(orig_build):
      Delegate to build.py for doing the actual build, (including wxWidgets)
      instead of letting distutils do it all.
      """
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/not-overwrite-cflags-cxxflags.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/not-overwrite-cflags-cxxflags.patch
index 67f7949b38..3dc4cb1e79 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/not-overwrite-cflags-cxxflags.patch
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/not-overwrite-cflags-cxxflags.patch
@@ -1,4 +1,8 @@
-Not overwrite CFLAGS and CXXFLAGS. It also avoid buildpaths qa issue:
+From 05189dc7063a7c238e38589cbaf92be256270e54 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Wed, 23 Nov 2022 13:40:00 +0800
+Subject: [PATCH] Not overwrite CFLAGS and CXXFLAGS. It also avoid buildpaths
+ qa issue:
 
   WARNING: python3-wxgtk4-4.2.0-r0 do_package_qa: QA Issue: File
   /usr/lib64/python3.11/site-packages/wx/.debug/_xml.cpython-311-aarch64-linux-gnu.so
@@ -12,10 +16,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/wscript b/wscript
-index 067b307..50d96d1 100644
+index 79bdf3e1..d6244d5e 100644
 --- a/wscript
 +++ b/wscript
-@@ -195,8 +195,8 @@ def configure(conf):
+@@ -188,8 +188,8 @@ def configure(conf):
          cfg.finishSetup(conf.env.wx_config, conf.env.debug,
                          'mingw32' if isWindows and not conf.env.use_msvc else None)
  
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch
index 0d65ebb598..09497133b0 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch
@@ -1,4 +1,7 @@
-Fix issues in build scripts:
+From 171df10f86be6defb9e317ac62df8a7b0389b901 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Wed, 30 Mar 2022 17:39:33 +0800
+Subject: [PATCH] Fix issues in build scripts:
 
 * remove hardcode lib path from buildtools/config.py which is not suitable for
   cross build
@@ -15,10 +18,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/buildtools/config.py b/buildtools/config.py
-index c837e5d..d426005 100644
+index 94c216ec..b3ec3f2e 100644
 --- a/buildtools/config.py
 +++ b/buildtools/config.py
-@@ -312,8 +312,8 @@ class Configuration(object):
+@@ -336,8 +336,8 @@ class Configuration(object):
                  # wx-config doesn't output that for some reason.  For now, just
                  # add it unconditionally but we should really check if the lib is
                  # really found there or wx-config should be fixed.
@@ -30,10 +33,10 @@ index c837e5d..d426005 100644
              # Move the various -I, -D, etc. flags we got from the config scripts
              # into the distutils lists.
 diff --git a/setup.py b/setup.py
-index 64bec4b..fb29253 100644
+index fad5aba8..eade737b 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -130,7 +130,7 @@ class wx_build(orig_build):
+@@ -135,7 +135,7 @@ class wx_build(orig_build):
                  'message and the wxWidgets and Phoenix build steps in the future.\n')
  
              # Use the same Python that is running this script.
@@ -42,7 +45,7 @@ index 64bec4b..fb29253 100644
              cmd = ' '.join(cmd)
              runcmd(cmd)
  
-@@ -233,7 +233,7 @@ if haveWheel:
+@@ -238,7 +238,7 @@ if haveWheel:
  class wx_install(orig_install):
      def finalize_options(self):
          orig_install.finalize_options(self)
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.2.bb
index cc6b6cef67..dc57c864e4 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.2.bb
@@ -1,24 +1,24 @@
 DESCRIPTION = "Python3 interface to the wxWidgets Cross-platform C++ GUI toolkit."
-HOMEPAGE = "http://www.wxpython.org"
+HOMEPAGE = "https://www.wxpython.org"
 
-LICENSE = "LGPL-2.0-only & WXwindows"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bdabf9e11191e2b9d3b6aef5f338ec00"
+LICENSE = "LGPL-2.0-only & WXwindows & BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=102f37a0d23aa258e59e4cc8b5380b35"
 
 DEPENDS = "python3-attrdict3-native python3-six-native wxwidgets-native \
            wxwidgets \
            "
 
 PYPI_PACKAGE = "wxPython"
+UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
 
 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 \
-           file://0001-sip-Fix-build-with-gcc-14.patch \
            "
-SRC_URI[sha256sum] = "e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c"
+SRC_URI[sha256sum] = "5dbcb0650f67fdc2c5965795a255ffaa3d7b09fb149aa8da2d0d9aa44e38e2ba"
 
-S = "${WORKDIR}/wxPython-${PV}"
+S = "${UNPACKDIR}/wxPython-${PV}"
 
 inherit pypi setuptools3 pkgconfig features_check
 
@@ -36,4 +36,5 @@ RDEPENDS:${PN} = "\
     python3-pycairo \
     python3-six \
     python3-xml \
-"
+    python3-cairocffi \
+"