Date: Wednesday, September 29, 2010 @ 10:53:36
Author: ronald
Revision: 92394
update to latest version, update patches, depend on qt-assistant-compat
Added:
qtiplot/trunk/gentoo-fix-origin-build-failure.patch
qtiplot/trunk/qtiplot-0.9.7.14-system-liborigin.patch
Deleted:
qtiplot/trunk/qtiplot-0.9.7.12-system-liborigin.patch
-----------------------------------------+
gentoo-fix-origin-build-failure.patch | 72 +++++++++++++++++++++
qtiplot-0.9.7.12-system-liborigin.patch | 92 ---------------------------
qtiplot-0.9.7.14-system-liborigin.patch | 101 ++++++++++++++++++++++++++++++
3 files changed, 173 insertions(+), 92 deletions(-)
Added: gentoo-fix-origin-build-failure.patch
===================================================================
--- gentoo-fix-origin-build-failure.patch (rev 0)
+++ gentoo-fix-origin-build-failure.patch 2010-09-29 14:53:36 UTC (rev
92394)
@@ -0,0 +1,72 @@
+--- 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.12-system-liborigin.patch
===================================================================
--- qtiplot-0.9.7.12-system-liborigin.patch 2010-09-29 14:52:11 UTC (rev
92393)
+++ qtiplot-0.9.7.12-system-liborigin.patch 2010-09-29 14:53:36 UTC (rev
92394)
@@ -1,92 +0,0 @@
-=== modified file 'build.conf.example'
---- build.conf.example 2010-02-14 15:07:01 +0000
-+++ build.conf.example 2010-02-14 15:16:08 +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-02-14 15:07:01 +0000
-+++ qtiplot/qtiplot.pro 2010-02-14 15:13:58 +0000
-@@ -9,7 +9,6 @@
- #############################################################################
-
- # local copy included
--INCLUDEPATH += ../3rdparty/liborigin
- INCLUDEPATH += ../3rdparty/zlib
-
- # configurable
-@@ -18,6 +17,7 @@
- INCLUDEPATH += $$QWT3D_INCLUDEPATH
- INCLUDEPATH += $$GSL_INCLUDEPATH
- INCLUDEPATH += $$BOOST_INCLUDEPATH
-+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH
-
- # configurable libs
- LIBS += $$MUPARSER_LIBS
-@@ -26,6 +26,7 @@
- LIBS += $$QTEXENGINE_LIBS
- LIBS += $$GSL_LIBS
- LIBS += $$BOOST_LIBS
-+LIBS += $$LIB_ORIGIN_LIBS
-
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
-@@ -154,6 +155,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 2009-10-18 01:48:15 +0000
-+++ qtiplot/src/origin/origin.pri 2010-02-14 15:11:15 +0000
-@@ -4,14 +4,17 @@
- 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/Origin750Parser.h
--
- SOURCES += src/origin/importOPJ.cpp
--SOURCES += ../3rdparty/liborigin/OriginFile.cpp
--SOURCES += ../3rdparty/liborigin/OriginParser.cpp
--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
--SOURCES += ../3rdparty/liborigin/Origin750Parser.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/Origin750Parser.h
-+
-+ SOURCES += ../3rdparty/liborigin/OriginFile.cpp
-+ SOURCES += ../3rdparty/liborigin/OriginParser.cpp
-+ SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
-+ SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
-+}
-
-
-
Added: qtiplot-0.9.7.14-system-liborigin.patch
===================================================================
--- qtiplot-0.9.7.14-system-liborigin.patch (rev 0)
+++ qtiplot-0.9.7.14-system-liborigin.patch 2010-09-29 14:53:36 UTC (rev
92394)
@@ -0,0 +1,101 @@
+=== 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
++}
