[neon/forks/pyqt5/Neon/release-lts] debian: [sip5] Drop debian/patches/public_sip.diff, not needed.

[Dmitry Shachnev]

Git commit ab0b66e0a5207bf530ee260a4163b394db1ae45f by Dmitry Shachnev.
Committed on 14/06/2020 at 11:46.
Pushed by jriddell into branch 'Neon/release-lts'.

[sip5] Drop debian/patches/public_sip.diff, not needed.

M  +1    -0    debian/changelog
D  +0    -53   debian/patches/public_sip.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/forks/pyqt5/commit/ab0b66e0a5207bf530ee260a4163b394db1ae45f

diff --git a/debian/changelog b/debian/changelog
index d9908f57..643458d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pyqt5 (5.15.0+dfsg-2) UNRELEASED; urgency=medium
   * Switch from sip4 to sip5:
     - Update build-dependencies.
     - Build with sip-build instead of configure.py.
+    - Drop debian/patches/public_sip.diff, not needed with sip5.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 14 Jun 2020 14:19:50 +0300
 
diff --git a/debian/patches/public_sip.diff b/debian/patches/public_sip.diff
deleted file mode 100644
index 51305e5f..00000000
--- a/debian/patches/public_sip.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Dmitry Shachnev <mitya57 at debian.org>
-Date: Tue, 3 Jul 2018 09:46:42 +0300
-Subject: Use the public version of sip module
-
-Per https://www.debian.org/doc/debian-policy/ch-source.html#convenience-copies-of-code.
----
- configure.py              | 2 +-
- designer/pluginloader.cpp | 2 +-
- qmlscene/pluginloader.cpp | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.py b/configure.py
-index fdc86f2..afd6bea 100644
---- a/configure.py
-+++ b/configure.py
-@@ -2506,7 +2506,7 @@ def get_sip_flags(target_config):
-     the target configuration.
-     """
- 
--    sip_flags = ['-n', 'PyQt5.sip']
-+    sip_flags = ['-n', 'sip']
- 
-     # If we don't check for signed interpreters, we exclude the 'VendorID'
-     # feature
-diff --git a/designer/pluginloader.cpp b/designer/pluginloader.cpp
-index d4fb17a..8fb5450 100644
---- a/designer/pluginloader.cpp
-+++ b/designer/pluginloader.cpp
-@@ -167,7 +167,7 @@ bool PyCustomWidgets::importPlugins(const QString &dir, const QStringList &plugi
-     // Make sure we have sip.unwrapinstance.
-     if (!sip_unwrapinstance)
-     {
--        sip_unwrapinstance = getModuleAttr("PyQt5.sip", "unwrapinstance");
-+        sip_unwrapinstance = getModuleAttr("sip", "unwrapinstance");
- 
-         if (!sip_unwrapinstance)
-             return true;
-diff --git a/qmlscene/pluginloader.cpp b/qmlscene/pluginloader.cpp
-index 635d31e..807a470 100644
---- a/qmlscene/pluginloader.cpp
-+++ b/qmlscene/pluginloader.cpp
-@@ -412,9 +412,9 @@ PyObject *PyQt5QmlPlugin::getModuleAttr(const char *module, const char *attr)
- void PyQt5QmlPlugin::getSipAPI()
- {
- #if defined(SIP_USE_PYCAPSULE)
--    sip = (const sipAPIDef *)PyCapsule_Import("PyQt5.sip._C_API", 0);
-+    sip = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0);
- #else
--    PyObject *c_api = getModuleAttr("PyQt5.sip", "_C_API");
-+    PyObject *c_api = getModuleAttr("sip", "_C_API");
- 
-     if (c_api)
-     {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4858e90d..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-public_sip.diff