summaryrefslogtreecommitdiffstats
path: root/academic/QtiPlot/pyqt-4.11.patch
diff options
context:
space:
mode:
author David Spencer2015-10-28 20:31:10 +0100
committer Willy Sudiarto Raharjo2016-01-17 03:40:16 +0100
commit9434f258ee05b0951f5690cb20726c55a2e73e40 (patch)
treeb21b21d2bb4b47988b9edcda093af97d379deda1 /academic/QtiPlot/pyqt-4.11.patch
parent7f020478b9da0abb624b1d887ed4be81ee28c014 (diff)
downloadslackbuilds-9434f258ee05b0951f5690cb20726c55a2e73e40.tar.gz
academic/QtiPlot: Patched for building with sip-4.16.
Also fixed library plugin location. Signed-off-by: David Spencer <baildon.research@googlemail.com>
Diffstat (limited to 'academic/QtiPlot/pyqt-4.11.patch')
-rw-r--r--academic/QtiPlot/pyqt-4.11.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/academic/QtiPlot/pyqt-4.11.patch b/academic/QtiPlot/pyqt-4.11.patch
new file mode 100644
index 0000000000..dc7d56f3e3
--- /dev/null
+++ b/academic/QtiPlot/pyqt-4.11.patch
@@ -0,0 +1,33 @@
+ qtiplot/python-sipcmd.py | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py
+index f643194..d8d1ef2 100755
+--- a/qtiplot/python-sipcmd.py
++++ b/qtiplot/python-sipcmd.py
+@@ -27,6 +27,21 @@
+ # #
+ ############################################################################
+
+-from PyQt4 import pyqtconfig
+-config = pyqtconfig.Configuration()
+-print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
++from __future__ import print_function
++
++import os
++import sipconfig
++import PyQt4.QtCore
++
++try:
++ # >= 4.10
++ SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
++except:
++ import PyQt4.pyqtconfig
++ SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags
++
++PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4')
++SIP_BIN = sipconfig.Configuration().sip_bin
++SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir
++
++print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS]))
+