commit: 3fcec8a16e07ae0adb240e42b70491e63f554000
Author: Bernd Waibel posteo net>
AuthorDate: Wed Jul 20 15:21:45 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Fri Aug 12 10:53:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fcec8a1
dev-python/shiboken2: add 5.15.5
Bug: https://bugs.gentoo.org/835763
Signed-off-by: Bernd Waibel posteo.net>
Signed-off-by: Andrew Ammerlaan gentoo.org>
dev-python/shiboken2/Manifest | 1 +
...oken2-5.15.5-add-numpy-1.23-compatibility.patch | 31
.../files/shiboken2-5.15.5-python311-1.patch | 72 +
.../files/shiboken2-5.15.5-python311-2.patch | 65
.../files/shiboken2-5.15.5-python311-3.patch | 55 +++
dev-python/shiboken2/shiboken2-5.15.5.ebuild | 172 +
6 files changed, 396 insertions(+)
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index d9abb71faf82..6db4c67e3817 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1 +1,2 @@
DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B
099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507
SHA512
5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
+DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B
ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62
SHA512
61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3
diff --git
a/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch
b/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch
new file mode 100644
index ..7ce30bb2e67d
--- /dev/null
+++
b/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch
@@ -0,0 +1,31 @@
+https://raw.githubusercontent.com/FreeCAD/homebrew-freecad/master/patches/libshiboken-numpy-1.23.compat.patch
+
+From c238f558bb72860c15da00546a7b7924d0b90848 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Thu, 21 Jul 2022 06:37:26 +0200
+Subject: [PATCH] add numpy-1.23 compatibility
+
+Signed-off-by: Bernd Waibel
+---
+ libshiboken/sbknumpyarrayconverter.cpp | 5 +
+ 1 file changed, 5 insertions(+)
+
+--- a/libshiboken/sbknumpyarrayconverter.cpp
b/libshiboken/sbknumpyarrayconverter.cpp
+@@ -116,8 +116,13 @@ std::ostream <<(std::ostream , PyArrayObject
*o)
+ str << " NPY_ARRAY_NOTSWAPPED";
+ if ((flags & NPY_ARRAY_WRITEABLE) != 0)
+ str << " NPY_ARRAY_WRITEABLE";
++#if NPY_VERSION >= 0x0010 // NPY_1_23_API_VERSION
++if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0)
++str << " NPY_ARRAY_WRITEBACKIFCOPY";
++#else
+ if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0)
+ str << " NPY_ARRAY_UPDATEIFCOPY";
++#endif
+ } else {
+ str << '0';
+ }
+--
+2.35.1
+
diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch
b/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch
new file mode 100644
index ..771ce2ad1886
--- /dev/null
+++ b/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch
@@ -0,0 +1,72 @@
+From c87d4e27cd482918c1d091c09cfac749a56b0f99 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Wed, 20 Jul 2022 07:15:57 +0200
+Subject: [PATCH 1/3]
+
https://src.fedoraproject.org/fork/pviktori/rpms/python-pyside2/raw/5da9902bd8732b49eb722d71f306d4ab197c84b8/f/python3.11.patch
+ https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=52df3b8f64
+ https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=73adefe22f
+ https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=a09a1db839
+
+From b64ad27d8dfeeecaaa8a98051252a32c9d998df4 Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint
+Date: Thu, 9 Jun 2022 16:50:41 +0200
+Subject: [PATCH] libshiboken: Fix a crash in Shiboken::Object::isValid() for
+ Python 3.11
+
+The function is passed type objects for class methods, which caused
+it to crash.
+
+The first clause did not catch this, and so it was cast to SbkObject
+below.
+
+Add a type check to prevent this.
+
+Pick-to: 6.3 6.2 5.15
+Task-number: PYSIDE-1960
+Change-Id: Icfdd6fefb7156ac5961444bd5395109849a1d66e
+Reviewed-by: Christian Tismer
+Reviewed-by: Qt CI Bot
+
+Original patch no longer applies with 5.15.5.
+Manually re-applied to respect code changes.
+
+Signed-off-by: Bernd Waibel
+--- a/libshiboken/basewrapper.cpp
b/libshiboken/basewrapper.cpp
+@@ -377,7 +377,7 @@ SbkObjectType *SbkObject_TypeF(void)
+ static PyTypeObject *type = nullptr;
+ if (!type) {
+ type = reinterpret_cast(SbkType_FromSpec(_Type_spec));
+-Py_TYPE(type) = SbkObjectType_TypeF();
++
