Date: Sunday, June 25, 2017 @ 09:45:35 Author: arojas Revision: 299208
gsl 2.4 rebuild, disable python scripting, it breaks with every new sip release Modified: qtiplot/trunk/PKGBUILD qtiplot/trunk/build.conf.archlinux Deleted: qtiplot/trunk/pyqt-4.11.patch qtiplot/trunk/sip-4.15.patch ----------------------+ PKGBUILD | 12 +++--------- build.conf.archlinux | 1 - pyqt-4.11.patch | 33 --------------------------------- sip-4.15.patch | 32 -------------------------------- 4 files changed, 3 insertions(+), 75 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-25 09:19:19 UTC (rev 299207) +++ PKGBUILD 2017-06-25 09:45:35 UTC (rev 299208) @@ -5,11 +5,11 @@ pkgname=qtiplot pkgver=0.9.8.9 -pkgrel=9 +pkgrel=10 arch=('i686' 'x86_64') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" -depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') +depends=('muparser' 'gsl' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') # build against qwtplot3d provided in the package ... # build against qwt provided in the package ... # as systemwide one doesn't provide all needed functions @@ -26,14 +26,12 @@ qtiplot-0.9.8.6-tamuanova.patch qwtplot3d-qt-4.8.0.patch qwtplot3d-libpng15.patch - pyqt-4.11.patch qtiplot-0.9.8.9-private.patch - sip-4.15.patch qtiplot-gsl2.patch) sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' '4301cb2a36024a10108b689990d28c4fe5c7416e' - '326ee6bc623a637d058ab7ee9f65fede40a23a09' + '8fb24e567394e6b48b820dc6231506bdeca460d8' '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' '285f57d865956d93250ec548288c5bface096b6b' 'b534a609f317cf3117d6495909854cdacea20124' @@ -41,9 +39,7 @@ '830b518e3ef63625df84363a8047417124f243b0' '3d4c471dda29a04d432f8e0a4c5b977068cdae72' '4a45ee21f028f34da75d83c0d3e1d08c5f928892' - 'cef3bca1c15be01ca8a8c0d75d557027d723286c' 'c5e9d075ce6a73c473e52a197d9919116b2cece5' - '55a380bc61819258e0c11ccb42f9057e31d4881e' 'bcd28fda51444227e77638af1989a6a40e9f516c') prepare() { @@ -53,9 +49,7 @@ patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch" patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch" # patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch" - patch -Np1 -i "$srcdir"/pyqt-4.11.patch patch -Np1 -i "$srcdir"/qtiplot-0.9.8.9-private.patch - patch -Np1 -i "$srcdir"/sip-4.15.patch patch -Np1 -i "$srcdir"/qtiplot-gsl2.patch # build also static qwtplot3d lib Modified: build.conf.archlinux =================================================================== --- build.conf.archlinux 2017-06-25 09:19:19 UTC (rev 299207) +++ build.conf.archlinux 2017-06-25 09:45:35 UTC (rev 299208) @@ -25,7 +25,6 @@ LRELEASE = lrelease SCRIPTING_LANGS += muParser -SCRIPTING_LANGS += Python CONFIG += CustomInstall DEFINES += SCRIPTING_CONSOLE Deleted: pyqt-4.11.patch =================================================================== --- pyqt-4.11.patch 2017-06-25 09:19:19 UTC (rev 299207) +++ pyqt-4.11.patch 2017-06-25 09:45:35 UTC (rev 299208) @@ -1,33 +0,0 @@ - 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])) - Deleted: sip-4.15.patch =================================================================== --- sip-4.15.patch 2017-06-25 09:19:19 UTC (rev 299207) +++ sip-4.15.patch 2017-06-25 09:45:35 UTC (rev 299208) @@ -1,32 +0,0 @@ ---- ./qtiplot/src/analysis/FFT.cpp.orig 2011-07-06 11:51:08.000000000 +0000 -+++ ./qtiplot/src/analysis/FFT.cpp 2013-10-23 23:07:45.674925476 +0000 -@@ -353,7 +353,7 @@ - ml->arrangeLayers(false, false); - } - --bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to) -+bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused) - { - d_init_err = true; - ---- ./qtiplot/src/analysis/FFT.h.orig 2011-07-05 22:05:03.000000000 +0000 -+++ ./qtiplot/src/analysis/FFT.h 2013-10-23 23:11:34.277924367 +0000 -@@ -52,6 +52,8 @@ - Matrix *realOutputMatrix(){return d_re_out_matrix;} - Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;} - -+ bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false); -+ - private: - void init(); - void output(); -@@ -60,8 +62,6 @@ - void fftTable(); - void fftMatrix(); - -- bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1); -- - double d_sampling; - //! Flag telling if an inverse FFT must be performed. - bool d_inverse; -