5 files changed, 88 insertions, 17 deletions
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD
index 03644f0cf..be97b60dc 100644
--- a/extra/qtiplot/PKGBUILD
+++ b/extra/qtiplot/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 112432 2011-03-04 22:39:07Z eric $
+# $Id: PKGBUILD 131207 2011-07-11 21:16:26Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir.archlinux.org>
 # Contributor: Gergely Imreh <imrehg@gmail.com>
 
 pkgname=qtiplot
-pkgver=0.9.8.2
-pkgrel=6
-pkgdesc="Data analysis and scientific plotting - free clone of Origin"
+pkgver=0.9.8.6
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/qtiplot.html"
-depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat')
+pkgdesc="Data analysis and scientific plotting - free clone of Origin"
+depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' '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
@@ -22,21 +22,32 @@ source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
         build.conf.archlinux
         qwtplot3d_gcc.patch
         qtiplot.xml
-	qtiplot-0.9.7.14-system-liborigin.patch
-	gentoo-fix-origin-build-failure.patch)
-md5sums=('e8335a8760e8c2ac044607d5a4bb80ca' '56bd53f4f1367c285086acb969f13348'\
-         'ad8affbd6f0d5cbdcde46c923ee2668a' '4fc37151dc30d5ca36fd7d891a8bc41b'\
-         'ab02c436ec2c04b1838cb5517383b4eb' '35683f3b32e1edcca0bb02c471d284e9'\
-         'fa7cfc5ba60d28f264ad53869d31fcc8' '642cb38c6579b51b86834c8640130b6f')
-sha1sums=('dd8d1003cee8767d4ba9e616e5263da1302c290d' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'\
-         '4301cb2a36024a10108b689990d28c4fe5c7416e' '7afcdd4eca157f55e3ec4276712c466b3dc05106'\
-         '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' '285f57d865956d93250ec548288c5bface096b6b'\
-         '86899322f259be8594399642170f3f642d7f5f75' '9d6373fd9c0d1061796d1b920981124b6e9a49cf')
+	qtiplot-0.9.8.6-gold.patch
+	qtiplot-0.9.8.6-kde.patch
+	qtiplot-0.9.8.6-tamuanova.patch)
+sha1sums=('e8a5ea1e1fb0e87cf76985f63b25e263b03f5fa9'
+          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
+          '4301cb2a36024a10108b689990d28c4fe5c7416e'
+          'b3af6c866b3e63b537b418b6d00e57ef468f8f2b'
+          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
+          '285f57d865956d93250ec548288c5bface096b6b'
+          'b534a609f317cf3117d6495909854cdacea20124'
+          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
+          '830b518e3ef63625df84363a8047417124f243b0')
+
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/qtiplot-0.9.7.14-system-liborigin.patch"
-  patch -Np0 -i "${srcdir}/gentoo-fix-origin-build-failure.patch"
+
+   # 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
@@ -76,3 +87,5 @@ package() {
   install -D -m644 "${srcdir}/${pkgname}.xml" \
         "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
 }
+
+
diff --git a/extra/qtiplot/build.conf.archlinux b/extra/qtiplot/build.conf.archlinux
index 2cab47f9c..342377578 100644
--- a/extra/qtiplot/build.conf.archlinux
+++ b/extra/qtiplot/build.conf.archlinux
@@ -16,6 +16,8 @@ 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
 
 PYTHON = python2
 LUPDATE = lupdate
diff --git a/extra/qtiplot/qtiplot-0.9.8.6-gold.patch b/extra/qtiplot/qtiplot-0.9.8.6-gold.patch
new file mode 100644
index 000000000..3b6757533
--- /dev/null
+++ b/extra/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/extra/qtiplot/qtiplot-0.9.8.6-kde.patch b/extra/qtiplot/qtiplot-0.9.8.6-kde.patch
new file mode 100644
index 000000000..919ec6cc2
--- /dev/null
+++ b/extra/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/extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
new file mode 100644
index 000000000..1644266d1
--- /dev/null
+++ b/extra/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 ##########