[arch-commits] Commit in qtiplot/repos (34 files)
Antonio Rojas
arojas at archlinux.org
Sat Feb 20 19:29:41 UTC 2016
Date: Saturday, February 20, 2016 @ 20:29:40
Author: arojas
Revision: 260094
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
qtiplot/repos/staging-i686/
qtiplot/repos/staging-i686/PKGBUILD
(from rev 260091, qtiplot/trunk/PKGBUILD)
qtiplot/repos/staging-i686/build.conf.archlinux
(from rev 260091, qtiplot/trunk/build.conf.archlinux)
qtiplot/repos/staging-i686/pyqt-4.11.patch
(from rev 260091, qtiplot/trunk/pyqt-4.11.patch)
qtiplot/repos/staging-i686/qtiplot-0.9.8.6-gold.patch
(from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-gold.patch)
qtiplot/repos/staging-i686/qtiplot-0.9.8.6-kde.patch
(from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-kde.patch)
qtiplot/repos/staging-i686/qtiplot-0.9.8.6-tamuanova.patch
(from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-tamuanova.patch)
qtiplot/repos/staging-i686/qtiplot-0.9.8.9-private.patch
(from rev 260091, qtiplot/trunk/qtiplot-0.9.8.9-private.patch)
qtiplot/repos/staging-i686/qtiplot-gsl2.patch
(from rev 260091, qtiplot/trunk/qtiplot-gsl2.patch)
qtiplot/repos/staging-i686/qtiplot.desktop
(from rev 260091, qtiplot/trunk/qtiplot.desktop)
qtiplot/repos/staging-i686/qtiplot.install
(from rev 260091, qtiplot/trunk/qtiplot.install)
qtiplot/repos/staging-i686/qtiplot.png
(from rev 260091, qtiplot/trunk/qtiplot.png)
qtiplot/repos/staging-i686/qtiplot.xml
(from rev 260091, qtiplot/trunk/qtiplot.xml)
qtiplot/repos/staging-i686/qwtplot3d-libpng15.patch
(from rev 260091, qtiplot/trunk/qwtplot3d-libpng15.patch)
qtiplot/repos/staging-i686/qwtplot3d-qt-4.8.0.patch
(from rev 260091, qtiplot/trunk/qwtplot3d-qt-4.8.0.patch)
qtiplot/repos/staging-i686/qwtplot3d_gcc.patch
(from rev 260091, qtiplot/trunk/qwtplot3d_gcc.patch)
qtiplot/repos/staging-i686/sip-4.15.patch
(from rev 260091, qtiplot/trunk/sip-4.15.patch)
qtiplot/repos/staging-x86_64/
qtiplot/repos/staging-x86_64/PKGBUILD
(from rev 260091, qtiplot/trunk/PKGBUILD)
qtiplot/repos/staging-x86_64/build.conf.archlinux
(from rev 260091, qtiplot/trunk/build.conf.archlinux)
qtiplot/repos/staging-x86_64/pyqt-4.11.patch
(from rev 260091, qtiplot/trunk/pyqt-4.11.patch)
qtiplot/repos/staging-x86_64/qtiplot-0.9.8.6-gold.patch
(from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-gold.patch)
qtiplot/repos/staging-x86_64/qtiplot-0.9.8.6-kde.patch
(from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-kde.patch)
qtiplot/repos/staging-x86_64/qtiplot-0.9.8.6-tamuanova.patch
(from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-tamuanova.patch)
qtiplot/repos/staging-x86_64/qtiplot-0.9.8.9-private.patch
(from rev 260091, qtiplot/trunk/qtiplot-0.9.8.9-private.patch)
qtiplot/repos/staging-x86_64/qtiplot-gsl2.patch
(from rev 260091, qtiplot/trunk/qtiplot-gsl2.patch)
qtiplot/repos/staging-x86_64/qtiplot.desktop
(from rev 260091, qtiplot/trunk/qtiplot.desktop)
qtiplot/repos/staging-x86_64/qtiplot.install
(from rev 260091, qtiplot/trunk/qtiplot.install)
qtiplot/repos/staging-x86_64/qtiplot.png
(from rev 260092, qtiplot/trunk/qtiplot.png)
qtiplot/repos/staging-x86_64/qtiplot.xml
(from rev 260092, qtiplot/trunk/qtiplot.xml)
qtiplot/repos/staging-x86_64/qwtplot3d-libpng15.patch
(from rev 260092, qtiplot/trunk/qwtplot3d-libpng15.patch)
qtiplot/repos/staging-x86_64/qwtplot3d-qt-4.8.0.patch
(from rev 260093, qtiplot/trunk/qwtplot3d-qt-4.8.0.patch)
qtiplot/repos/staging-x86_64/qwtplot3d_gcc.patch
(from rev 260093, qtiplot/trunk/qwtplot3d_gcc.patch)
qtiplot/repos/staging-x86_64/sip-4.15.patch
(from rev 260093, qtiplot/trunk/sip-4.15.patch)
------------------------------------------------+
staging-i686/PKGBUILD | 109 +++++++++++++++++++++++
staging-i686/build.conf.archlinux | 32 ++++++
staging-i686/pyqt-4.11.patch | 33 ++++++
staging-i686/qtiplot-0.9.8.6-gold.patch | 15 +++
staging-i686/qtiplot-0.9.8.6-kde.patch | 15 +++
staging-i686/qtiplot-0.9.8.6-tamuanova.patch | 26 +++++
staging-i686/qtiplot-0.9.8.9-private.patch | 16 +++
staging-i686/qtiplot-gsl2.patch | 34 +++++++
staging-i686/qtiplot.desktop | 13 ++
staging-i686/qtiplot.install | 12 ++
staging-i686/qtiplot.xml | 17 +++
staging-i686/qwtplot3d-libpng15.patch | 10 ++
staging-i686/qwtplot3d-qt-4.8.0.patch | 34 +++++++
staging-i686/qwtplot3d_gcc.patch | 9 +
staging-i686/sip-4.15.patch | 32 ++++++
staging-x86_64/PKGBUILD | 109 +++++++++++++++++++++++
staging-x86_64/build.conf.archlinux | 32 ++++++
staging-x86_64/pyqt-4.11.patch | 33 ++++++
staging-x86_64/qtiplot-0.9.8.6-gold.patch | 15 +++
staging-x86_64/qtiplot-0.9.8.6-kde.patch | 15 +++
staging-x86_64/qtiplot-0.9.8.6-tamuanova.patch | 26 +++++
staging-x86_64/qtiplot-0.9.8.9-private.patch | 16 +++
staging-x86_64/qtiplot-gsl2.patch | 34 +++++++
staging-x86_64/qtiplot.desktop | 13 ++
staging-x86_64/qtiplot.install | 12 ++
staging-x86_64/qtiplot.xml | 17 +++
staging-x86_64/qwtplot3d-libpng15.patch | 10 ++
staging-x86_64/qwtplot3d-qt-4.8.0.patch | 34 +++++++
staging-x86_64/qwtplot3d_gcc.patch | 9 +
staging-x86_64/sip-4.15.patch | 32 ++++++
30 files changed, 814 insertions(+)
Copied: qtiplot/repos/staging-i686/PKGBUILD (from rev 260091, qtiplot/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,109 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir.archlinux.org>
+# Contributor: Gergely Imreh <imrehg at gmail.com>
+
+pkgname=qtiplot
+pkgver=0.9.8.9
+pkgrel=8
+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')
+# build against qwtplot3d provided in the package ...
+# build against qwt provided in the package ...
+# as systemwide one doesn't provide all needed functions
+makedepends=('pkg-config' 'boost' 'mesa')
+license=('GPL2')
+install=${pkgname}.install
+source=(http://downloads.sourceforge.net/project/qtiplot.berlios/$pkgname-$pkgver.tar.bz2
+ $pkgname.desktop
+ $pkgname.png
+ build.conf.archlinux
+ qwtplot3d_gcc.patch
+ qtiplot.xml
+ qtiplot-0.9.8.6-gold.patch
+ qtiplot-0.9.8.6-kde.patch
+ 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'
+ '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
+ '285f57d865956d93250ec548288c5bface096b6b'
+ 'b534a609f317cf3117d6495909854cdacea20124'
+ 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
+ '830b518e3ef63625df84363a8047417124f243b0'
+ '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
+ '4a45ee21f028f34da75d83c0d3e1d08c5f928892'
+ 'cef3bca1c15be01ca8a8c0d75d557027d723286c'
+ 'c5e9d075ce6a73c473e52a197d9919116b2cece5'
+ '55a380bc61819258e0c11ccb42f9057e31d4881e'
+ 'bcd28fda51444227e77638af1989a6a40e9f516c')
+
+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
+ patch -Np1 -i "$srcdir"/qtiplot-gsl2.patch
+
+ # build also static qwtplot3d lib
+ echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
+
+ # install build configuration file
+ install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
+
+ # Make qwt
+ sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
+ patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}/3rdparty/qwt
+ qmake-qt4
+ make
+
+ # Make qwtplot3d
+ cd ../qwtplot3d
+ patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
+ patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
+ qmake-qt4
+ make
+
+ # Make qtiplot
+ cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
+
+ # fix stuff
+ sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
+ sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp
+ sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
+
+ qmake-qt4 qtiplot.pro QMAKESPEC=linux-g++
+ make QTDIR=/usr/ QMAKESPEC=linux-g++
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
+
+ INSTALL_ROOT="${pkgdir}" make install
+
+ # make it nice:
+ install -D -m644 "${srcdir}/${pkgname}.png" \
+ "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ install -D -m644 "${srcdir}/${pkgname}.desktop" \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -D -m644 "${srcdir}/${pkgname}.xml" \
+ "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
+}
Copied: qtiplot/repos/staging-i686/build.conf.archlinux (from rev 260091, qtiplot/trunk/build.conf.archlinux)
===================================================================
--- staging-i686/build.conf.archlinux (rev 0)
+++ staging-i686/build.conf.archlinux 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,32 @@
+isEmpty( QTI_ROOT ) {
+ message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+}
+
+SYS_INCLUDEPATH = /usr/include
+SYS_LIBS = -L/usr/lib -lGLU
+
+MUPARSER_LIBS = -lmuparser
+GSL_LIBS = -lgsl -lgslcblas
+BOOST_INCLUDEPATH = /usr/include/boost
+BOOST_LIBS = -lboost_date_time -lboost_thread
+QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
+QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
+QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
+LIB_ORIGIN_LIBS = -lorigin2
+QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
+TAMUANOVA_LIBS = -ltamuanova
+TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
+LIBPNG_LIBS = -lpng
+
+PYTHON = python2
+LUPDATE = lupdate
+LRELEASE = lrelease
+
+SCRIPTING_LANGS += muParser
+SCRIPTING_LANGS += Python
+
+CONFIG += CustomInstall
+DEFINES += SCRIPTING_CONSOLE
+
Copied: qtiplot/repos/staging-i686/pyqt-4.11.patch (from rev 260091, qtiplot/trunk/pyqt-4.11.patch)
===================================================================
--- staging-i686/pyqt-4.11.patch (rev 0)
+++ staging-i686/pyqt-4.11.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -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]))
+
Copied: qtiplot/repos/staging-i686/qtiplot-0.9.8.6-gold.patch (from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-gold.patch)
===================================================================
--- staging-i686/qtiplot-0.9.8.6-gold.patch (rev 0)
+++ staging-i686/qtiplot-0.9.8.6-gold.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,15 @@
+ qtiplot/qtiplot.pro | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 99e0e36..b7cf373 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS
+ LIBS += $$QWT_LIBS
+ LIBS += $$QWT3D_LIBS
+ LIBS += $$GSL_LIBS
++LIBS += -lz
+
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
Copied: qtiplot/repos/staging-i686/qtiplot-0.9.8.6-kde.patch (from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-kde.patch)
===================================================================
--- staging-i686/qtiplot-0.9.8.6-kde.patch (rev 0)
+++ staging-i686/qtiplot-0.9.8.6-kde.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,15 @@
+ qtiplot/src/plot2D/Graph.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
+index 626172a..d4eab1b 100755
+--- a/qtiplot/src/plot2D/Graph.cpp
++++ b/qtiplot/src/plot2D/Graph.cpp
+@@ -73,6 +73,7 @@
+ #include <PatternBox.h>
+ #include <SymbolBox.h>
+
++#include <QPaintEngine>
+ #include <QApplication>
+ #include <QBitmap>
+ #include <QClipboard>
Copied: qtiplot/repos/staging-i686/qtiplot-0.9.8.6-tamuanova.patch (from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-tamuanova.patch)
===================================================================
--- staging-i686/qtiplot-0.9.8.6-tamuanova.patch (rev 0)
+++ staging-i686/qtiplot-0.9.8.6-tamuanova.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,26 @@
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 95a5f0c..72e99ab 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
+ !isEmpty(TAMUANOVA_LIBS) {
+ DEFINES += HAVE_TAMUANOVA
+ INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
+- #LIBS += $$TAMUANOVA_LIBS
+-
+- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
+- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
+- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
++ LIBS += $$TAMUANOVA_LIBS
+ }
+
+ ###############################################################
+
+ # At the very end: add global include- and lib path
+-#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
+-#unix:LIBS += $$SYS_LIBS
++unix:INCLUDEPATH += $$SYS_INCLUDEPATH
++unix:LIBS += $$SYS_LIBS
+
+ ###############################################################
+ ############### Building QtiPlot as a browser plugin ##########
Copied: qtiplot/repos/staging-i686/qtiplot-0.9.8.9-private.patch (from rev 260091, qtiplot/trunk/qtiplot-0.9.8.9-private.patch)
===================================================================
--- staging-i686/qtiplot-0.9.8.9-private.patch (rev 0)
+++ staging-i686/qtiplot-0.9.8.9-private.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -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;
+
Copied: qtiplot/repos/staging-i686/qtiplot-gsl2.patch (from rev 260091, qtiplot/trunk/qtiplot-gsl2.patch)
===================================================================
--- staging-i686/qtiplot-gsl2.patch (rev 0)
+++ staging-i686/qtiplot-gsl2.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,34 @@
+Description: adoptation to gsl2.
+Author: Damir Islamov <damir at secretlaboratory.ru>
+Last-Update: 2015-12-04
+
+--- a/qtiplot/src/analysis/Fit.cpp
++++ b/qtiplot/src/analysis/Fit.cpp
+@@ -126,10 +126,12 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+ break;
+ }
+ }
+-
++ gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
+ if (status){
+- gsl_multifit_covar (s->J, 0.0, covar);
++ gsl_multifit_fdfsolver_jac(s, J);
++ gsl_multifit_covar (J, 0.0, covar);
+ iterations = 0;
++ gsl_matrix_free (J);
+ return s;
+ }
+
+@@ -154,9 +156,9 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+
+ status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
+ } while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
+-
+- gsl_multifit_covar (s->J, 0.0, covar);
+-
++ gsl_multifit_fdfsolver_jac(s, J);
++ gsl_multifit_covar (J, 0.0, covar);
++ gsl_matrix_free (J);
+ iterations = iter;
+ return s;
+ }
Copied: qtiplot/repos/staging-i686/qtiplot.desktop (from rev 260091, qtiplot/trunk/qtiplot.desktop)
===================================================================
--- staging-i686/qtiplot.desktop (rev 0)
+++ staging-i686/qtiplot.desktop 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=qtiplot
+Comment=An application for plotting and analysis of data sets and functions
+Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen
+Terminal=false
+Name=QtiPlot
+Protocols=file
+Icon=/usr/share/pixmaps/qtiplot.png
+# Categories=QT;KDE;Science;Utility;X-KDE-More
+# Categories=Qt;KDE;Math;Education
+Categories=Science;X-Plotting;
Copied: qtiplot/repos/staging-i686/qtiplot.install (from rev 260091, qtiplot/trunk/qtiplot.install)
===================================================================
--- staging-i686/qtiplot.install (rev 0)
+++ staging-i686/qtiplot.install 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove () {
+ post_install
+}
+
Copied: qtiplot/repos/staging-i686/qtiplot.png (from rev 260091, qtiplot/trunk/qtiplot.png)
===================================================================
(Binary files differ)
Copied: qtiplot/repos/staging-i686/qtiplot.xml (from rev 260091, qtiplot/trunk/qtiplot.xml)
===================================================================
--- staging-i686/qtiplot.xml (rev 0)
+++ staging-i686/qtiplot.xml 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-qtiplot-project">
+ <sub-class-of type="text/plain"/>
+ <comment>QtiPlot project file</comment>
+ <glob pattern="*.qti" />
+ </mime-type>
+ <mime-type type="application/x-qtiplot-project-compressed">
+ <comment>Compressed QtiPlot project file</comment>
+ <glob pattern="*.qti.gz" />
+ </mime-type>
+ <mime-type type="application/x-qtiplot-project-backup">
+ <sub-class-of type="text/plain"/>
+ <comment>QtiPlot project file backup</comment>
+ <glob pattern="*.qti~" />
+ </mime-type>
+</mime-info>
Copied: qtiplot/repos/staging-i686/qwtplot3d-libpng15.patch (from rev 260091, qtiplot/trunk/qwtplot3d-libpng15.patch)
===================================================================
--- staging-i686/qwtplot3d-libpng15.patch (rev 0)
+++ staging-i686/qwtplot3d-libpng15.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,10 @@
+--- 3rdparty/gl2ps/gl2ps.c.orig 2012-01-29 18:15:34.000000000 -0500
++++ 3rdparty/gl2ps/gl2ps.c 2012-01-29 18:16:08.000000000 -0500
+@@ -47,6 +47,7 @@
+ #endif
+
+ #if defined(GL2PS_HAVE_LIBPNG)
++#include <zlib.h>
+ #include <png.h>
+ #endif
+
Copied: qtiplot/repos/staging-i686/qwtplot3d-qt-4.8.0.patch (from rev 260091, qtiplot/trunk/qwtplot3d-qt-4.8.0.patch)
===================================================================
--- staging-i686/qwtplot3d-qt-4.8.0.patch (rev 0)
+++ staging-i686/qwtplot3d-qt-4.8.0.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,34 @@
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:58:30.000000000 -0500
+@@ -2,12 +2,7 @@
+ #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:57:21.000000000 -0500
+@@ -2,11 +2,8 @@
+ #define __openglhelper_2003_06_06_15_49__
+
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+
+ namespace Qwt3D
+ {
Copied: qtiplot/repos/staging-i686/qwtplot3d_gcc.patch (from rev 260091, qtiplot/trunk/qwtplot3d_gcc.patch)
===================================================================
--- staging-i686/qwtplot3d_gcc.patch (rev 0)
+++ staging-i686/qwtplot3d_gcc.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,9 @@
+--- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700
++++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700
+@@ -1,5 +1,6 @@
+ #include "qwt3d_surfaceplot.h"
+ #include "qwt3d_function.h"
++#include <cstdio>
+
+ using namespace Qwt3D;
+
Copied: qtiplot/repos/staging-i686/sip-4.15.patch (from rev 260091, qtiplot/trunk/sip-4.15.patch)
===================================================================
--- staging-i686/sip-4.15.patch (rev 0)
+++ staging-i686/sip-4.15.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -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;
+
Copied: qtiplot/repos/staging-x86_64/PKGBUILD (from rev 260091, qtiplot/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,109 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir.archlinux.org>
+# Contributor: Gergely Imreh <imrehg at gmail.com>
+
+pkgname=qtiplot
+pkgver=0.9.8.9
+pkgrel=8
+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')
+# build against qwtplot3d provided in the package ...
+# build against qwt provided in the package ...
+# as systemwide one doesn't provide all needed functions
+makedepends=('pkg-config' 'boost' 'mesa')
+license=('GPL2')
+install=${pkgname}.install
+source=(http://downloads.sourceforge.net/project/qtiplot.berlios/$pkgname-$pkgver.tar.bz2
+ $pkgname.desktop
+ $pkgname.png
+ build.conf.archlinux
+ qwtplot3d_gcc.patch
+ qtiplot.xml
+ qtiplot-0.9.8.6-gold.patch
+ qtiplot-0.9.8.6-kde.patch
+ 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'
+ '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
+ '285f57d865956d93250ec548288c5bface096b6b'
+ 'b534a609f317cf3117d6495909854cdacea20124'
+ 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
+ '830b518e3ef63625df84363a8047417124f243b0'
+ '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
+ '4a45ee21f028f34da75d83c0d3e1d08c5f928892'
+ 'cef3bca1c15be01ca8a8c0d75d557027d723286c'
+ 'c5e9d075ce6a73c473e52a197d9919116b2cece5'
+ '55a380bc61819258e0c11ccb42f9057e31d4881e'
+ 'bcd28fda51444227e77638af1989a6a40e9f516c')
+
+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
+ patch -Np1 -i "$srcdir"/qtiplot-gsl2.patch
+
+ # build also static qwtplot3d lib
+ echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
+
+ # install build configuration file
+ install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
+
+ # Make qwt
+ sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
+ patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}/3rdparty/qwt
+ qmake-qt4
+ make
+
+ # Make qwtplot3d
+ cd ../qwtplot3d
+ patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
+ patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
+ qmake-qt4
+ make
+
+ # Make qtiplot
+ cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
+
+ # fix stuff
+ sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
+ sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp
+ sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
+
+ qmake-qt4 qtiplot.pro QMAKESPEC=linux-g++
+ make QTDIR=/usr/ QMAKESPEC=linux-g++
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
+
+ INSTALL_ROOT="${pkgdir}" make install
+
+ # make it nice:
+ install -D -m644 "${srcdir}/${pkgname}.png" \
+ "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ install -D -m644 "${srcdir}/${pkgname}.desktop" \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -D -m644 "${srcdir}/${pkgname}.xml" \
+ "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
+}
Copied: qtiplot/repos/staging-x86_64/build.conf.archlinux (from rev 260091, qtiplot/trunk/build.conf.archlinux)
===================================================================
--- staging-x86_64/build.conf.archlinux (rev 0)
+++ staging-x86_64/build.conf.archlinux 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,32 @@
+isEmpty( QTI_ROOT ) {
+ message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+}
+
+SYS_INCLUDEPATH = /usr/include
+SYS_LIBS = -L/usr/lib -lGLU
+
+MUPARSER_LIBS = -lmuparser
+GSL_LIBS = -lgsl -lgslcblas
+BOOST_INCLUDEPATH = /usr/include/boost
+BOOST_LIBS = -lboost_date_time -lboost_thread
+QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
+QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
+QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
+LIB_ORIGIN_LIBS = -lorigin2
+QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
+TAMUANOVA_LIBS = -ltamuanova
+TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
+LIBPNG_LIBS = -lpng
+
+PYTHON = python2
+LUPDATE = lupdate
+LRELEASE = lrelease
+
+SCRIPTING_LANGS += muParser
+SCRIPTING_LANGS += Python
+
+CONFIG += CustomInstall
+DEFINES += SCRIPTING_CONSOLE
+
Copied: qtiplot/repos/staging-x86_64/pyqt-4.11.patch (from rev 260091, qtiplot/trunk/pyqt-4.11.patch)
===================================================================
--- staging-x86_64/pyqt-4.11.patch (rev 0)
+++ staging-x86_64/pyqt-4.11.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -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]))
+
Copied: qtiplot/repos/staging-x86_64/qtiplot-0.9.8.6-gold.patch (from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-gold.patch)
===================================================================
--- staging-x86_64/qtiplot-0.9.8.6-gold.patch (rev 0)
+++ staging-x86_64/qtiplot-0.9.8.6-gold.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,15 @@
+ qtiplot/qtiplot.pro | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 99e0e36..b7cf373 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS
+ LIBS += $$QWT_LIBS
+ LIBS += $$QWT3D_LIBS
+ LIBS += $$GSL_LIBS
++LIBS += -lz
+
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
Copied: qtiplot/repos/staging-x86_64/qtiplot-0.9.8.6-kde.patch (from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-kde.patch)
===================================================================
--- staging-x86_64/qtiplot-0.9.8.6-kde.patch (rev 0)
+++ staging-x86_64/qtiplot-0.9.8.6-kde.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,15 @@
+ qtiplot/src/plot2D/Graph.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
+index 626172a..d4eab1b 100755
+--- a/qtiplot/src/plot2D/Graph.cpp
++++ b/qtiplot/src/plot2D/Graph.cpp
+@@ -73,6 +73,7 @@
+ #include <PatternBox.h>
+ #include <SymbolBox.h>
+
++#include <QPaintEngine>
+ #include <QApplication>
+ #include <QBitmap>
+ #include <QClipboard>
Copied: qtiplot/repos/staging-x86_64/qtiplot-0.9.8.6-tamuanova.patch (from rev 260091, qtiplot/trunk/qtiplot-0.9.8.6-tamuanova.patch)
===================================================================
--- staging-x86_64/qtiplot-0.9.8.6-tamuanova.patch (rev 0)
+++ staging-x86_64/qtiplot-0.9.8.6-tamuanova.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,26 @@
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 95a5f0c..72e99ab 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
+ !isEmpty(TAMUANOVA_LIBS) {
+ DEFINES += HAVE_TAMUANOVA
+ INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
+- #LIBS += $$TAMUANOVA_LIBS
+-
+- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
+- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
+- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
++ LIBS += $$TAMUANOVA_LIBS
+ }
+
+ ###############################################################
+
+ # At the very end: add global include- and lib path
+-#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
+-#unix:LIBS += $$SYS_LIBS
++unix:INCLUDEPATH += $$SYS_INCLUDEPATH
++unix:LIBS += $$SYS_LIBS
+
+ ###############################################################
+ ############### Building QtiPlot as a browser plugin ##########
Copied: qtiplot/repos/staging-x86_64/qtiplot-0.9.8.9-private.patch (from rev 260091, qtiplot/trunk/qtiplot-0.9.8.9-private.patch)
===================================================================
--- staging-x86_64/qtiplot-0.9.8.9-private.patch (rev 0)
+++ staging-x86_64/qtiplot-0.9.8.9-private.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -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;
+
Copied: qtiplot/repos/staging-x86_64/qtiplot-gsl2.patch (from rev 260091, qtiplot/trunk/qtiplot-gsl2.patch)
===================================================================
--- staging-x86_64/qtiplot-gsl2.patch (rev 0)
+++ staging-x86_64/qtiplot-gsl2.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,34 @@
+Description: adoptation to gsl2.
+Author: Damir Islamov <damir at secretlaboratory.ru>
+Last-Update: 2015-12-04
+
+--- a/qtiplot/src/analysis/Fit.cpp
++++ b/qtiplot/src/analysis/Fit.cpp
+@@ -126,10 +126,12 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+ break;
+ }
+ }
+-
++ gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
+ if (status){
+- gsl_multifit_covar (s->J, 0.0, covar);
++ gsl_multifit_fdfsolver_jac(s, J);
++ gsl_multifit_covar (J, 0.0, covar);
+ iterations = 0;
++ gsl_matrix_free (J);
+ return s;
+ }
+
+@@ -154,9 +156,9 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+
+ status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
+ } while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
+-
+- gsl_multifit_covar (s->J, 0.0, covar);
+-
++ gsl_multifit_fdfsolver_jac(s, J);
++ gsl_multifit_covar (J, 0.0, covar);
++ gsl_matrix_free (J);
+ iterations = iter;
+ return s;
+ }
Copied: qtiplot/repos/staging-x86_64/qtiplot.desktop (from rev 260091, qtiplot/trunk/qtiplot.desktop)
===================================================================
--- staging-x86_64/qtiplot.desktop (rev 0)
+++ staging-x86_64/qtiplot.desktop 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=qtiplot
+Comment=An application for plotting and analysis of data sets and functions
+Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen
+Terminal=false
+Name=QtiPlot
+Protocols=file
+Icon=/usr/share/pixmaps/qtiplot.png
+# Categories=QT;KDE;Science;Utility;X-KDE-More
+# Categories=Qt;KDE;Math;Education
+Categories=Science;X-Plotting;
Copied: qtiplot/repos/staging-x86_64/qtiplot.install (from rev 260091, qtiplot/trunk/qtiplot.install)
===================================================================
--- staging-x86_64/qtiplot.install (rev 0)
+++ staging-x86_64/qtiplot.install 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove () {
+ post_install
+}
+
Copied: qtiplot/repos/staging-x86_64/qtiplot.png (from rev 260092, qtiplot/trunk/qtiplot.png)
===================================================================
(Binary files differ)
Copied: qtiplot/repos/staging-x86_64/qtiplot.xml (from rev 260092, qtiplot/trunk/qtiplot.xml)
===================================================================
--- staging-x86_64/qtiplot.xml (rev 0)
+++ staging-x86_64/qtiplot.xml 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-qtiplot-project">
+ <sub-class-of type="text/plain"/>
+ <comment>QtiPlot project file</comment>
+ <glob pattern="*.qti" />
+ </mime-type>
+ <mime-type type="application/x-qtiplot-project-compressed">
+ <comment>Compressed QtiPlot project file</comment>
+ <glob pattern="*.qti.gz" />
+ </mime-type>
+ <mime-type type="application/x-qtiplot-project-backup">
+ <sub-class-of type="text/plain"/>
+ <comment>QtiPlot project file backup</comment>
+ <glob pattern="*.qti~" />
+ </mime-type>
+</mime-info>
Copied: qtiplot/repos/staging-x86_64/qwtplot3d-libpng15.patch (from rev 260092, qtiplot/trunk/qwtplot3d-libpng15.patch)
===================================================================
--- staging-x86_64/qwtplot3d-libpng15.patch (rev 0)
+++ staging-x86_64/qwtplot3d-libpng15.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,10 @@
+--- 3rdparty/gl2ps/gl2ps.c.orig 2012-01-29 18:15:34.000000000 -0500
++++ 3rdparty/gl2ps/gl2ps.c 2012-01-29 18:16:08.000000000 -0500
+@@ -47,6 +47,7 @@
+ #endif
+
+ #if defined(GL2PS_HAVE_LIBPNG)
++#include <zlib.h>
+ #include <png.h>
+ #endif
+
Copied: qtiplot/repos/staging-x86_64/qwtplot3d-qt-4.8.0.patch (from rev 260093, qtiplot/trunk/qwtplot3d-qt-4.8.0.patch)
===================================================================
--- staging-x86_64/qwtplot3d-qt-4.8.0.patch (rev 0)
+++ staging-x86_64/qwtplot3d-qt-4.8.0.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,34 @@
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:58:30.000000000 -0500
+@@ -2,12 +2,7 @@
+ #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:57:21.000000000 -0500
+@@ -2,11 +2,8 @@
+ #define __openglhelper_2003_06_06_15_49__
+
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+
+ namespace Qwt3D
+ {
Copied: qtiplot/repos/staging-x86_64/qwtplot3d_gcc.patch (from rev 260093, qtiplot/trunk/qwtplot3d_gcc.patch)
===================================================================
--- staging-x86_64/qwtplot3d_gcc.patch (rev 0)
+++ staging-x86_64/qwtplot3d_gcc.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -0,0 +1,9 @@
+--- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700
++++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700
+@@ -1,5 +1,6 @@
+ #include "qwt3d_surfaceplot.h"
+ #include "qwt3d_function.h"
++#include <cstdio>
+
+ using namespace Qwt3D;
+
Copied: qtiplot/repos/staging-x86_64/sip-4.15.patch (from rev 260093, qtiplot/trunk/sip-4.15.patch)
===================================================================
--- staging-x86_64/sip-4.15.patch (rev 0)
+++ staging-x86_64/sip-4.15.patch 2016-02-20 19:29:40 UTC (rev 260094)
@@ -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;
+
More information about the arch-commits
mailing list