[patch] qtiplot-0.9.7.4-pro.patch

qtiplot-0.9.7.4-pro.patch (text/plain), 5.91 KB, created by Andrey Grozin on 2008-11-30 07:15:28 UTC

diff -r -U2 qtiplot-0.9.7.4.orig/fitPlugins/explin/explin.pro qtiplot-0.9.7.4/fitPlugins/explin/explin.pro
--- qtiplot-0.9.7.4.orig/fitPlugins/explin/explin.pro	2008-10-13 14:43:31.000000000 +0700
+++ qtiplot-0.9.7.4/fitPlugins/explin/explin.pro	2008-11-30 18:21:42.000000000 +0600
@@ -13,10 +13,11 @@
  
 # 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
diff -r -U2 qtiplot-0.9.7.4.orig/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.4/fitPlugins/exp_saturation/exp_saturation.pro
--- qtiplot-0.9.7.4.orig/fitPlugins/exp_saturation/exp_saturation.pro	2008-10-13 14:43:31.000000000 +0700
+++ qtiplot-0.9.7.4/fitPlugins/exp_saturation/exp_saturation.pro	2008-11-30 18:21:42.000000000 +0600
@@ -13,10 +13,10 @@
  
 # 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
diff -r -U2 qtiplot-0.9.7.4.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro
--- qtiplot-0.9.7.4.orig/fitPlugins/fitRational0/fitRational0.pro	2008-10-13 23:14:52.000000000 +0700
+++ qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro	2008-11-30 18:21:42.000000000 +0600
@@ -13,10 +13,11 @@
  
 # 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
diff -r -U2 qtiplot-0.9.7.4.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.4/fitPlugins/fitRational1/fitRational1.pro
--- qtiplot-0.9.7.4.orig/fitPlugins/fitRational1/fitRational1.pro	2007-10-29 05:44:06.000000000 +0600
+++ qtiplot-0.9.7.4/fitPlugins/fitRational1/fitRational1.pro	2008-11-30 18:21:42.000000000 +0600
@@ -13,10 +13,11 @@
  
 # 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
diff -r -U2 qtiplot-0.9.7.4.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.4/qtiplot/qtiplot.pro
--- qtiplot-0.9.7.4.orig/qtiplot/qtiplot.pro	2008-11-20 14:36:32.000000000 +0600
+++ qtiplot-0.9.7.4/qtiplot/qtiplot.pro	2008-11-30 18:25:58.000000000 +0600
@@ -21,5 +21,5 @@
 
 # Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.
-#CONFIG          += CustomInstall
+CONFIG          += CustomInstall
 
 CONFIG          += release
@@ -31,11 +31,10 @@
 #############################################################################
 
-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       += ../3rdparty/qwtplot3d/include
+INCLUDEPATH       += /usr/include/qwt5
+INCLUDEPATH       += ../3rdparty/liborigin
+INCLUDEPATH       += /usr/include/gsl
+INCLUDEPATH       += /usr/include/boost
 
 ##################### 3rd PARTY LIBRARIES SECTION ###########################
@@ -46,13 +45,13 @@
 
 # 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 -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread
 #unix:LIBS         += -lqwt
 #unix:LIBS         += -lgsl -lgslcblas