[arch-commits] Commit in qtiplot/trunk (7 files)
Ronald van Haren
ronald at archlinux.org
Mon Jul 11 21:16:26 UTC 2011
Date: Monday, July 11, 2011 @ 17:16:26
Author: ronald
Revision: 131207
add/remove patches and stuff for the 0.9.8.6 release
Added:
qtiplot/trunk/qtiplot-0.9.8.6-gold.patch
qtiplot/trunk/qtiplot-0.9.8.6-kde.patch
qtiplot/trunk/qtiplot-0.9.8.6-tamuanova.patch
Modified:
qtiplot/trunk/PKGBUILD
qtiplot/trunk/build.conf.archlinux
Deleted:
qtiplot/trunk/gentoo-fix-origin-build-failure.patch
qtiplot/trunk/qtiplot-0.9.7.14-system-liborigin.patch
-----------------------------------------+
PKGBUILD | 45 ++++++++-----
build.conf.archlinux | 2
gentoo-fix-origin-build-failure.patch | 72 ---------------------
qtiplot-0.9.7.14-system-liborigin.patch | 101 ------------------------------
qtiplot-0.9.8.6-gold.patch | 15 ++++
qtiplot-0.9.8.6-kde.patch | 15 ++++
qtiplot-0.9.8.6-tamuanova.patch | 26 +++++++
7 files changed, 87 insertions(+), 189 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-07-11 21:05:37 UTC (rev 131206)
+++ PKGBUILD 2011-07-11 21:16:26 UTC (rev 131207)
@@ -4,12 +4,12 @@
# Contributor: Gergely Imreh <imrehg at 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 @@
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 @@
install -D -m644 "${srcdir}/${pkgname}.xml" \
"${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
}
+
+
Modified: build.conf.archlinux
===================================================================
--- build.conf.archlinux 2011-07-11 21:05:37 UTC (rev 131206)
+++ build.conf.archlinux 2011-07-11 21:16:26 UTC (rev 131207)
@@ -16,6 +16,8 @@
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
Deleted: gentoo-fix-origin-build-failure.patch
===================================================================
--- gentoo-fix-origin-build-failure.patch 2011-07-11 21:05:37 UTC (rev 131206)
+++ gentoo-fix-origin-build-failure.patch 2011-07-11 21:16:26 UTC (rev 131207)
@@ -1,72 +0,0 @@
---- qtiplot/src/origin/importOPJ.cpp 2010-09-01 11:07:38 +0000
-+++ qtiplot/src/origin/importOPJ.cpp 2010-09-07 10:12:30 +0000
-@@ -473,6 +473,8 @@
- }
- table->setDayFormat(format, j);
- break;
-+ default:
-+ break;
- }
- table->freeMemory();
- }
-@@ -720,7 +722,6 @@
- bkg.setAlpha(0);
- graph->setCanvasBackground(bkg);
-
-- int auto_color = -1;
- int style = 0;
- bool matrixImage = false;
- for(unsigned int c = 0; c < layer.curves.size(); ++c){
-@@ -1461,7 +1462,7 @@
-
- if (boxWhiskersPlot){
- QStringList curveNames;
-- for (unsigned int i = 0; i < graph->curveCount(); i++){
-+ for (int i = 0; i < graph->curveCount(); i++){
- BoxCurve *box = (BoxCurve *)graph->curve(i);
- if (!box || box->type() != Graph::Box)
- continue;
-@@ -1659,7 +1660,6 @@
- for(unsigned int c = 0; c < layer.curves.size(); ++c){
- Origin::GraphCurve& _curve = layer.curves[c];
- QString data(_curve.dataName.c_str());
-- int color = 0;
- double fFontScaleFactor = 2.0;
- switch(_curve.type){
- case Origin::GraphCurve::Line3D:
-@@ -1809,7 +1809,6 @@
- }
-
- QStringList formulas;
-- double start, end;
-
- plot->showColorLegend(false);
- plot->setFramed();
-@@ -1951,8 +1950,8 @@
-
- QList <PieLabel *> pieTexts = p->labelsList();
- QFont font(mw->plotLegendFont);
-- unsigned int lsize = layer.pieTexts.size();
-- for(unsigned int i = 0; i < lsize && i < pieTexts.size(); ++i){
-+ int lsize = layer.pieTexts.size();
-+ for(int i = 0; i < lsize && i < pieTexts.size(); ++i){
- Origin::TextBox text = layer.pieTexts[lsize - i - 1];
- font.setPointSizeF(text.fontSize*fFontScaleFactor);
- QFontMetrics fm(font, graph);
-@@ -2159,12 +2158,12 @@
- line.replace("&lbracket;", "(");
- line.replace("&rbracket;", ")");
-
-- QRegExp fontModifier("\p(\\d)+\\(.*\\)");//remove \p163(...) like tags
-+ QRegExp fontModifier("\\\\p(\\d)+\\(.*\\)");//remove \p163(...) like tags
- int index = line.indexOf(fontModifier);
- while (index >= 0){
- int pos1 = line.indexOf("(", index + 2) + 1;
- int length = fontModifier.matchedLength();
-- line = line.mid(pos1, length - pos1);
-+ line = line.mid(pos1, length - pos1 - 1);
- index = line.indexOf(fontModifier, index + length);
- }
-
-
-
Deleted: qtiplot-0.9.7.14-system-liborigin.patch
===================================================================
--- qtiplot-0.9.7.14-system-liborigin.patch 2011-07-11 21:05:37 UTC (rev 131206)
+++ qtiplot-0.9.7.14-system-liborigin.patch 2011-07-11 21:16:26 UTC (rev 131207)
@@ -1,101 +0,0 @@
-=== modified file 'build.conf.example'
---- build.conf.example 2010-04-22 18:57:40 +0000
-+++ build.conf.example 2010-04-22 18:58:06 +0000
-@@ -118,6 +118,14 @@
- EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
-
- ##########################################################
-+## liborigin - keep commented if you wish to use local copy
-+# http://sourceforge.net/projects/liborigin/
-+##########################################################
-+
-+# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-+# LIB_ORIGIN_LIBS = -lorigin2
-+
-+##########################################################
- ## python - only used if python is needed
- ##########################################################
-
-
-=== modified file 'qtiplot/qtiplot.pro'
---- qtiplot/qtiplot.pro 2010-04-22 18:57:40 +0000
-+++ qtiplot/qtiplot.pro 2010-04-22 19:08:57 +0000
-@@ -16,6 +16,7 @@
- INCLUDEPATH += $$QWT_INCLUDEPATH
- INCLUDEPATH += $$QWT3D_INCLUDEPATH
- INCLUDEPATH += $$GSL_INCLUDEPATH
-+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH
-
- # configurable libs
- LIBS += $$MUPARSER_LIBS
-@@ -23,6 +24,7 @@
- LIBS += $$QWT3D_LIBS
- LIBS += $$QTEXENGINE_LIBS
- LIBS += $$GSL_LIBS
-+LIBS += $$LIB_ORIGIN_LIBS
-
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
-@@ -150,6 +152,10 @@
- SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
- }
-
-+isEmpty(LIB_ORIGIN_LIBS) {
-+ INCLUDEPATH += ../3rdparty/liborigin
-+}
-+
- ###############################################################
- ##################### Scripting: PYTHON + SIP + PyQT ##########
- ###############################################################
-
-=== modified file 'qtiplot/src/origin/origin.pri'
---- qtiplot/src/origin/origin.pri 2010-04-22 17:58:49 +0000
-+++ qtiplot/src/origin/origin.pri 2010-04-22 19:08:15 +0000
-@@ -4,24 +4,28 @@
- INCLUDEPATH += src/origin/
-
- HEADERS += src/origin/importOPJ.h
--HEADERS += ../3rdparty/liborigin/OriginObj.h
--HEADERS += ../3rdparty/liborigin/OriginFile.h
--HEADERS += ../3rdparty/liborigin/OriginParser.h
--HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
--HEADERS += ../3rdparty/liborigin/Origin600Parser.h
--HEADERS += ../3rdparty/liborigin/Origin610Parser.h
--HEADERS += ../3rdparty/liborigin/Origin700Parser.h
--HEADERS += ../3rdparty/liborigin/Origin750Parser.h
--HEADERS += ../3rdparty/liborigin/Origin800Parser.h
--HEADERS += ../3rdparty/liborigin/Origin810Parser.h
-
- SOURCES += src/origin/importOPJ.cpp
--SOURCES += ../3rdparty/liborigin/OriginFile.cpp
--SOURCES += ../3rdparty/liborigin/OriginParser.cpp
--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
--SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp
--SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp
-+
-+isEmpty(LIB_ORIGIN_LIBS) {
-+ HEADERS += ../3rdparty/liborigin/OriginObj.h
-+ HEADERS += ../3rdparty/liborigin/OriginFile.h
-+ HEADERS += ../3rdparty/liborigin/OriginParser.h
-+ HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
-+ HEADERS += ../3rdparty/liborigin/Origin600Parser.h
-+ HEADERS += ../3rdparty/liborigin/Origin610Parser.h
-+ HEADERS += ../3rdparty/liborigin/Origin700Parser.h
-+ HEADERS += ../3rdparty/liborigin/Origin750Parser.h
-+ HEADERS += ../3rdparty/liborigin/Origin800Parser.h
-+ HEADERS += ../3rdparty/liborigin/Origin810Parser.h
-+
-+ SOURCES += ../3rdparty/liborigin/OriginFile.cpp
-+ SOURCES += ../3rdparty/liborigin/OriginParser.cpp
-+ SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
-+ SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp
-+ SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp
-+ SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp
-+ SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
-+ SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp
-+ SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp
-+}
Added: qtiplot-0.9.8.6-gold.patch
===================================================================
--- qtiplot-0.9.8.6-gold.patch (rev 0)
+++ qtiplot-0.9.8.6-gold.patch 2011-07-11 21:16:26 UTC (rev 131207)
@@ -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 #############################
Added: qtiplot-0.9.8.6-kde.patch
===================================================================
--- qtiplot-0.9.8.6-kde.patch (rev 0)
+++ qtiplot-0.9.8.6-kde.patch 2011-07-11 21:16:26 UTC (rev 131207)
@@ -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>
Added: qtiplot-0.9.8.6-tamuanova.patch
===================================================================
--- qtiplot-0.9.8.6-tamuanova.patch (rev 0)
+++ qtiplot-0.9.8.6-tamuanova.patch 2011-07-11 21:16:26 UTC (rev 131207)
@@ -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 ##########
More information about the arch-commits
mailing list