Use the public version of sip module

Per https://www.debian.org/doc/debian-policy/#convenience-copies-of-code.

Gbp-Pq: Name public_sip.diff

diff --git a/configure.py b/configure.py
index 32d03a06f0f412f50c9a70d9cd65c8a9da7d0bfa..3c43a14864ef620671fcccf67725ae7c38b37b4f 100644 (file)
--- a/configure.py
+++ b/configure.py
@@ -2440,7 +2440,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 f41d39136510178f8c1ee4e96986de99d4c55208..3ca8b11825ce1e7c1ee14d1e74bfa503829d5d6d 100644 (file)
--- 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 e14b9467532ff1816b47afaa4df98b2873232876..140e80cd3925b498e2bd7620115f775804c8fa8e 100644 (file)
--- 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)
     {