https://sources.debian.org/data/main/p/pyqt5/5.11.3+dfsg-1/debian/patches/public_sip.diff From: Dmitry Shachnev 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) { put type='submit' value='search'/>
path: root/gnu/packages/parallel.scm
AgeCommit message (Expand)Author
2017-07-22gnu: parallel: Update to 20170722....* gnu/packages/parallel.scm (parallel): Update to 20170722. Tobias Geerinckx-Rice
2017-06-30gnu: hwloc: Add "lib" and "debug" outputs....* gnu/packages/mpi.scm (hwloc)[outputs]: New field. [arguments]: Add 'avoid-circular-references' phase. (openmpi)[inputs]: Use the "lib" output of HWLOC. * gnu/packages/parallel.scm (slurm)[inputs]: Likewise. Ludovic Courtès
2017-05-28gnu: parallel: Update to 20170522....* gnu/packages/parallel.scm (parallel): Update to 20170522. Marius Bakke
2017-05-02gnu: parallel: Update to 20170422....* gnu/packages/parallel.scm (parallel): Update to 20170422. Ludovic Courtès
2017-03-31gnu: parallel: Update to 20170322....* gnu/packages/parallel.scm (parallel): Update to 20170322. Tobias Geerinckx-Rice
2017-02-11gnu: slurm: Update to 16.05.9.1.... * gnu/packages/parallel.scm (slurm): Update to 16.05.9.1. * gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch: Removing two contribs which are added in the new version. Signed-off-by: Marius Bakke <mbakke@fastmail.com> Carolili
2017-01-31gnu: parallel: Update to 20170122....* gnu/packages/parallel.scm (parallel): Update to 20170122. Ludovic Courtès
2017-01-04gnu: parallel: Update to 20161222....* gnu/packages/parallel.scm (parallel): Update to 20161222. Tobias Geerinckx-Rice
2016-12-08gnu: parallel: Update 20161122....* gnu/packages/parallel.scm (parallel): Update to 20161122. Leo Famulari
2016-11-15gnu: parallel: Update to 20161022....* gnu/packages/parallel.scm (parallel): Update to 20161022. [home-page]: Use https. Efraim Flashner
2016-10-03gnu: parallel: Update to 20160922....* gnu/packages/parallel.scm (parallel): Update to 20160922. Leo Famulari
2016-09-12gnu: parallel: Update to 20160822....* gnu/packages/parallel.scm (parallel): Update to 20160822. Efraim Flashner