Date: Saturday, May 30, 2015 @ 14:30:15 Author: arojas Revision: 239912
Fix source, add more gentoo build fixes Added: qtiplot/trunk/pyqt-4.11.patch qtiplot/trunk/qtiplot-0.9.8.9-private.patch qtiplot/trunk/sip-4.15.patch Modified: qtiplot/trunk/PKGBUILD Deleted: qtiplot/trunk/sip.patch -------------------------------+ PKGBUILD | 21 +++++++++++++++------ pyqt-4.11.patch | 33 +++++++++++++++++++++++++++++++++ qtiplot-0.9.8.9-private.patch | 16 ++++++++++++++++ sip-4.15.patch | 32 ++++++++++++++++++++++++++++++++ sip.patch | 13 ------------- 5 files changed, 96 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-05-30 12:05:07 UTC (rev 239911) +++ PKGBUILD 2015-05-30 12:30:15 UTC (rev 239912) @@ -5,7 +5,7 @@ pkgname=qtiplot pkgver=0.9.8.9 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" @@ -16,7 +16,7 @@ makedepends=('pkg-config' 'boost' 'mesa') license=('GPL2') install=${pkgname}.install -source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 +source=(http://downloads.sourceforge.net/project/qtiplot.berlios/$pkgname-$pkgver.tar.bz2 $pkgname.desktop $pkgname.png build.conf.archlinux @@ -26,7 +26,10 @@ qtiplot-0.9.8.6-kde.patch qtiplot-0.9.8.6-tamuanova.patch qwtplot3d-qt-4.8.0.patch - qwtplot3d-libpng15.patch) + qwtplot3d-libpng15.patch + pyqt-4.11.patch + qtiplot-0.9.8.9-private.patch + sip-4.15.patch) sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' '4301cb2a36024a10108b689990d28c4fe5c7416e' @@ -37,15 +40,21 @@ 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975' '830b518e3ef63625df84363a8047417124f243b0' '3d4c471dda29a04d432f8e0a4c5b977068cdae72' - '4a45ee21f028f34da75d83c0d3e1d08c5f928892') + '4a45ee21f028f34da75d83c0d3e1d08c5f928892' + 'cef3bca1c15be01ca8a8c0d75d557027d723286c' + 'c5e9d075ce6a73c473e52a197d9919116b2cece5' + '55a380bc61819258e0c11ccb42f9057e31d4881e') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd $pkgname-$pkgver # gentoo fixes 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 # build also static qwtplot3d lib echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro Added: pyqt-4.11.patch =================================================================== --- pyqt-4.11.patch (rev 0) +++ pyqt-4.11.patch 2015-05-30 12:30:15 UTC (rev 239912) @@ -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])) + Added: qtiplot-0.9.8.9-private.patch =================================================================== --- qtiplot-0.9.8.9-private.patch (rev 0) +++ qtiplot-0.9.8.9-private.patch 2015-05-30 12:30:15 UTC (rev 239912) @@ -0,0 +1,16 @@ +diff -ruN qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h +--- qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h 2010-10-17 09:04:05.000000000 +0200 ++++ qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h 2013-11-01 12:11:36.559973891 +0100 +@@ -67,10 +67,10 @@ + void setWindowName(const QString& name){d_window_name = name;}; + + static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size); ++ void paintEvent(QPaintEvent *e); + + private: + void draw(QPainter *painter, const QRect& r); +- void paintEvent(QPaintEvent *e); + QPixmap d_pix; + //! The file from which the image was loaded. + QString d_file_name; + Added: sip-4.15.patch =================================================================== --- sip-4.15.patch (rev 0) +++ sip-4.15.patch 2015-05-30 12:30:15 UTC (rev 239912) @@ -0,0 +1,32 @@ +--- ./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; + Deleted: sip.patch =================================================================== --- sip.patch 2015-05-30 12:05:07 UTC (rev 239911) +++ sip.patch 2015-05-30 12:30:15 UTC (rev 239912) @@ -1,13 +0,0 @@ ---- qtiplot/src/scripting/scripting.pri.bak 2009-09-09 07:18:51.000000000 +0800 -+++ qtiplot/src/scripting/scripting.pri 2009-11-08 12:45:03.000000000 +0800 -@@ -80,7 +80,9 @@ - $${SIP_DIR}/sipqtiPythonScript.cpp\ - $${SIP_DIR}/sipqtiPythonScripting.cpp\ - $${SIP_DIR}/sipqtiFolder.cpp\ -- $${SIP_DIR}/sipqtiQList.cpp\ -+ $${SIP_DIR}/sipqtiQList0101Folder.cpp \ -+ $${SIP_DIR}/sipqtiQList0101Graph.cpp \ -+ $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp \ - $${SIP_DIR}/sipqtiFit.cpp \ - $${SIP_DIR}/sipqtiExponentialFit.cpp \ - $${SIP_DIR}/sipqtiTwoExpFit.cpp \