diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-10-27 16:48:10 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-10-27 16:48:10 +0000 |
| commit | 7c5270d8963e96c291dcdfff6cb8698cc5e1dfc3 (patch) | |
| tree | 8a1627b23df60647292f0ff7d6c0c6746418081e /sci-visualization/qtiplot | |
| parent | Cleanup old. (diff) | |
| download | gentoo-2-7c5270d8963e96c291dcdfff6cb8698cc5e1dfc3.tar.gz gentoo-2-7c5270d8963e96c291dcdfff6cb8698cc5e1dfc3.tar.bz2 gentoo-2-7c5270d8963e96c291dcdfff6cb8698cc5e1dfc3.zip | |
sci-visualization/qtiplot: Add fix for >PyQt4-4.10
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sci-visualization/qtiplot')
| -rw-r--r-- | sci-visualization/qtiplot/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch | 37 | ||||
| -rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild | 3 |
3 files changed, 44 insertions, 2 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index e473df196ec2..dca08a1a02b5 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-visualization/qtiplot # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.105 2014/01/19 09:38:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.106 2014/10/27 16:48:10 jlec Exp $ + + 27 Oct 2014; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.9-r2.ebuild, + +files/qtiplot-0.9.8.9-PyQt4-4.10.patch: + Add fix for >PyQt4-4.10 19 Jan 2014; Pacho Ramos <pacho@gentoo.org> qtiplot-0.9.8.9-r2.ebuild: amd64 stable, bug 490036 diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch new file mode 100644 index 000000000000..db6b459180ba --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch @@ -0,0 +1,37 @@ + qtiplot/python-sipcmd.py | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py +index f643194..00edb6f 100755 +--- a/qtiplot/python-sipcmd.py ++++ b/qtiplot/python-sipcmd.py +@@ -27,6 +27,26 @@ + # # + ############################################################################ + +-from PyQt4 import pyqtconfig +-config = pyqtconfig.Configuration() +-print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags]) ++#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 sipconfig ++import os ++#config = sipconfig.Configuration() ++#print("sip -I %s -t WS_X11 -t Q_WS_X11" % (os.path.join(config.default_sip_dir, "PyQt4"))) ++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])) diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild index 0a4a6d0c5142..0123eb1fbc47 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild,v 1.7 2014/01/19 09:38:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild,v 1.8 2014/10/27 16:48:10 jlec Exp $ EAPI=5 @@ -73,6 +73,7 @@ PATCHES=( "${FILESDIR}"/${P}-crasher_without_internet.patch "${FILESDIR}"/${P}-private.patch "${FILESDIR}"/${P}-sip-4.15.patch + "${FILESDIR}"/${P}-PyQt4-4.10.patch ) pkg_setup() { |