[arch-commits] Commit in qtiplot/repos (25 files)

Ionut Biru ibiru at archlinux.org
Sun Feb 5 06:55:23 EST 2012


    Date: Sunday, February 5, 2012 @ 06:55:22
  Author: ibiru
Revision: 148907

db-move: moved qtiplot from [testing] to [extra] (i686)

Added:
  qtiplot/repos/extra-i686/PKGBUILD
    (from rev 148654, qtiplot/repos/testing-i686/PKGBUILD)
  qtiplot/repos/extra-i686/build.conf.archlinux
    (from rev 148654, qtiplot/repos/testing-i686/build.conf.archlinux)
  qtiplot/repos/extra-i686/qtiplot-0.9.8.6-gold.patch
    (from rev 148654, qtiplot/repos/testing-i686/qtiplot-0.9.8.6-gold.patch)
  qtiplot/repos/extra-i686/qtiplot-0.9.8.6-kde.patch
    (from rev 148654, qtiplot/repos/testing-i686/qtiplot-0.9.8.6-kde.patch)
  qtiplot/repos/extra-i686/qtiplot-0.9.8.6-tamuanova.patch
    (from rev 148654, qtiplot/repos/testing-i686/qtiplot-0.9.8.6-tamuanova.patch)
  qtiplot/repos/extra-i686/qtiplot.desktop
    (from rev 148654, qtiplot/repos/testing-i686/qtiplot.desktop)
  qtiplot/repos/extra-i686/qtiplot.install
    (from rev 148654, qtiplot/repos/testing-i686/qtiplot.install)
  qtiplot/repos/extra-i686/qtiplot.png
    (from rev 148654, qtiplot/repos/testing-i686/qtiplot.png)
  qtiplot/repos/extra-i686/qtiplot.xml
    (from rev 148654, qtiplot/repos/testing-i686/qtiplot.xml)
  qtiplot/repos/extra-i686/qwtplot3d-libpng15.patch
    (from rev 148654, qtiplot/repos/testing-i686/qwtplot3d-libpng15.patch)
  qtiplot/repos/extra-i686/qwtplot3d-qt-4.8.0.patch
    (from rev 148654, qtiplot/repos/testing-i686/qwtplot3d-qt-4.8.0.patch)
  qtiplot/repos/extra-i686/qwtplot3d_gcc.patch
    (from rev 148654, qtiplot/repos/testing-i686/qwtplot3d_gcc.patch)
  qtiplot/repos/extra-i686/sip.patch
    (from rev 148654, qtiplot/repos/testing-i686/sip.patch)
Deleted:
  qtiplot/repos/extra-i686/PKGBUILD
  qtiplot/repos/extra-i686/build.conf.archlinux
  qtiplot/repos/extra-i686/qtiplot-0.9.8.6-gold.patch
  qtiplot/repos/extra-i686/qtiplot-0.9.8.6-kde.patch
  qtiplot/repos/extra-i686/qtiplot-0.9.8.6-tamuanova.patch
  qtiplot/repos/extra-i686/qtiplot.desktop
  qtiplot/repos/extra-i686/qtiplot.install
  qtiplot/repos/extra-i686/qtiplot.png
  qtiplot/repos/extra-i686/qtiplot.xml
  qtiplot/repos/extra-i686/qwtplot3d_gcc.patch
  qtiplot/repos/extra-i686/sip.patch
  qtiplot/repos/testing-i686/

---------------------------------+
 PKGBUILD                        |  186 +++++++++++++++++++-------------------
 build.conf.archlinux            |   63 ++++++------
 qtiplot-0.9.8.6-gold.patch      |   30 +++---
 qtiplot-0.9.8.6-kde.patch       |   30 +++---
 qtiplot-0.9.8.6-tamuanova.patch |   52 +++++-----
 qtiplot.desktop                 |   26 ++---
 qtiplot.install                 |   24 ++--
 qtiplot.xml                     |   34 +++---
 qwtplot3d-libpng15.patch        |   10 ++
 qwtplot3d-qt-4.8.0.patch        |   34 ++++++
 qwtplot3d_gcc.patch             |   18 +--
 sip.patch                       |   26 ++---
 12 files changed, 292 insertions(+), 241 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/PKGBUILD	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,90 +0,0 @@
-# $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.8
-pkgrel=1
-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-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
-makedepends=('pkg-config' 'boost')
-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)
-sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48'
-          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
-          '4301cb2a36024a10108b689990d28c4fe5c7416e'
-          'b3af6c866b3e63b537b418b6d00e57ef468f8f2b'
-          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
-          '285f57d865956d93250ec548288c5bface096b6b'
-          'b534a609f317cf3117d6495909854cdacea20124'
-          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
-          '830b518e3ef63625df84363a8047417124f243b0')
-
-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
-  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"
-}
-
-

Copied: qtiplot/repos/extra-i686/PKGBUILD (from rev 148654, qtiplot/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-05 11:55:22 UTC (rev 148907)
@@ -0,0 +1,96 @@
+# $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.8
+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-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
+makedepends=('pkg-config' 'boost')
+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=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48'
+          '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"
+}
+
+

Deleted: extra-i686/build.conf.archlinux
===================================================================
--- extra-i686/build.conf.archlinux	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/build.conf.archlinux	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,31 +0,0 @@
-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
-
-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
-
-PYTHON = python2
-LUPDATE = lupdate
-LRELEASE = lrelease
-
-SCRIPTING_LANGS += muParser
-SCRIPTING_LANGS += Python
-
-CONFIG          += CustomInstall
-DEFINES         += SCRIPTING_CONSOLE
-

