Sat Oct 13 00:57:48 PDT 2012

13 files changed, 290 insertions, 0 deletions

diff --git a/testing/qtiplot/PKGBUILD b/testing/qtiplot/PKGBUILD
new file mode 100644
index 000000000..d4779fcb7
--- /dev/null
+++ b/testing/qtiplot/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 168491 2012-10-12 17:58:46Z andyrtr $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir.archlinux.org>
+# Contributor: Gergely Imreh <imrehg@gmail.com>
+
+pkgname=qtiplot
+pkgver=0.9.8.9
+pkgrel=2
+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://download.berlios.de/qtiplot/qtiplot-${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)
+sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30'
+          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
+          '4301cb2a36024a10108b689990d28c4fe5c7416e'
+          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
+          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
+          '285f57d865956d93250ec548288c5bface096b6b'
+          'b534a609f317cf3117d6495909854cdacea20124'
+          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
+          '830b518e3ef63625df84363a8047417124f243b0'
+          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
+          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
+
+build() {
+  cd "${srcdir}/${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"
+
+   # 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"
+  cd ./3rdparty/qwt
+  qmake
+  make
+
+  # Make qwtplot3d
+  cd ../qwtplot3d
+  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
+  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
+  qmake
+  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 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"
+}
diff --git a/testing/qtiplot/build.conf.archlinux b/testing/qtiplot/build.conf.archlinux
new file mode 100644
index 000000000..7ccded7fa
--- /dev/null
+++ b/testing/qtiplot/build.conf.archlinux
@@ -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
+
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
new file mode 100644
index 000000000..3b6757533
--- /dev/null
+++ b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
@@ -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 #############################
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
new file mode 100644
index 000000000..919ec6cc2
--- /dev/null
+++ b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
@@ -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>
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
new file mode 100644
index 000000000..1644266d1
--- /dev/null
+++ b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
@@ -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 ##########
diff --git a/testing/qtiplot/qtiplot.desktop b/testing/qtiplot/qtiplot.desktop
new file mode 100644
index 000000000..ab64b3852
--- /dev/null
+++ b/testing/qtiplot/qtiplot.desktop
@@ -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;
diff --git a/testing/qtiplot/qtiplot.install b/testing/qtiplot/qtiplot.install
new file mode 100644
index 000000000..66631520d
--- /dev/null
+++ b/testing/qtiplot/qtiplot.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove () {
+  post_install
+}
+
diff --git a/testing/qtiplot/qtiplot.png b/testing/qtiplot/qtiplot.png
new file mode 100644
index 000000000..5b4b87b21
--- /dev/null
+++ b/testing/qtiplot/qtiplot.png
diff --git a/testing/qtiplot/qtiplot.xml b/testing/qtiplot/qtiplot.xml
new file mode 100644
index 000000000..7ad4c4aa0
--- /dev/null
+++ b/testing/qtiplot/qtiplot.xml
@@ -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>
diff --git a/testing/qtiplot/qwtplot3d-libpng15.patch b/testing/qtiplot/qwtplot3d-libpng15.patch
new file mode 100644
index 000000000..828f0c6d8
--- /dev/null
+++ b/testing/qtiplot/qwtplot3d-libpng15.patch
@@ -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
+ 
diff --git a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
new file mode 100644
index 000000000..9d30f6b7b
--- /dev/null
+++ b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
@@ -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
+ {
diff --git a/testing/qtiplot/qwtplot3d_gcc.patch b/testing/qtiplot/qwtplot3d_gcc.patch
new file mode 100644
index 000000000..06aeb50f5
--- /dev/null
+++ b/testing/qtiplot/qwtplot3d_gcc.patch
@@ -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;
+ 
diff --git a/testing/qtiplot/sip.patch b/testing/qtiplot/sip.patch
new file mode 100644
index 000000000..146f4c277
--- /dev/null
+++ b/testing/qtiplot/sip.patch
@@ -0,0 +1,13 @@
+--- 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 \