[neon/qt/pyside2/Neon/unstable] debian: Revert a change from 5.15.8 which broke build without limited API.

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


Git commit 2eaf12c7fd34646a58871ba73593ecc67caa6c67 by Dmitry Shachnev.
Committed on 04/01/2023 at 20:11.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert a change from 5.15.8 which broke build without limited API.

M  +1    -0    debian/changelog
A  +22   -0    debian/patches/Revert-removal-of-version-check.patch
M  +1    -0    debian/patches/series

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

diff --git a/debian/changelog b/debian/changelog
index e1ab62ae..c0ca98ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ pyside2 (5.15.8-1) UNRELEASED; urgency=medium
   * Refresh debian/patches/blacklist-failing-tests.patch.
   * Backport several upstream patches to support Python 3.11.
   * Remove dh-exec (debhelper now supports substitutions natively).
+  * Revert a change from 5.15.8 which broke build without limited API.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 31 Dec 2022 21:24:57 +0300
 
diff --git a/debian/patches/Revert-removal-of-version-check.patch b/debian/patches/Revert-removal-of-version-check.patch
new file mode 100644
index 00000000..f270eb3b
--- /dev/null
+++ b/debian/patches/Revert-removal-of-version-check.patch
@@ -0,0 +1,22 @@
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Thu, 5 Jan 2023 00:08:32 +0400
+Subject: Revert removal of version check
+
+It broke build without limited API.
+---
+ sources/shiboken2/libshiboken/pep384impl.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
+index 66df0fd..a723303 100644
+--- a/sources/shiboken2/libshiboken/pep384impl.cpp
++++ b/sources/shiboken2/libshiboken/pep384impl.cpp
+@@ -751,7 +751,7 @@ _Pep_PrivateMangle(PyObject *self, PyObject *name)
+ #endif // IS_PY2
+     Shiboken::AutoDecRef privateobj(PyObject_GetAttr(
+         reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name()));
+-#ifndef Py_LIMITED_API
++#if !defined(Py_LIMITED_API) && PY_VERSION_HEX < 0x03010000
+     return _Py_Mangle(privateobj, name);
+ #else
+     // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always.
diff --git a/debian/patches/series b/debian/patches/series
index c87d74ca..ceb784f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ 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
+Revert-removal-of-version-check.patch



More information about the Neon-commits mailing list