* [gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot/files: qtiplot-0.9.6.2-pro.patch qtiplot-0.9.6.2-fitplugins.patch
@ 2008-05-21 8:51 Andrey Grozin (grozin)
0 siblings, 0 replies; only message in thread
From: Andrey Grozin (grozin) @ 2008-05-21 8:51 UTC (permalink / raw
To: gentoo-commits
grozin 08/05/21 08:51:32
Added: qtiplot-0.9.6.2-pro.patch
qtiplot-0.9.6.2-fitplugins.patch
Log:
Version bump. fdo-mime_desktop_database_update added
(Portage version: 2.1.4.4)
Revision Changes Path
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-pro.patch?rev=1.1&content-type=text/plain
Index: qtiplot-0.9.6.2-pro.patch
===================================================================
diff -r -U2 qtiplot-0.9.6.2.orig/qtiplot/qtiplot.pro qtiplot-0.9.6.2/qtiplot/qtiplot.pro
--- qtiplot-0.9.6.2.orig/qtiplot/qtiplot.pro 2008-05-19 14:26:41.000000000 +0700
+++ qtiplot-0.9.6.2/qtiplot/qtiplot.pro 2008-05-21 23:15:15.000000000 +0700
@@ -18,5 +18,5 @@
# the *.path variables defined bellow.
######################################################################################
-#CONFIG += CustomInstall
+CONFIG += CustomInstall
CONFIG += release
@@ -28,10 +28,9 @@
#############################################################################
-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 ###########################
@@ -42,15 +41,17 @@
# 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 ###############################################
@@ -240,6 +241,6 @@
###############################################################
- HEADERS += ../3rdparty/liborigin/OPJFile.h
- SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+# HEADERS += ../3rdparty/liborigin/OPJFile.h
+# SOURCES += ../3rdparty/liborigin/OPJFile.cpp
###############################################################
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.6.2-fitplugins.patch?rev=1.1&content-type=text/plain
Index: qtiplot-0.9.6.2-fitplugins.patch
===================================================================
diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro
--- qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro 2007-10-29 05:44:06.000000000 +0600
+++ qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro 2008-05-15 10:42:10.000000000 +0700
@@ -13,10 +13,8 @@
# 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
diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro
--- qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro 2007-10-29 05:44:06.000000000 +0600
+++ qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro 2008-05-15 10:43:01.000000000 +0700
@@ -13,10 +13,8 @@
# 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
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-21 8:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-21 8:51 [gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot/files: qtiplot-0.9.6.2-pro.patch qtiplot-0.9.6.2-fitplugins.patch Andrey Grozin (grozin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox