summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-09-25 14:29:36 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-09-25 14:29:36 +0000
commite26142da734c5057b8276483c2b1bffb69ba7268 (patch)
treeb1e031b5b3981a3f63b0837a544df5db63cf4c93 /sci-visualization/qtiplot/files
parentVersion bump. Drop old. Keyword ~amd64. Add myself to metadata.xml. (diff)
downloadgentoo-2-e26142da734c5057b8276483c2b1bffb69ba7268.tar.gz
gentoo-2-e26142da734c5057b8276483c2b1bffb69ba7268.tar.bz2
gentoo-2-e26142da734c5057b8276483c2b1bffb69ba7268.zip
Version bump. Fixes bug #238632.
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-SENTINEL-2 i686)
Diffstat (limited to 'sci-visualization/qtiplot/files')
-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
2 files changed, 74 insertions, 0 deletions
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
new file mode 100644
index 000000000000..2c98b330bf24
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch
@@ -0,0 +1,13 @@
+# 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
new file mode 100644
index 000000000000..c4b53197e3ba
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch
@@ -0,0 +1,61 @@
+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 ###############################################
+