[gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot/files: qtiplot-0.9.5-profile.patch qtiplot-0.9.5-fitplugins.patch qtiplot-0.9.3-systemlibs.patch qtiplot-0.9.3-homepage.patch

[Sebastien Fabbro (bicatali)]

bicatali    08/04/29 14:55:53

  Added:                qtiplot-0.9.5-profile.patch
                        qtiplot-0.9.5-fitplugins.patch
  Removed:              qtiplot-0.9.3-systemlibs.patch
                        qtiplot-0.9.3-homepage.patch
  Log:
  Version bump. Separated patches for fit plugins and qtiplot.pro for better re-usability
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.5-profile.patch
===================================================================
--- qtiplot/qtiplot.pro.orig	2008-04-24 18:54:47.622675411 +0000
+++ qtiplot/qtiplot.pro	2008-04-24 19:01:18.639824832 +0000
@@ -30,12 +30,11 @@
 #!!! 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       += /usr/include/muparser
+INCLUDEPATH       += /usr/include/qwtplot3d
+INCLUDEPATH       += /usr/include/qwt5
+INCLUDEPATH       += /usr/include/liborigin
+INCLUDEPATH       += /usr/include/gsl
 
 ##################### 3rd PARTY LIBRARIES SECTION ###########################
 #!!! Warning: You must modify these paths according to your computer settings
@@ -44,17 +43,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 ###############################################
 
@@ -147,8 +148,7 @@
 manual.files += ../manual/html \
 				../manual/qtiplot-manual-en.pdf
 
-documentation.files += ../README.html \
-                       ../gpl_licence.txt
+documentation.files += ../README.html 
 
 unix: man.files += ../qtiplot.1
 
@@ -403,8 +403,8 @@
 ################# Origin Import (liborigin) ###################
 ###############################################################
 
-HEADERS += ../3rdparty/liborigin/OPJFile.h
-SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+#HEADERS += ../3rdparty/liborigin/OPJFile.h
+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp
 
 ###############################################################
 ################# Module: Plot 2D #############################



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.5-fitplugins.patch
===================================================================
--- fitPlugins/fitRational0/fitRational0.pro.orig	2008-03-06 15:11:53.000000000 +0000
+++ fitPlugins/fitRational0/fitRational0.pro	2008-03-06 15:16:28.000000000 +0000
@@ -12,12 +12,10 @@
 DESTDIR           = ../
  
 # 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
 INSTALLS += target
--- fitPlugins/fitRational1/fitRational1.pro.orig	2008-03-06 15:13:35.000000000 +0000
+++ fitPlugins/fitRational1/fitRational1.pro	2008-03-06 15:16:52.000000000 +0000
@@ -12,12 +12,10 @@
 DESTDIR           = ../
  
 # 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
 INSTALLS += target



-- 
gentoo-commits@l.g.o mailing list