Copied: qtiplot/repos/extra-i686/build.conf.archlinux (from rev 148654, qtiplot/repos/testing-i686/build.conf.archlinux)
===================================================================
--- extra-i686/build.conf.archlinux	                        (rev 0)
+++ extra-i686/build.conf.archlinux	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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
+

Deleted: extra-i686/qtiplot-0.9.8.6-gold.patch
===================================================================
--- extra-i686/qtiplot-0.9.8.6-gold.patch	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/qtiplot-0.9.8.6-gold.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,15 +0,0 @@
- 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/extra-i686/qtiplot-0.9.8.6-gold.patch (from rev 148654, qtiplot/repos/testing-i686/qtiplot-0.9.8.6-gold.patch)
===================================================================
--- extra-i686/qtiplot-0.9.8.6-gold.patch	                        (rev 0)
+++ extra-i686/qtiplot-0.9.8.6-gold.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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 #############################

Deleted: extra-i686/qtiplot-0.9.8.6-kde.patch
===================================================================
--- extra-i686/qtiplot-0.9.8.6-kde.patch	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/qtiplot-0.9.8.6-kde.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,15 +0,0 @@
- 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/extra-i686/qtiplot-0.9.8.6-kde.patch (from rev 148654, qtiplot/repos/testing-i686/qtiplot-0.9.8.6-kde.patch)
===================================================================
--- extra-i686/qtiplot-0.9.8.6-kde.patch	                        (rev 0)
+++ extra-i686/qtiplot-0.9.8.6-kde.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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>

Deleted: extra-i686/qtiplot-0.9.8.6-tamuanova.patch
===================================================================
--- extra-i686/qtiplot-0.9.8.6-tamuanova.patch	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/qtiplot-0.9.8.6-tamuanova.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,26 +0,0 @@
-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/extra-i686/qtiplot-0.9.8.6-tamuanova.patch (from rev 148654, qtiplot/repos/testing-i686/qtiplot-0.9.8.6-tamuanova.patch)
===================================================================
--- extra-i686/qtiplot-0.9.8.6-tamuanova.patch	                        (rev 0)
+++ extra-i686/qtiplot-0.9.8.6-tamuanova.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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 ##########

Deleted: extra-i686/qtiplot.desktop
===================================================================
--- extra-i686/qtiplot.desktop	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/qtiplot.desktop	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,13 +0,0 @@
-[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/extra-i686/qtiplot.desktop (from rev 148654, qtiplot/repos/testing-i686/qtiplot.desktop)
===================================================================
--- extra-i686/qtiplot.desktop	                        (rev 0)
+++ extra-i686/qtiplot.desktop	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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;

Deleted: extra-i686/qtiplot.install
===================================================================
--- extra-i686/qtiplot.install	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/qtiplot.install	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-

Copied: qtiplot/repos/extra-i686/qtiplot.install (from rev 148654, qtiplot/repos/testing-i686/qtiplot.install)
===================================================================
--- extra-i686/qtiplot.install	                        (rev 0)
+++ extra-i686/qtiplot.install	2012-02-05 11:55:22 UTC (rev 148907)
@@ -0,0 +1,12 @@
+post_install() {
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove () {
+  post_install
+}
+

Deleted: extra-i686/qtiplot.png
===================================================================
(Binary files differ)

Copied: qtiplot/repos/extra-i686/qtiplot.png (from rev 148654, qtiplot/repos/testing-i686/qtiplot.png)
===================================================================
(Binary files differ)

Deleted: extra-i686/qtiplot.xml
===================================================================
--- extra-i686/qtiplot.xml	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/qtiplot.xml	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,17 +0,0 @@
-<?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/extra-i686/qtiplot.xml (from rev 148654, qtiplot/repos/testing-i686/qtiplot.xml)
===================================================================
--- extra-i686/qtiplot.xml	                        (rev 0)
+++ extra-i686/qtiplot.xml	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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/extra-i686/qwtplot3d-libpng15.patch (from rev 148654, qtiplot/repos/testing-i686/qwtplot3d-libpng15.patch)
===================================================================
--- extra-i686/qwtplot3d-libpng15.patch	                        (rev 0)
+++ extra-i686/qwtplot3d-libpng15.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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/extra-i686/qwtplot3d-qt-4.8.0.patch (from rev 148654, qtiplot/repos/testing-i686/qwtplot3d-qt-4.8.0.patch)
===================================================================
--- extra-i686/qwtplot3d-qt-4.8.0.patch	                        (rev 0)
+++ extra-i686/qwtplot3d-qt-4.8.0.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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
+ {

Deleted: extra-i686/qwtplot3d_gcc.patch
===================================================================
--- extra-i686/qwtplot3d_gcc.patch	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/qwtplot3d_gcc.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -1,9 +0,0 @@
---- 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/extra-i686/qwtplot3d_gcc.patch (from rev 148654, qtiplot/repos/testing-i686/qwtplot3d_gcc.patch)
===================================================================
--- extra-i686/qwtplot3d_gcc.patch	                        (rev 0)
+++ extra-i686/qwtplot3d_gcc.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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;
+ 

Deleted: extra-i686/sip.patch
===================================================================
--- extra-i686/sip.patch	2012-02-05 11:55:17 UTC (rev 148906)
+++ extra-i686/sip.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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 \

Copied: qtiplot/repos/extra-i686/sip.patch (from rev 148654, qtiplot/repos/testing-i686/sip.patch)
===================================================================
--- extra-i686/sip.patch	                        (rev 0)
+++ extra-i686/sip.patch	2012-02-05 11:55:22 UTC (rev 148907)
@@ -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 \



More information about the arch-commits mailing list