mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
Efraim Flashner
d4274628a6
* gnu/packages/qt.scm (python-pyqt): Update to 5.11.3. * gnu/packages/patches/pyqt-public-sip: Update patch.
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
https://sources.debian.org/data/main/p/pyqt5/5.11.3+dfsg-1/debian/patches/public_sip.diff
|
|
|
|
From: Dmitry Shachnev <mitya57@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/#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 32d03a0..3c43a14 100644
|
|
--- 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 f41d391..3ca8b11 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 e14b946..140e80c 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)
|
|
{
|