1 |
bicatali 09/04/08 08:50:47 |
2 |
|
3 |
Added: scidavis-0.2.1-profile.patch |
4 |
Log: |
5 |
Initial import (and bump) to the main tree from the science overlay |
6 |
(Portage version: 2.2_rc28/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sci-visualization/scidavis/files/scidavis-0.2.1-profile.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/scidavis/files/scidavis-0.2.1-profile.patch?rev=1.1&view=markup |
12 |
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 |
13 |
|
14 |
Index: scidavis-0.2.1-profile.patch |
15 |
=================================================================== |
16 |
--- scidavis/scidavis.pro.orig 2009-03-31 16:56:38.000000000 +0100 |
17 |
+++ scidavis/scidavis.pro 2009-03-31 17:13:15.000000000 +0100 |
18 |
@@ -26,8 +26,8 @@ |
19 |
LUPDATE_BIN = lupdate |
20 |
LRELEASE_BIN = lrelease |
21 |
} else { ### Linux (and other Unix systems) |
22 |
-LUPDATE_BIN = lupdate-qt4 |
23 |
-LRELEASE_BIN = lrelease-qt4 |
24 |
+LUPDATE_BIN = lupdate |
25 |
+LRELEASE_BIN = lrelease |
26 |
} |
27 |
|
28 |
### 64 Linux only suffix |
29 |
@@ -52,7 +52,7 @@ |
30 |
### scidavisrc.py and scidavisUtil.py, respectively. Alternatively you can also put scidavisrc.py |
31 |
### (or ".scidavis.py") into the users home directory. scidavisUtil.py must be either in the |
32 |
### directory specified here or somewhere else in the python path (sys.path) where "import" can find it |
33 |
-unix: pythonconfig.path = /etc # where scidavisrc.py is installed |
34 |
+unix: pythonconfig.path = $$INSTALLBASE/share/scidavis # where scidavisrc.py is installed |
35 |
win32: pythonconfig.path = $$INSTALLBASE |
36 |
unix: pythonutils.path = $$INSTALLBASE/share/scidavis # where the scidavisUtil python modules is installed |
37 |
win32: pythonutils.path = $$INSTALLBASE |
38 |
@@ -71,7 +71,8 @@ |
39 |
### Note to packagers: If you want to use systemwide installed liborigin |
40 |
### instead of the one provided in "3rdparty", uncomment the following 2 lines: |
41 |
# CONFIG += dynamic_liborigin |
42 |
-# LIBS += -lorigin |
43 |
+LIBS += -lorigin2 |
44 |
+INCLUDEPATH += /usr/include/liborigin2 |
45 |
### Unfortunately, due to liborigin being in alpha stage, we cannot promise |
46 |
### that SciDAVis works with any other version that the one in "3rdparty". |
47 |
################### end of liborigin block |
48 |
@@ -83,18 +84,17 @@ |
49 |
### are compiled against Qt4), dynamically against everything else. |
50 |
############################################################################# |
51 |
|
52 |
-unix:INCLUDEPATH += ../3rdparty/qwtplot3d/include |
53 |
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a |
54 |
+unix:INCLUDEPATH += /usr/include/qwtplot3d |
55 |
+unix:LIBS += -lqwtplot3d |
56 |
|
57 |
-unix:INCLUDEPATH += ../3rdparty/qwt/src |
58 |
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a |
59 |
+unix:INCLUDEPATH += /usr/include/qwt5 |
60 |
+unix:LIBS += -lqwt |
61 |
|
62 |
-unix:LIBS += -L/usr/lib$${libsuff} |
63 |
-unix:LIBS += -lgsl -lgslcblas -lz |
64 |
-### muparser 1.30 does not compile as a shared lib on Linux |
65 |
-unix:LIBS += -L/usr/local/lib$${libsuff} |
66 |
-unix:LIBS += /usr/local/lib/libmuparser.a |
67 |
-unix:INCLUDEPATH += /usr/local/include |
68 |
+unix:INCLUDEPATH += $$system(pkg-config --cflags gsl) |
69 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
70 |
+unix:LIBS += $$system(pkg-config --libs muparser) |
71 |
+unix:INCLUDEPATH += $$system(pkg-config --cflags muparser) |
72 |
+unix:LIBS += -lz |
73 |
|
74 |
############################################################################# |
75 |
### Link everything dynamically |
76 |
--- scidavis/sourcefiles.pri.orig 2009-03-31 17:15:04.000000000 +0100 |
77 |
+++ scidavis/sourcefiles.pri 2009-03-31 17:15:48.000000000 +0100 |
78 |
@@ -42,12 +42,8 @@ |
79 |
###################### DOCUMENTATION ######################################## |
80 |
|
81 |
documentation.files += ../manual/html \ |
82 |
- ../INSTALL.html \ |
83 |
../scidavis.css \ |
84 |
- ../scidavis-logo.png \ |
85 |
- ../README \ |
86 |
- ../CHANGES \ |
87 |
- ../gpl.txt |
88 |
+ ../scidavis-logo.png |
89 |
|
90 |
###################### DESKTOP INTEGRATION ################################## |