Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/gsim/files: gsim-21.3-build.conf.patch
Date: Sat, 09 Nov 2013 11:23:31
Message-Id: 20131109112326.43A0120005@flycatcher.gentoo.org
1 jlec 13/11/09 11:23:26
2
3 Added: gsim-21.3-build.conf.patch
4 Log:
5 sci-chemistry/gsim: Vesion Bump
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
8
9 Revision Changes Path
10 1.1 sci-chemistry/gsim/files/gsim-21.3-build.conf.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gsim/files/gsim-21.3-build.conf.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gsim/files/gsim-21.3-build.conf.patch?rev=1.1&content-type=text/plain
14
15 Index: gsim-21.3-build.conf.patch
16 ===================================================================
17 gsim.pro | 23 ++++++++++++++---------
18 1 file changed, 14 insertions(+), 9 deletions(-)
19
20 diff --git a/gsim.pro b/gsim.pro
21 index f88dc8a..579a91c 100755
22 --- a/gsim.pro
23 +++ b/gsim.pro
24 @@ -10,27 +10,32 @@
25
26 #Uncomment next line if you want to use EMF output
27 #EMF output requires libEMF or Wine on X11 systems and MAC(?)
28 -CONFIG+=use_emf
29 +#CONFIG+=use_emf
30
31 #DO NOT UNCOMMENT NEXT LINE. The scripting possibilty won't work at the moment
32 #CONFIG+=use_script
33
34 # Change directories locations for libcmatrix, MinUIT and muParser libraries
35 -unix:INCLUDEPATH += /home/dch0ph/libcmatrixR3nosse/include \
36 - /home/dch1vz/Minuit2/include \
37 - /home/dch1vz/muparser/include
38 +#unix:INCLUDEPATH += /home/dch0ph/libcmatrixR3nosse/include \
39 +# /home/dch1vz/Minuit2/include \
40 +# /home/dch1vz/muparser/include
41
42 win32:INCLUDEPATH += "C:\gsim\libcmatrixR3_qt4\include" "C:\gsim\Minuit2_qt4\include" "C:\gsim\muparser_qt4\include"
43
44 -unix:LIBS += -lcmatrix -L/home/dch0ph/libcmatrixR3nosse/lib -lMinuit2Base -L/home/dch1vz/Minuit2/lib -L/home/dch1vz/muparser/lib -lmuparser
45 +#unix:LIBS += -lcmatrix -L/home/dch0ph/libcmatrixR3nosse/lib -lMinuit2Base -L/home/dch1vz/Minuit2/lib -L/home/dch1vz/muparser/lib -lmuparser
46
47 win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3_qt4\lib" -lMinuit2 -L"C:\gsim\Minuit2_qt4\lib" -L"C:\gsim\muparser_qt4\lib" -lmuparser
48
49 #Change directories location for libEMF (if used)
50 -use_emf {
51 - DEFINES+=USE_EMF_OUTPUT
52 - unix:LIBS +=-lEMF -L/usr/include/libEmf
53 - win32:LIBS +=-lgdi32
54 +#use_emf {
55 +# DEFINES+=USE_EMF_OUTPUT
56 +# unix:LIBS +=-lEMF -L/usr/include/libEmf
57 +# win32:LIBS +=-lgdi32
58 +#}
59 +
60 +GSIM_ROOT = .
61 +!include( $$GSIM_ROOT/build.conf ) {
62 + message( "You need a build.conf file with local settings!" )
63 }
64
65 #################################################################################################