[neon/qt/pyside2/Neon/release] debian/patches: remove patch now upstream

Jonathan Esk-Riddell null at kde.org
Mon Oct 9 14:29:25 BST 2023


Git commit edfdcb21b75dc7b05347ed4f8a219a2ee21c01de by Jonathan Esk-Riddell.
Committed on 09/10/2023 at 15:29.
Pushed by jriddell into branch 'Neon/release'.

remove patch now upstream

D  +0    -35   debian/patches/libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/pyside2/-/commit/edfdcb21b75dc7b05347ed4f8a219a2ee21c01de

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/series b/debian/patches/series
index 301d28ed..26d05844 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ 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


More information about the Neon-commits mailing list