commit: 1ed21708d75e7f301330c492b629d108ecd24a17
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 6 11:58:37 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 6 18:10:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed21708
dev-python/pyside2: drop 5.15.10-r3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-python/pyside2/Manifest| 1 -
.../pyside2/files/pyside2-5.15.2-python310.patch | 12 --
.../files/pyside2-5.15.2-python311-fixups.patch| 54 -
.../pyside2/files/pyside2-5.15.2-python311.patch | 41
dev-python/pyside2/pyside2-5.15.10-r3.ebuild | 228 -
5 files changed, 336 deletions(-)
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 5f19cf5fdc33..d7602001a4a7 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,2 +1 @@
-DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B
7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e9185e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56
SHA512
dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B
c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24
SHA512
377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91
diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python310.patch
b/dev-python/pyside2/files/pyside2-5.15.2-python310.patch
deleted file mode 100644
index cb2af4537cac..
--- a/dev-python/pyside2/files/pyside2-5.15.2-python310.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr libpyside/feature_select.cpp libpyside/feature_select.cpp
a/libpyside/feature_select.cpp 2020-11-11 14:51:30.0 +0200
-+++ b/libpyside/feature_select.cpp 2021-12-01 15:39:40.356426568 +0200
-@@ -405,6 +405,8 @@ static inline PyObject *SelectFeatureSet
- if (!SelectFeatureSetSubtype(sub_type, select_id))
- break;
- }
-+// PYSIDE-1436: Clear all caches for the type and subtypes.
-+PyType_Modified(type);
- }
- return type->tp_dict;
- }
diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch
b/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch
deleted file mode 100644
index d91b0b6806ca..
--- a/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-The Fedora / upstream fixes (shiboken2-5.15.2-python311.patch) end up breaking
-Python 3.8 compatibility (maybe 3.9 too, but didn't get that far).
-
-Wrap them with PY_VERSION_HEX for Python 3.11.
a/libpyside/pysideqflags.cpp
-+++ b/libpyside/pysideqflags.cpp
-@@ -187,7 +187,12 @@ namespace QFlags
- }
- newspec.slots = SbkNewQFlagsType_spec.slots;
- PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec();
--Py_SET_TYPE(type, _Type);
-+
-+#if PY_VERSION_HEX < 0x030B00A1
-+Py_TYPE(type) = _Type;
-+#else
-+Py_SET_TYPE(type, _Type);
-+#endif
-
- PySideQFlagsType *flagsType = reinterpret_cast(type);
- PepType_PFTP(flagsType)->converterPtr =
_PFTP(flagsType)->converter;
a/libpyside/pysidesignal.cpp
-+++ b/libpyside/pysidesignal.cpp
-@@ -162,7 +162,13 @@ PyTypeObject *PySideSignalTypeF(void)
- if (!type) {
- type = reinterpret_cast(SbkType_FromSpec(_spec));
- PyTypeObject *hold = Py_TYPE(type);
--Py_SET_TYPE(type, PySideMetaSignalTypeF());
-+
-+#if PY_VERSION_HEX < 0x030B00A1
-+Py_TYPE(type) = PySideMetaSignalTypeF();
-+#else
-+Py_SET_TYPE(type, PySideMetaSignalTypeF());
-+#endif
-+
- Py_INCREF(Py_TYPE(type));
- Py_DECREF(hold);
- }
a/libpyside/pysideweakref.cpp
-+++ b/libpyside/pysideweakref.cpp
-@@ -90,7 +90,13 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func,
void *userData)
-
- if (Py_TYPE(PySideCallableObjectTypeF()) == 0)
- {
--Py_SET_TYPE(PySideCallableObjectTypeF(), _Type);
-+
-+#if PY_VERSION_HEX < 0x030B00A1
-+Py_TYPE(PySideCallableObjectTypeF()) = _Type;
-+#else
-+Py_SET_TYPE(PySideCallableObjectTypeF(), _Type);
-+#endif
-+
- PyType_Ready(PySideCallableObjectTypeF());
- }
-
diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python311.patch
b/dev-python/pyside2/files/pyside2-5.15.2-python311.patch
deleted file mode 100644
index 70b07c4800fd..
--- a/dev-python/pyside2/files/pyside2-5.15.2-python311.patch
+++ /dev/null
@@ -1,41 +0,0 @@
