summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2009-04-08 08:56:13 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2009-04-08 08:56:13 +0000
commitd43099741358c150f90499800c954a4edef9c2fd (patch)
tree441adeb295c85b566647d5627edbf707b8c2bf9e /sci-visualization/qtiplot
parentRemoved old versions (diff)
downloadgentoo-2-d43099741358c150f90499800c954a4edef9c2fd.tar.gz
gentoo-2-d43099741358c150f90499800c954a4edef9c2fd.tar.bz2
gentoo-2-d43099741358c150f90499800c954a4edef9c2fd.zip
Removed old patches
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/qtiplot')
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.8.5-qmake.patch11
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch32
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch62
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch14
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch13
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch61
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch62
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch147
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch21
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch30
10 files changed, 0 insertions, 453 deletions
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.8.5-qmake.patch b/sci-visualization/qtiplot/files/qtiplot-0.8.5-qmake.patch
deleted file mode 100644
index 56b3e0993805..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.8.5-qmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtiplot.pro.orig 2006-05-25 14:51:40.000000000 +0200
-+++ qtiplot.pro 2006-05-25 14:54:42.000000000 +0200
-@@ -13,2 +13,2 @@
--INCLUDEPATH += ../3rdparty/qwt/include
--INCLUDEPATH += -I /usr/include/qwtplot3d
-+INCLUDEPATH += /usr/include/qwt
-+INCLUDEPATH += /usr/include/qwtplot3d
-@@ -17,2 +17 @@
--LIBS += ../3rdparty/qwt/lib/libqwt.a
--LIBS += -L /usr/lib -lgsl -lgslcblas -lqwtplot3d -lz
-+LIBS += -L_LIBDIR_ -lgsl -lgslcblas -lqwt -lqwtplot3d
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch
deleted file mode 100644
index 64e54655df61..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro
---- qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro 2007-10-29 05:44:06.000000000 +0600
-+++ qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro 2008-05-15 10:42:10.000000000 +0700
-@@ -13,10 +13,8 @@
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+INCLUDEPATH += /usr/include/gsl
-
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+unix:LIBS += $$system(pkg-config --libs gsl)
-
- target.path=/usr/lib$${libsuff}/qtiplot/plugins
-diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro
---- qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro 2007-10-29 05:44:06.000000000 +0600
-+++ qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro 2008-05-15 10:43:01.000000000 +0700
-@@ -13,10 +13,8 @@
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+INCLUDEPATH += /usr/include/gsl
-
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+unix:LIBS += $$system(pkg-config --libs gsl)
-
- target.path=/usr/lib$${libsuff}/qtiplot/plugins
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch
deleted file mode 100644
index fb8ba3f71fd9..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -r -U2 qtiplot-0.9.6.2.orig/qtiplot/qtiplot.pro qtiplot-0.9.6.2/qtiplot/qtiplot.pro
---- qtiplot-0.9.6.2.orig/qtiplot/qtiplot.pro 2008-05-19 14:26:41.000000000 +0700
-+++ qtiplot-0.9.6.2/qtiplot/qtiplot.pro 2008-05-25 07:47:27.000000000 +0700
-@@ -18,5 +18,5 @@
- # the *.path variables defined bellow.
- ######################################################################################
--#CONFIG += CustomInstall
-+CONFIG += CustomInstall
-
- CONFIG += release
-@@ -28,10 +28,9 @@
- #############################################################################
-
--INCLUDEPATH += ../3rdparty/muparser/include
--INCLUDEPATH += ../3rdparty/qwtplot3d/include
--INCLUDEPATH += ../3rdparty/qwt/src
--INCLUDEPATH += ../3rdparty/liborigin
--INCLUDEPATH += ../3rdparty/gsl/include
--INCLUDEPATH += ../3rdparty/zlib123/include
-+INCLUDEPATH += /usr/include/muparser
-+INCLUDEPATH += /usr/include/qwtplot3d
-+INCLUDEPATH += /usr/include/qwt5
-+INCLUDEPATH += /usr/include/liborigin
-+INCLUDEPATH += /usr/include/gsl
-
- ##################### 3rd PARTY LIBRARIES SECTION ###########################
-@@ -42,15 +41,17 @@
-
- # statically link against libraries in 3rdparty
--unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
--unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
--unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
--unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
--unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
-+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
-+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-
- # dynamically link against dependencies if they are installed system-wide
--#unix:LIBS += -lmuparser
--#unix:LIBS += -lqwtplot3d
--#unix:LIBS += -lqwt
--#unix:LIBS += -lgsl -lgslcblas
-+unix:LIBS += -lmuparser
-+unix:LIBS += -lqwtplot3d
-+unix:LIBS += -lqwt
-+unix:LIBS += $$system(pkg-config --libs gsl)
-+unix:LIBS += -lorigin
-+unix:LIBS += -lz
-
- ##################### Windows ###############################################
-@@ -240,6 +241,6 @@
- ###############################################################
-
-- HEADERS += ../3rdparty/liborigin/OPJFile.h
-- SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-+# HEADERS += ../3rdparty/liborigin/OPJFile.h
-+# SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-
- ###############################################################
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch
deleted file mode 100644
index 2b2d5126c833..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# patch needed for providing the proper includes needed for
-# gcc-4.3 (08/25/2008)
-
-diff -Naur qtiplot-0.9.7/qtiplot/src/plot2D/ScaleEngine.cpp qtiplot-0.9.7.new/qtiplot/src/plot2D/ScaleEngine.cpp
---- qtiplot-0.9.7/qtiplot/src/plot2D/ScaleEngine.cpp 2008-06-12 13:19:20.000000000 -0400
-+++ qtiplot-0.9.7.new/qtiplot/src/plot2D/ScaleEngine.cpp 2008-08-25 18:38:35.000000000 -0400
-@@ -27,6 +27,7 @@
- * *
- ***************************************************************************/
- #include "ScaleEngine.h"
-+#include <limits.h>
-
- QwtScaleTransformation* ScaleEngine::transformation() const
- {
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch
deleted file mode 100644
index 2c98b330bf24..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# fix gcc-4.3 missing headers
-
-diff -Naur qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h
---- qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h 2008-09-21 13:22:33.000000000 -0400
-+++ qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h 2008-09-25 10:07:27.000000000 -0400
-@@ -33,6 +33,7 @@
-
- #include <string>
- #include <vector>
-+#include <cstring>
- #include "boost/variant.hpp"
- #include "boost/date_time/posix_time/ptime.hpp"
-
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch
deleted file mode 100644
index c4b53197e3ba..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur qtiplot-0.9.7.2/qtiplot/qtiplot.pro qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro
---- qtiplot-0.9.7.2/qtiplot/qtiplot.pro 2008-09-22 08:15:41.000000000 -0400
-+++ qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro 2008-09-25 10:16:00.000000000 -0400
-@@ -17,7 +17,7 @@
- # Uncomment the following line if you want to perform a custom installation using
- # the *.path variables defined bellow.
- ######################################################################################
--#CONFIG += CustomInstall
-+CONFIG += CustomInstall
-
- CONFIG += release
- #CONFIG += debug
-@@ -27,13 +27,12 @@
- #!!! Warning: You must modify these paths according to your computer settings
- #############################################################################
-
--INCLUDEPATH += ../3rdparty/muparser/include
--INCLUDEPATH += ../3rdparty/qwtplot3d/include
--INCLUDEPATH += ../3rdparty/qwt/src
--INCLUDEPATH += ../3rdparty/liborigin
--INCLUDEPATH += ../3rdparty/gsl/include
--INCLUDEPATH += ../3rdparty/zlib123/include
--INCLUDEPATH += ../3rdparty/boost_1_36_0
-+INCLUDEPATH += /usr/include/muparser
-+INCLUDEPATH += /usr/include/qwtplot3d
-+INCLUDEPATH += /usr/include/qwt5
-+INCLUDEPATH += ../3rdparty/liborigin
-+INCLUDEPATH += /usr/include/gsl
-+INCLUDEPATH += /usr/include/boost
-
- ##################### 3rd PARTY LIBRARIES SECTION ###########################
- #!!! Warning: You must modify these paths according to your computer settings
-@@ -42,17 +41,19 @@
- ##################### Linux (Mac OS X) ######################################
-
- # statically link against libraries in 3rdparty
--unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
--unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
--unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
--unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
--unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
-+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
-+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-
- # dynamically link against dependencies if they are installed system-wide
--#unix:LIBS += -lmuparser
--#unix:LIBS += -lqwtplot3d
--#unix:LIBS += -lqwt
--#unix:LIBS += -lgsl -lgslcblas
-+unix:LIBS += -lmuparser
-+unix:LIBS += -lqwtplot3d
-+unix:LIBS += -lqwt
-+unix:LIBS += $$system(pkg-config --libs gsl)
-+#unix:LIBS += -lorigin
-+unix:LIBS += -lz
-
- ##################### Windows ###############################################
-
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch
deleted file mode 100644
index 841ac78df38e..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur qtiplot-0.9.7.3/qtiplot/src/scripting/ScriptEdit.cpp qtiplot-0.9.7.3.new/qtiplot/src/scripting/ScriptEdit.cpp
---- qtiplot-0.9.7.3/qtiplot/src/scripting/ScriptEdit.cpp 2008-10-20 11:59:25.000000000 -0400
-+++ qtiplot-0.9.7.3.new/qtiplot/src/scripting/ScriptEdit.cpp 2008-11-13 09:10:48.000000000 -0500
-@@ -28,7 +28,11 @@
- ***************************************************************************/
- #include "ScriptEdit.h"
- #include "Note.h"
-+
-+#ifdef SCRIPTING_PYTHON
- #include "PythonSyntaxHighlighter.h"
-+#endif
-+
- #include "FindReplaceDialog.h"
-
- #include <QAction>
-@@ -58,9 +62,11 @@
- setTextFormat(Qt::PlainText);
- setAcceptRichText (false);
-
-+#ifdef SCRIPTING_PYTHON
- if (scriptEnv->name() == QString("Python"))
- d_highlighter = new PythonSyntaxHighlighter(this);
--
-+#endif
-+
- d_fmt_default.setBackground(palette().brush(QPalette::Base));
- d_fmt_failure.setBackground(QBrush(QColor(255,128,128)));
-
-@@ -142,6 +148,7 @@
- connect(myScript, SIGNAL(error(const QString&, const QString&, int)), this, SLOT(insertErrorMsg(const QString&)));
- connect(myScript, SIGNAL(print(const QString&)), this, SLOT(scriptPrint(const QString&)));
-
-+#ifdef SCRIPTING_PYTHON
- if (scriptEnv->name() == QString("Python") && !d_highlighter)
- d_highlighter = new PythonSyntaxHighlighter(this);
- else {
-@@ -149,6 +156,7 @@
- delete d_highlighter;
- d_highlighter = 0;
- }
-+#endif
- }
- }
-
-@@ -585,13 +593,16 @@
-
- void ScriptEdit::rehighlight()
- {
-+#ifdef SCRIPTING_PYTHON
- if (scriptEnv->name() != QString("Python"))
- return;
--
-+#endif
- if (d_highlighter)
- delete d_highlighter;
-
-+#ifdef SCRIPTING_PYTHON
- d_highlighter = new PythonSyntaxHighlighter(this);
-+#endif
- }
-
- void ScriptEdit::showFindDialog(bool replace)
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch
deleted file mode 100644
index 3cf5663dfa11..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Naur qtiplot-0.9.7.3/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.3.new/fitPlugins/exp_saturation/exp_saturation.pro
---- qtiplot-0.9.7.3/fitPlugins/exp_saturation/exp_saturation.pro 2008-10-13 03:43:31.000000000 -0400
-+++ qtiplot-0.9.7.3.new/fitPlugins/exp_saturation/exp_saturation.pro 2008-10-24 10:15:30.000000000 -0400
-@@ -12,12 +12,12 @@
- DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+#LIBS += ../../3rdparty/gsl/lib/libgsl.a
-+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+INCLUDEPATH += /usr/include/gsl
-+unix:LIBS += $$system(pkg-config --libs gsl)
-
- target.path=/usr/lib$${libsuff}/qtiplot/plugins
- INSTALLS += target
-diff -Naur qtiplot-0.9.7.3/fitPlugins/explin/explin.pro qtiplot-0.9.7.3.new/fitPlugins/explin/explin.pro
---- qtiplot-0.9.7.3/fitPlugins/explin/explin.pro 2008-10-13 03:43:31.000000000 -0400
-+++ qtiplot-0.9.7.3.new/fitPlugins/explin/explin.pro 2008-10-24 10:15:49.000000000 -0400
-@@ -12,12 +12,13 @@
- DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+#INCLUDEPATH += ../../3rdparty/gsl/include/
-+#LIBS += ../../3rdparty/gsl/lib/libgsl.a
-+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+INCLUDEPATH += /usr/include/gsl
-+unix:LIBS += $$system(pkg-config --libs gsl)
-
- target.path=/usr/lib$${libsuff}/qtiplot/plugins
- INSTALLS += target
-diff -Naur qtiplot-0.9.7.3/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.3.new/fitPlugins/fitRational0/fitRational0.pro
---- qtiplot-0.9.7.3/fitPlugins/fitRational0/fitRational0.pro 2008-10-13 12:14:52.000000000 -0400
-+++ qtiplot-0.9.7.3.new/fitPlugins/fitRational0/fitRational0.pro 2008-10-24 10:16:08.000000000 -0400
-@@ -12,12 +12,13 @@
- DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+#INCLUDEPATH += ../../3rdparty/gsl/include/
-+#LIBS += ../../3rdparty/gsl/lib/libgsl.a
-+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+INCLUDEPATH += /usr/include/gsl
-+unix:LIBS += $$system(pkg-config --libs gsl)
-
- target.path=/usr/lib$${libsuff}/qtiplot/plugins
- INSTALLS += target
-diff -Naur qtiplot-0.9.7.3/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.3.new/fitPlugins/fitRational1/fitRational1.pro
---- qtiplot-0.9.7.3/fitPlugins/fitRational1/fitRational1.pro 2007-10-28 19:44:06.000000000 -0400
-+++ qtiplot-0.9.7.3.new/fitPlugins/fitRational1/fitRational1.pro 2008-10-24 10:16:25.000000000 -0400
-@@ -12,12 +12,13 @@
- DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+#INCLUDEPATH += ../../3rdparty/gsl/include/
-+#LIBS += ../../3rdparty/gsl/lib/libgsl.a
-+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+INCLUDEPATH += /usr/include/gsl
-+unix:LIBS += $$system(pkg-config --libs gsl)
-
- target.path=/usr/lib$${libsuff}/qtiplot/plugins
- INSTALLS += target
-diff -Naur qtiplot-0.9.7.3/qtiplot/qtiplot.pro qtiplot-0.9.7.3.new/qtiplot/qtiplot.pro
---- qtiplot-0.9.7.3/qtiplot/qtiplot.pro 2008-10-22 13:57:19.000000000 -0400
-+++ qtiplot-0.9.7.3.new/qtiplot/qtiplot.pro 2008-10-24 11:03:21.000000000 -0400
-@@ -23,7 +23,7 @@
- win32:LIBS += ../3rdparty/libpng/libpng.a
-
- # Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.
--#CONFIG += CustomInstall
-+CONFIG += CustomInstall
-
- CONFIG += release
- #CONFIG += debug
-@@ -33,13 +33,12 @@
- #!!! Warning: You must modify these paths according to your computer settings
- #############################################################################
-
--INCLUDEPATH += ../3rdparty/muparser/include
--INCLUDEPATH += ../3rdparty/qwtplot3d/include
--INCLUDEPATH += ../3rdparty/qwt/src
--INCLUDEPATH += ../3rdparty/liborigin
--INCLUDEPATH += ../3rdparty/gsl/include
--INCLUDEPATH += ../3rdparty/zlib123/include
--INCLUDEPATH += ../3rdparty/boost_1_36_0
-+INCLUDEPATH += /usr/include/muparser
-+INCLUDEPATH += /usr/include/qwtplot3d
-+INCLUDEPATH += /usr/include/qwt5
-+INCLUDEPATH += ../3rdparty/liborigin
-+INCLUDEPATH += /usr/include/gsl
-+INCLUDEPATH += /usr/include/boost
-
- ##################### 3rd PARTY LIBRARIES SECTION ###########################
- #!!! Warning: You must modify these paths according to your computer settings
-@@ -48,15 +47,15 @@
- ##################### Linux (Mac OS X) ######################################
-
- # statically link against libraries in 3rdparty
--unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
--unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
--unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
--unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
--unix:LIBS += /usr/local/lib/libboost_date_time-gcc41-mt.a
--unix:LIBS += /usr/local/lib/libboost_thread-gcc41-mt.a
-+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
-+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
-+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-+#unix:LIBS += /usr/local/lib/libboost_date_time-gcc41-mt.a
-+#unix:LIBS += /usr/local/lib/libboost_thread-gcc41-mt.a
-
- # dynamically link against dependencies if they are installed system-wide
--#unix:LIBS += -lmuparser
-+unix:LIBS += -lmuparser -lqwtplot3d -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread
- #unix:LIBS += -lqwt
- #unix:LIBS += -lgsl -lgslcblas
-
-@@ -184,7 +183,7 @@
- ################# Default Modules #############################
- ###############################################################
-
--include(../3rdparty/qwtplot3d/qwtplot3d.pri)
-+#include(../3rdparty/qwtplot3d/qwtplot3d.pri)
- include(src/analysis/analysis.pri)
- include(src/core/core.pri)
- include(src/lib/libqti.pri)
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch
deleted file mode 100644
index 881d6e043cd0..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur qtiplot-0.9.7.3/qtiplot/src/plot3D/Graph3D.cpp qtiplot-0.9.7.3.new/qtiplot/src/plot3D/Graph3D.cpp
---- qtiplot-0.9.7.3/qtiplot/src/plot3D/Graph3D.cpp 2008-10-20 06:32:35.000000000 -0400
-+++ qtiplot-0.9.7.3.new/qtiplot/src/plot3D/Graph3D.cpp 2008-10-24 11:04:56.000000000 -0400
-@@ -777,7 +777,7 @@
- void Graph3D::setNumbersFont(const QFont& font)
- {
- sp->coordinates()->setNumberFont (font);
-- sp->legend()->axis()->setNumberFont (font);
-+ //sp->legend()->axis()->setNumberFont (font);
- sp->makeCurrent();
- sp->updateGL();
- }
-@@ -1570,7 +1570,7 @@
- void Graph3D::setNumbersColor(const QColor& numColor)
- {
- if(numCol != numColor){
-- sp->legend()->axis()->setNumberColor(Qt2GL(numColor));
-+ //sp->legend()->axis()->setNumberColor(Qt2GL(numColor));
- sp->coordinates()->setNumberColor(Qt2GL(numColor));
- numCol = numColor;
- }
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch
deleted file mode 100644
index 2182c14e673e..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur qtiplot-0.9.7.3/qtiplot/src/scripting/qti.sip qtiplot-0.9.7.3.new/qtiplot/src/scripting/qti.sip
---- qtiplot-0.9.7.3/qtiplot/src/scripting/qti.sip 2008-10-20 06:32:35.000000000 -0400
-+++ qtiplot-0.9.7.3.new/qtiplot/src/scripting/qti.sip 2008-12-18 17:24:44.000000000 -0500
-@@ -74,8 +74,6 @@
- MdiSubWindow(const MdiSubWindow&);
- };
-
--typedef QList<MdiSubWindow*> MDIWindowList;
--
- class Table: MdiSubWindow
- {
- %TypeHeaderCode
-@@ -1072,7 +1070,7 @@
- Graph3D* plotParametricSurface(const QString&, const QString&, const QString&,
- double, double, double, double, int=40, int=40, bool=true, bool=true) /PyName=plot3D/;
-
-- MDIWindowList windowsList() /PyName=windows/;
-+ QList<MdiSubWindow*> windowsList() /PyName=windows/;
-
- // folders
- Folder *activeFolder() /NoDerived/;
-@@ -1867,7 +1865,7 @@
- #include "src/core/Folder.h"
- %End
- public:
-- MDIWindowList windowsList() /PyName=windows/;
-+ QList<MdiSubWindow*> windowsList() /PyName=windows/;
- // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
- // void setFolderName(const QString&) /PyName=setName/;
- QString name();