| 1 |
bicatali 08/03/28 18:30:45 |
| 2 |
|
| 3 |
Added: qtiplot-0.9.4-systemlibs.patch |
| 4 |
Log: |
| 5 |
Version bump. Thanks Dieter Ries for the update (closing bug #215192). Removed older versions. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: qtiplot-0.9.4-systemlibs.patch |
| 15 |
=================================================================== |
| 16 |
--- qtiplot/qtiplot.pro.orig 2008-03-06 15:02:08.000000000 +0000 |
| 17 |
+++ qtiplot/qtiplot.pro 2008-03-06 21:57:33.000000000 +0000 |
| 18 |
@@ -45,12 +45,12 @@ |
| 19 |
#!!! Warning: You must modify these paths according to your computer settings |
| 20 |
############################################################################# |
| 21 |
|
| 22 |
-INCLUDEPATH += ../3rdparty/muparser/include |
| 23 |
-INCLUDEPATH += ../3rdparty/qwtplot3d/include |
| 24 |
-INCLUDEPATH += ../3rdparty/qwt/src |
| 25 |
-INCLUDEPATH += ../3rdparty/liborigin |
| 26 |
-INCLUDEPATH += ../3rdparty/gsl/include |
| 27 |
-INCLUDEPATH += ../3rdparty/zlib123/include |
| 28 |
+INCLUDEPATH += /usr/include/muparser |
| 29 |
+INCLUDEPATH += /usr/include/qwtplot3d |
| 30 |
+INCLUDEPATH += /usr/include/qwt5 |
| 31 |
+INCLUDEPATH += /usr/include/liborigin |
| 32 |
+INCLUDEPATH += /usr/include/gsl |
| 33 |
+ |
| 34 |
|
| 35 |
##################### 3rd PARTY LIBRARIES SECTION ########################### |
| 36 |
#!!! Warning: You must modify these paths according to your computer settings |
| 37 |
@@ -59,17 +59,19 @@ |
| 38 |
##################### Linux (Mac OS X) ###################################### |
| 39 |
|
| 40 |
# statically link against libraries in 3rdparty |
| 41 |
-unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a |
| 42 |
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 43 |
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a |
| 44 |
-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a |
| 45 |
-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a |
| 46 |
+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a |
| 47 |
+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 48 |
+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a |
| 49 |
+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a |
| 50 |
+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a |
| 51 |
|
| 52 |
# dynamically link against dependencies if they are installed system-wide |
| 53 |
-#unix:LIBS += -lmuparser |
| 54 |
-#unix:LIBS += -lqwtplot3d |
| 55 |
-#unix:LIBS += -lqwt |
| 56 |
-#unix:LIBS += -lgsl -lgslcblas |
| 57 |
+unix:LIBS += -lmuparser |
| 58 |
+unix:LIBS += -lqwtplot3d |
| 59 |
+unix:LIBS += -lqwt |
| 60 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
| 61 |
+unix:LIBS += -lorigin |
| 62 |
+unix:LIBS += -lz |
| 63 |
|
| 64 |
##################### Windows ############################################### |
| 65 |
|
| 66 |
@@ -139,8 +141,7 @@ |
| 67 |
manual.files += ../manual/html \ |
| 68 |
../manual/qtiplot-manual-en.pdf |
| 69 |
|
| 70 |
-documentation.files += ../README.html \ |
| 71 |
- ../gpl_licence.txt |
| 72 |
+documentation.files += ../README.html |
| 73 |
|
| 74 |
unix: man.files += ../qtiplot.1 |
| 75 |
|
| 76 |
@@ -395,8 +396,8 @@ |
| 77 |
################# Origin Import (liborigin) ################### |
| 78 |
############################################################### |
| 79 |
|
| 80 |
-HEADERS += ../3rdparty/liborigin/OPJFile.h |
| 81 |
-SOURCES += ../3rdparty/liborigin/OPJFile.cpp |
| 82 |
+#HEADERS += ../3rdparty/liborigin/OPJFile.h |
| 83 |
+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp |
| 84 |
|
| 85 |
############################################################### |
| 86 |
################# Module: Plot 2D ############################# |
| 87 |
--- fitPlugins/fitRational0/fitRational0.pro.orig 2008-03-06 15:11:53.000000000 +0000 |
| 88 |
+++ fitPlugins/fitRational0/fitRational0.pro 2008-03-06 15:16:28.000000000 +0000 |
| 89 |
@@ -12,12 +12,10 @@ |
| 90 |
DESTDIR = ../ |
| 91 |
|
| 92 |
# statically link against GSL in 3rdparty |
| 93 |
-INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 94 |
-LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 95 |
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 96 |
+INCLUDEPATH += /usr/include/gsl |
| 97 |
|
| 98 |
#dynamically link against GSL installed system-wide |
| 99 |
-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas |
| 100 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
| 101 |
|
| 102 |
target.path=/usr/lib$${libsuff}/qtiplot/plugins |
| 103 |
INSTALLS += target |
| 104 |
--- fitPlugins/fitRational1/fitRational1.pro.orig 2008-03-06 15:13:35.000000000 +0000 |
| 105 |
+++ fitPlugins/fitRational1/fitRational1.pro 2008-03-06 15:16:52.000000000 +0000 |
| 106 |
@@ -12,12 +12,10 @@ |
| 107 |
DESTDIR = ../ |
| 108 |
|
| 109 |
# statically link against GSL in 3rdparty |
| 110 |
-INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 111 |
-LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 112 |
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 113 |
+INCLUDEPATH += /usr/include/gsl |
| 114 |
|
| 115 |
#dynamically link against GSL installed system-wide |
| 116 |
-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas |
| 117 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
| 118 |
|
| 119 |
target.path=/usr/lib$${libsuff}/qtiplot/plugins |
| 120 |
INSTALLS += target |
| 121 |
--- qtiplot.pro.orig 2008-03-28 15:58:25.000000000 +0000 |
| 122 |
+++ qtiplot.pro 2008-03-28 15:58:41.000000000 +0000 |
| 123 |
@@ -2,6 +2,5 @@ |
| 124 |
|
| 125 |
SUBDIRS = fitPlugins/fitRational0\ |
| 126 |
fitPlugins/fitRational1\ |
| 127 |
- 3rdparty/qwt\ |
| 128 |
manual\ |
| 129 |
qtiplot |
| 130 |
|
| 131 |
|
| 132 |
|
| 133 |
-- |
| 134 |
gentoo-commits@l.g.o mailing list |
Archives