bicatali    09/04/08 08:50:47

  Added:                scidavis-0.2.1-profile.patch
  Log:
  Initial import (and bump) to the main tree from the science overlay
  (Portage version: 2.2_rc28/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-visualization/scidavis/files/scidavis-0.2.1-profile.patch

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

Index: scidavis-0.2.1-profile.patch
===================================================================
--- scidavis/scidavis.pro.orig	2009-03-31 16:56:38.000000000 +0100
+++ scidavis/scidavis.pro	2009-03-31 17:13:15.000000000 +0100
@@ -26,8 +26,8 @@
 LUPDATE_BIN = lupdate
 LRELEASE_BIN = lrelease
 } else {                   ### Linux (and other Unix systems)
-LUPDATE_BIN = lupdate-qt4
-LRELEASE_BIN = lrelease-qt4
+LUPDATE_BIN = lupdate
+LRELEASE_BIN = lrelease
 }
 
 ### 64 Linux only suffix
@@ -52,7 +52,7 @@
 ### scidavisrc.py and scidavisUtil.py, respectively. Alternatively you can also put scidavisrc.py 
 ### (or ".scidavis.py") into the users home directory. scidavisUtil.py must be either in the 
 ### directory specified here or somewhere else in the python path (sys.path) where "import" can find it
-unix: pythonconfig.path = /etc						# where scidavisrc.py is installed
+unix: pythonconfig.path = $$INSTALLBASE/share/scidavis						# where scidavisrc.py is installed
 win32: pythonconfig.path = $$INSTALLBASE    
 unix: pythonutils.path = $$INSTALLBASE/share/scidavis        # where the scidavisUtil python modules is installed
 win32: pythonutils.path = $$INSTALLBASE        
@@ -71,7 +71,8 @@
 ### Note to packagers: If you want to use systemwide installed liborigin
 ### instead of the one provided in "3rdparty", uncomment the following 2 lines:
 # CONFIG += dynamic_liborigin
-# LIBS += -lorigin
+LIBS += -lorigin2
+INCLUDEPATH  += /usr/include/liborigin2
 ### Unfortunately, due to liborigin being in alpha stage, we cannot promise
 ### that SciDAVis works with any other version that the one in "3rdparty".
 ################### end of liborigin block 
@@ -83,18 +84,17 @@
 ### are compiled against Qt4), dynamically against everything else.
 #############################################################################
 
-unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+unix:INCLUDEPATH  += /usr/include/qwtplot3d
+unix:LIBS         += -lqwtplot3d
 
-unix:INCLUDEPATH  += ../3rdparty/qwt/src
-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+unix:INCLUDEPATH  += /usr/include/qwt5
+unix:LIBS         += -lqwt
 
-unix:LIBS         += -L/usr/lib$${libsuff}
-unix:LIBS         += -lgsl -lgslcblas -lz
-### muparser 1.30 does not compile as a shared lib on Linux
-unix:LIBS         += -L/usr/local/lib$${libsuff}
-unix:LIBS         += /usr/local/lib/libmuparser.a
-unix:INCLUDEPATH  += /usr/local/include
+unix:INCLUDEPATH  += $$system(pkg-config --cflags gsl)
+unix:LIBS         += $$system(pkg-config --libs gsl)
+unix:LIBS         += $$system(pkg-config --libs muparser)
+unix:INCLUDEPATH  += $$system(pkg-config --cflags muparser)
+unix:LIBS         += -lz
 
 #############################################################################
 ### Link everything dynamically
--- scidavis/sourcefiles.pri.orig	2009-03-31 17:15:04.000000000 +0100
+++ scidavis/sourcefiles.pri	2009-03-31 17:15:48.000000000 +0100
@@ -42,12 +42,8 @@
 ###################### DOCUMENTATION ########################################
 
 documentation.files += ../manual/html \
-                       ../INSTALL.html \
                        ../scidavis.css \
-                       ../scidavis-logo.png \
-                       ../README \
-                       ../CHANGES \
-                       ../gpl.txt 
+                       ../scidavis-logo.png
 
 ###################### DESKTOP INTEGRATION ##################################