[neon/qt/pyside2/Neon/unstable] debian: Drop no longer needed patches.

[Dmitry Shachnev]

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

Drop no longer needed patches.

- Revert-removal-of-version-check.patch
- importlib-machinery.patch

M  +3    -0    debian/changelog
D  +0    -22   debian/patches/Revert-removal-of-version-check.patch
D  +0    -22   debian/patches/importlib-machinery.patch
M  +0    -2    debian/patches/series

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

diff --git a/debian/changelog b/debian/changelog
index f93bd614..ec7ab4a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ pyside2 (5.15.9-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop patches, no longer needed after upstream changes:
+    - Revert-removal-of-version-check.patch
+    - importlib-machinery.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 May 2023 21:14:00 +0300
 
diff --git a/debian/patches/Revert-removal-of-version-check.patch b/debian/patches/Revert-removal-of-version-check.patch
deleted file mode 100644
index f270eb3b..00000000
--- a/debian/patches/Revert-removal-of-version-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/importlib-machinery.patch b/debian/patches/importlib-machinery.patch
deleted file mode 100644
index 2691d89b..00000000
--- a/debian/patches/importlib-machinery.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Dmitry Shachnev <mitya57 at debian.org>
-Date: Sat, 7 Jan 2023 16:46:57 +0400
-Subject: Fix AttributeError: module 'importlib' has no attribute 'machinery'
-
-Origin: https://github.com/archlinux/svntogit-packages/blob/packages/pyside2/trunk/fix-build.patch
----
- sources/shiboken2/libshiboken/embed/signature_bootstrap.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py b/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
-index 9028642..c70abc5 100644
---- a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
-+++ b/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
-@@ -211,7 +211,7 @@ class EmbeddableZipImporter(object):
-         return self if self._mod2path.get(fullname) else None
- 
-     def load_module(self, fullname):
--        import importlib
-+        import importlib.machinery
-         import sys
- 
-         filename = self._mod2path.get(fullname)
diff --git a/debian/patches/series b/debian/patches/series
index 53267d91..301d28ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +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
-importlib-machinery.patch
 Fix-GLES-builds.patch