[neon/qt/pyside2/Neon/release] debian: Drop patches which are included in the new release.
Dmitry Shachnev
null at kde.org
Mon Oct 9 15:37:19 BST 2023
Git commit 95dbc98307a4fb6194b82bb465a689b69695e1a5 by Dmitry Shachnev.
Committed on 06/10/2023 at 23:11.
Pushed by jriddell into branch 'Neon/release'.
Drop patches which are included in the new release.
M +6 -0 debian/changelog
D +0 -45 debian/patches/Fix-GLES-builds.patch
D +0 -36 debian/patches/Fix-Property-GC-tracking-for-Python-3.11.patch
D +0 -94 debian/patches/Fix-usage-of-Py_TYPE-for-Python-3.11.patch
D +0 -35 debian/patches/libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch
D +0 -62 debian/patches/libshiboken-Fix-crashes-with-static-strings-in-Python-3.11.patch
M +0 -5 debian/patches/series
https://invent.kde.org/neon/qt/pyside2/-/commit/95dbc98307a4fb6194b82bb465a689b69695e1a5
diff --git a/debian/changelog b/debian/changelog
index a7df0760..f9ac67a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
pyside2 (5.15.11-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop patches, included in the new release:
+ - libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch
+ - Fix-usage-of-Py_TYPE-for-Python-3.11.patch
+ - libshiboken-Fix-crashes-with-static-strings-in-Python-3.11.patch
+ - Fix-Property-GC-tracking-for-Python-3.11.patch
+ - Fix-GLES-builds.patch
-- Dmitry Shachnev <mitya57 at debian.org> Sat, 07 Oct 2023 00:05:00 +0300
diff --git a/debian/patches/Fix-GLES-builds.patch b/debian/patches/Fix-GLES-builds.patch
deleted file mode 100644
index 3f7689f1..00000000
--- a/debian/patches/Fix-GLES-builds.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Date: Thu, 26 Aug 2021 13:41:25 +0200
-Subject: Fix GLES builds
-
-Add QOpenGLVersionFunctionsFactory to list of dropped entries.
-
-Fixes: PYSIDE-1636
-Pick-to: 6.1
-Change-Id: Ie203372c2d15776a466f0fa04fe32a777bf85e52
-Reviewed-by: Christophe Giboudeaux <christophe at krop.fr>
-Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes at qt.io>
-(cherry picked from commit e0848b2d644574e914d3f71c1fe4b309e39ac099)
----
- sources/pyside2/PySide2/QtGui/CMakeLists.txt | 3 ++-
- sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
-index 88d8be9..b8ef288 100644
---- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt
-+++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt
-@@ -227,7 +227,8 @@ endif()
- list(FIND QtGui_enabled_features "opengles2" _opengles2Index)
- # ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtGui_enabled_features)
- if(_opengles2Index GREATER -1)
-- list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery)
-+ list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery
-+ QOpenGLVersionFunctionsFactory)
- message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Dropping Desktop OpenGL classes (GLES2)")
- else()
- list(APPEND QtGui_SRC
-diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt
-index 62ed669..af7a3c8 100644
---- a/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt
-+++ b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt
-@@ -11,7 +11,8 @@ set(QtOpenGLFunctions_SRC ${QtOpenGLFunctions_GEN_DIR}/qtopenglfunctions_module_
- list(FIND QtOpenGLFunctions_enabled_features "opengles2" _opengles2Index)
- # ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtOpenGLFunctions_enabled_features)
- if(_opengles2Index GREATER -1)
-- list(APPEND QtOpenGLFunctions_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery)
-+ list(APPEND QtOpenGLFunctions_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery
-+ QOpenGLVersionFunctionsFactory)
- list(APPEND QtOpenGLFunctions_SRC
- ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_es2_wrapper.cpp)
- message(STATUS "Qt${QT_MAJOR_VERSION}OpenGLFunctions: Dropping Desktop OpenGL classes (GLES2)")
diff --git a/debian/patches/Fix-Property-GC-tracking-for-Python-3.11.patch b/debian/patches/Fix-Property-GC-tracking-for-Python-3.11.patch
deleted file mode 100644
index 4bbd90b8..00000000
--- a/debian/patches/Fix-Property-GC-tracking-for-Python-3.11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Christian Tismer <tismer at stackless.com>
-Date: Sun, 11 Sep 2022 11:19:20 +0200
-Subject: Fix Property GC tracking for Python 3.11
-
-The GC was not untracked when PySide Property was deleted.
-This was found by the new deeper error tracking in debug Python 3.11 .
-
-Fixes: PYSIDE-1960
-Change-Id: I5ecdfb88529c22a44575ca9460d6753b1e389079
-Pick-to: 6.2 6.3 5.15
-Reviewed-by: Friedemann Kleint <Friedemann.Kleint at qt.io>
-(cherry picked from commit ace680f4c5fc8564df9daaa41bf8779c9fffa671)
----
- sources/pyside2/libpyside/pysideproperty.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
-index 3b4039a..5739c28 100644
---- a/sources/pyside2/libpyside/pysideproperty.cpp
-+++ b/sources/pyside2/libpyside/pysideproperty.cpp
-@@ -104,6 +104,7 @@ static PyType_Slot PySidePropertyType_slots[] = {
- {Py_tp_init, (void *)qpropertyTpInit},
- {Py_tp_new, (void *)qpropertyTpNew},
- {Py_tp_getset, PySidePropertyType_getset},
-+ {Py_tp_del, reinterpret_cast<void *>(PyObject_GC_Del)},
- {0, 0}
- };
- // Dotted modulename is crucial for SbkType_FromSpec to work. Is this name right?
-@@ -249,6 +250,7 @@ static void qpropertyDeAlloc(PyObject *self)
- // This was not needed before Python 3.8 (Python issue 35810)
- Py_DECREF(Py_TYPE(self));
- }
-+ PyObject_GC_UnTrack(self);
- Py_TYPE(self)->tp_free(self);
- }
-
diff --git a/debian/patches/Fix-usage-of-Py_TYPE-for-Python-3.11.patch b/debian/patches/Fix-usage-of-Py_TYPE-for-Python-3.11.patch
deleted file mode 100644
index 709a9180..00000000
--- a/debian/patches/Fix-usage-of-Py_TYPE-for-Python-3.11.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Date: Thu, 9 Jun 2022 13:45:07 +0200
-Subject: Fix usage of Py_TYPE() for Python 3.11
-
-The macro was changed to a function, no longer allowing for assignment.
-
-Pick-to: 6.3 6.2 5.15
-Task-number: PYSIDE-1960
-Change-Id: I4bc0e9a5c1f3dc70d59628e63b7b9d47ea449992
-Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes at qt.io>
-Reviewed-by: Christian Tismer <tismer at stackless.com>
-(cherry picked from commit 73adefe22ffbfabe0ef213e9c2fe2c56efdd7488)
----
- sources/pyside2/libpyside/pysideqflags.cpp | 2 +-
- sources/pyside2/libpyside/pysidesignal.cpp | 2 +-
- sources/pyside2/libpyside/pysideweakref.cpp | 2 +-
- sources/shiboken2/libshiboken/basewrapper.cpp | 4 ++--
- sources/shiboken2/libshiboken/sbkenum.cpp | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp
-index 8b224f2..784082a 100644
---- a/sources/pyside2/libpyside/pysideqflags.cpp
-+++ b/sources/pyside2/libpyside/pysideqflags.cpp
-@@ -192,7 +192,7 @@ namespace QFlags
- }
- newspec.slots = SbkNewQFlagsType_spec.slots;
- PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec);
-- Py_TYPE(type) = &PyType_Type;
-+ Py_SET_TYPE(type, &PyType_Type);
-
- PySideQFlagsType *flagsType = reinterpret_cast<PySideQFlagsType *>(type);
- PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter;
-diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp
-index b5069a0..ce89a9d 100644
---- a/sources/pyside2/libpyside/pysidesignal.cpp
-+++ b/sources/pyside2/libpyside/pysidesignal.cpp
-@@ -162,7 +162,7 @@ PyTypeObject *PySideSignalTypeF(void)
- if (!type) {
- type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideSignalType_spec));
- PyTypeObject *hold = Py_TYPE(type);
-- Py_TYPE(type) = PySideMetaSignalTypeF();
-+ Py_SET_TYPE(type, PySideMetaSignalTypeF());
- Py_INCREF(Py_TYPE(type));
- Py_DECREF(hold);
- }
-diff --git a/sources/pyside2/libpyside/pysideweakref.cpp b/sources/pyside2/libpyside/pysideweakref.cpp
-index cd90634..730990f 100644
---- a/sources/pyside2/libpyside/pysideweakref.cpp
-+++ b/sources/pyside2/libpyside/pysideweakref.cpp
-@@ -90,7 +90,7 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData)
-
- if (Py_TYPE(PySideCallableObjectTypeF()) == 0)
- {
-- Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type;
-+ Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type);
- PyType_Ready(PySideCallableObjectTypeF());
- }
-
-diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
-index 96d4038..0832037 100644
---- a/sources/shiboken2/libshiboken/basewrapper.cpp
-+++ b/sources/shiboken2/libshiboken/basewrapper.cpp
-@@ -377,7 +377,7 @@ SbkObjectType *SbkObject_TypeF(void)
- static PyTypeObject *type = nullptr;
- if (!type) {
- type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&SbkObject_Type_spec));
-- Py_TYPE(type) = SbkObjectType_TypeF();
-+ Py_SET_TYPE(type, SbkObjectType_TypeF());
- Py_INCREF(Py_TYPE(type));
- type->tp_weaklistoffset = offsetof(SbkObject, weakreflist);
- type->tp_dictoffset = offsetof(SbkObject, ob_dict);
-@@ -1161,7 +1161,7 @@ introduceWrapperType(PyObject *enclosingObject,
- typeSpec->slots[0].pfunc = reinterpret_cast<void *>(baseType ? baseType : SbkObject_TypeF());
-
- PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes);
-- Py_TYPE(heaptype) = SbkObjectType_TypeF();
-+ Py_SET_TYPE(heaptype, SbkObjectType_TypeF());
- Py_INCREF(Py_TYPE(heaptype));
- auto *type = reinterpret_cast<SbkObjectType *>(heaptype);
- #if PY_VERSION_HEX < 0x03000000
-diff --git a/sources/shiboken2/libshiboken/sbkenum.cpp b/sources/shiboken2/libshiboken/sbkenum.cpp
-index 7dc73df..9459e42 100644
---- a/sources/shiboken2/libshiboken/sbkenum.cpp
-+++ b/sources/shiboken2/libshiboken/sbkenum.cpp
-@@ -754,7 +754,7 @@ newTypeWithName(const char *name,
- PyTuple_SetItem(bases, 0, reinterpret_cast<PyObject *>(basetype));
- auto *type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpecWithBases(&newspec, bases));
- PyErr_Print();
-- Py_TYPE(type) = SbkEnumType_TypeF();
-+ Py_SET_TYPE(type, SbkEnumType_TypeF());
-
- auto *enumType = reinterpret_cast<SbkEnumType *>(type);
- PepType_SETP(enumType)->cppName = cppName;
diff --git a/debian/patches/libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch b/debian/patches/libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch
deleted file mode 100644
index 00ed70a5..00000000
--- a/debian/patches/libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Date: Thu, 9 Jun 2022 16:50:41 +0200
-Subject: 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 <tismer at stackless.com>
-Reviewed-by: Qt CI Bot <qt_ci_bot at qt-project.org>
-(cherry picked from commit 52df3b8f64d08f412d7f8b12d82fc0ae6f3c741d)
----
- sources/shiboken2/libshiboken/basewrapper.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
-index afca7fa..96d4038 100644
---- a/sources/shiboken2/libshiboken/basewrapper.cpp
-+++ b/sources/shiboken2/libshiboken/basewrapper.cpp
-@@ -1526,6 +1526,7 @@ bool setCppPointer(SbkObject *sbkObj, PyTypeObject *desiredType, void *cptr)
- bool isValid(PyObject *pyObj)
- {
- if (!pyObj || pyObj == Py_None
-+ || PyType_Check(pyObj) != 0
- || Py_TYPE(Py_TYPE(pyObj)) != SbkObjectType_TypeF()) {
- return true;
- }
diff --git a/debian/patches/libshiboken-Fix-crashes-with-static-strings-in-Python-3.11.patch b/debian/patches/libshiboken-Fix-crashes-with-static-strings-in-Python-3.11.patch
deleted file mode 100644
index 821035b9..00000000
--- a/debian/patches/libshiboken-Fix-crashes-with-static-strings-in-Python-3.11.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Date: Fri, 24 Jun 2022 09:22:01 +0200
-Subject: libshiboken: Fix crashes with static strings in Python 3.11
-
-In Python 3.11, some strings come with a refcount above decimal
-1000000000, apparently indicating that they are interned. Replace the
-mechanism by PyUnicode_InternFromString().
-
-Task-number: PYSIDE-1960
-Pick-to: 6.3 6.2 5.15
-Change-Id: I6436afee351f89da5814b5d6bc76970b1b508168
-Reviewed-by: Qt CI Bot <qt_ci_bot at qt-project.org>
-Reviewed-by: Christian Tismer <tismer at stackless.com>
-(cherry picked from commit a09a1db8391243e6bb290ee66bb6e3afbb114c61)
----
- sources/shiboken2/libshiboken/sbkstring.cpp | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/sources/shiboken2/libshiboken/sbkstring.cpp b/sources/shiboken2/libshiboken/sbkstring.cpp
-index 077fb53..a9d451c 100644
---- a/sources/shiboken2/libshiboken/sbkstring.cpp
-+++ b/sources/shiboken2/libshiboken/sbkstring.cpp
-@@ -41,8 +41,14 @@
- #include "sbkstaticstrings_p.h"
- #include "autodecref.h"
-
--#include <vector>
--#include <unordered_set>
-+#if PY_VERSION_HEX >= 0x030B0000 || defined(Py_LIMITED_API)
-+# define USE_INTERN_STRINGS
-+#endif
-+
-+#ifndef USE_INTERN_STRINGS
-+# include <vector>
-+# include <unordered_set>
-+#endif
-
- namespace Shiboken
- {
-@@ -233,6 +239,13 @@ Py_ssize_t len(PyObject *str)
- // PyObject *attr = PyObject_GetAttr(obj, name());
- //
-
-+#ifdef USE_INTERN_STRINGS
-+PyObject *createStaticString(const char *str)
-+{
-+ return PyUnicode_InternFromString(str);
-+}
-+#else
-+
- using StaticStrings = std::unordered_set<PyObject *>;
-
- static void finalizeStaticStrings(); // forward
-@@ -283,6 +296,8 @@ PyObject *createStaticString(const char *str)
- return result;
- }
-
-+#endif // !USE_INTERN_STRINGS
-+
- ///////////////////////////////////////////////////////////////////////
- //
- // PYSIDE-1019: Helper function for snake_case vs. camelCase names
diff --git a/debian/patches/series b/debian/patches/series
index 4b257fb5..0997c979 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,12 +2,7 @@ update-sip-import.patch
fix-spelling-errors.patch
blacklist-failing-tests.patch
test-with-current-interpreter.patch
-libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch
-Fix-usage-of-Py_TYPE-for-Python-3.11.patch
-libshiboken-Fix-crashes-with-static-strings-in-Python-3.11.patch
Shiboken-Fix-the-oldest-shiboken-bug-ever.patch
PyEnum-make-forgiving-duplicates-work-with-Python-3.11.patch
-Fix-Property-GC-tracking-for-Python-3.11.patch
make-wheels-compatible-with-Python-3.11.patch
-Fix-GLES-builds.patch
Fix-tests-sample_privatector-sample_privatedtor-failing-w.patch
More information about the Neon-commits
mailing list