[neon/qt/pyside2/Neon/unstable] debian: Refresh other patches.

Dmitry Shachnev null at kde.org
Thu Jun 15 10:12:13 BST 2023


Git commit bd5a672892b0580c3054f31a73446dbf3d7c20ed by Dmitry Shachnev.
Committed on 17/05/2023 at 18:18.
Pushed by carlosdem into branch 'Neon/unstable'.

Refresh other patches.

M  +1    -0    debian/changelog
M  +2    -2    debian/patches/Fix-usage-of-Py_TYPE-for-Python-3.11.patch
M  +2    -2    debian/patches/libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch

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

diff --git a/debian/changelog b/debian/changelog
index ec7ab4a7..c0150582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pyside2 (5.15.9-1) UNRELEASED; urgency=medium
   * Drop patches, no longer needed after upstream changes:
     - Revert-removal-of-version-check.patch
     - importlib-machinery.patch
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 May 2023 21:14:00 +0300
 
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
index 3e7f386e..709a9180 100644
--- 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
@@ -58,7 +58,7 @@ index cd90634..730990f 100644
      }
  
 diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
-index 917b743..e2eccd0 100644
+index 96d4038..0832037 100644
 --- a/sources/shiboken2/libshiboken/basewrapper.cpp
 +++ b/sources/shiboken2/libshiboken/basewrapper.cpp
 @@ -377,7 +377,7 @@ SbkObjectType *SbkObject_TypeF(void)
@@ -70,7 +70,7 @@ index 917b743..e2eccd0 100644
          Py_INCREF(Py_TYPE(type));
          type->tp_weaklistoffset = offsetof(SbkObject, weakreflist);
          type->tp_dictoffset = offsetof(SbkObject, ob_dict);
-@@ -1160,7 +1160,7 @@ introduceWrapperType(PyObject *enclosingObject,
+@@ -1161,7 +1161,7 @@ introduceWrapperType(PyObject *enclosingObject,
      typeSpec->slots[0].pfunc = reinterpret_cast<void *>(baseType ? baseType : SbkObject_TypeF());
  
      PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes);
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
index 29f6cd36..00ed70a5 100644
--- a/debian/patches/libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch
+++ b/debian/patches/libshiboken-Fix-a-crash-in-Shiboken-Object-isValid.patch
@@ -22,10 +22,10 @@ Reviewed-by: Qt CI Bot <qt_ci_bot at qt-project.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
-index 7ac7fad..917b743 100644
+index afca7fa..96d4038 100644
 --- a/sources/shiboken2/libshiboken/basewrapper.cpp
 +++ b/sources/shiboken2/libshiboken/basewrapper.cpp
-@@ -1525,6 +1525,7 @@ bool setCppPointer(SbkObject *sbkObj, PyTypeObject *desiredType, void *cptr)
+@@ -1526,6 +1526,7 @@ bool setCppPointer(SbkObject *sbkObj, PyTypeObject *desiredType, void *cptr)
  bool isValid(PyObject *pyObj)
  {
      if (!pyObj || pyObj == Py_None



More information about the Neon-commits mailing list