| 1 |
markusle 08/09/25 14:29:37 |
| 2 |
|
| 3 |
Added: qtiplot-0.9.7.2-liborigin-gcc4.3.patch |
| 4 |
qtiplot-0.9.7.2-pro.patch |
| 5 |
Log: |
| 6 |
Version bump. Fixes bug #238632. |
| 7 |
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-SENTINEL-2 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qtiplot-0.9.7.2-liborigin-gcc4.3.patch |
| 16 |
=================================================================== |
| 17 |
# fix gcc-4.3 missing headers |
| 18 |
|
| 19 |
diff -Naur qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h |
| 20 |
--- qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h 2008-09-21 13:22:33.000000000 -0400 |
| 21 |
+++ qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h 2008-09-25 10:07:27.000000000 -0400 |
| 22 |
@@ -33,6 +33,7 @@ |
| 23 |
|
| 24 |
#include <string> |
| 25 |
#include <vector> |
| 26 |
+#include <cstring> |
| 27 |
#include "boost/variant.hpp" |
| 28 |
#include "boost/date_time/posix_time/ptime.hpp" |
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: qtiplot-0.9.7.2-pro.patch |
| 39 |
=================================================================== |
| 40 |
diff -Naur qtiplot-0.9.7.2/qtiplot/qtiplot.pro qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro |
| 41 |
--- qtiplot-0.9.7.2/qtiplot/qtiplot.pro 2008-09-22 08:15:41.000000000 -0400 |
| 42 |
+++ qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro 2008-09-25 10:16:00.000000000 -0400 |
| 43 |
@@ -17,7 +17,7 @@ |
| 44 |
# Uncomment the following line if you want to perform a custom installation using |
| 45 |
# the *.path variables defined bellow. |
| 46 |
###################################################################################### |
| 47 |
-#CONFIG += CustomInstall |
| 48 |
+CONFIG += CustomInstall |
| 49 |
|
| 50 |
CONFIG += release |
| 51 |
#CONFIG += debug |
| 52 |
@@ -27,13 +27,12 @@ |
| 53 |
#!!! Warning: You must modify these paths according to your computer settings |
| 54 |
############################################################################# |
| 55 |
|
| 56 |
-INCLUDEPATH += ../3rdparty/muparser/include |
| 57 |
-INCLUDEPATH += ../3rdparty/qwtplot3d/include |
| 58 |
-INCLUDEPATH += ../3rdparty/qwt/src |
| 59 |
-INCLUDEPATH += ../3rdparty/liborigin |
| 60 |
-INCLUDEPATH += ../3rdparty/gsl/include |
| 61 |
-INCLUDEPATH += ../3rdparty/zlib123/include |
| 62 |
-INCLUDEPATH += ../3rdparty/boost_1_36_0 |
| 63 |
+INCLUDEPATH += /usr/include/muparser |
| 64 |
+INCLUDEPATH += /usr/include/qwtplot3d |
| 65 |
+INCLUDEPATH += /usr/include/qwt5 |
| 66 |
+INCLUDEPATH += ../3rdparty/liborigin |
| 67 |
+INCLUDEPATH += /usr/include/gsl |
| 68 |
+INCLUDEPATH += /usr/include/boost |
| 69 |
|
| 70 |
##################### 3rd PARTY LIBRARIES SECTION ########################### |
| 71 |
#!!! Warning: You must modify these paths according to your computer settings |
| 72 |
@@ -42,17 +41,19 @@ |
| 73 |
##################### Linux (Mac OS X) ###################################### |
| 74 |
|
| 75 |
# statically link against libraries in 3rdparty |
| 76 |
-unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a |
| 77 |
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 78 |
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a |
| 79 |
-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a |
| 80 |
-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a |
| 81 |
+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a |
| 82 |
+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 83 |
+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a |
| 84 |
+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a |
| 85 |
+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a |
| 86 |
|
| 87 |
# dynamically link against dependencies if they are installed system-wide |
| 88 |
-#unix:LIBS += -lmuparser |
| 89 |
-#unix:LIBS += -lqwtplot3d |
| 90 |
-#unix:LIBS += -lqwt |
| 91 |
-#unix:LIBS += -lgsl -lgslcblas |
| 92 |
+unix:LIBS += -lmuparser |
| 93 |
+unix:LIBS += -lqwtplot3d |
| 94 |
+unix:LIBS += -lqwt |
| 95 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
| 96 |
+#unix:LIBS += -lorigin |
| 97 |
+unix:LIBS += -lz |
| 98 |
|
| 99 |
##################### Windows ############################################### |
Archives