Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/fityk/files: fityk-0.8.7-3rdparty.patch
Date: Mon, 22 Jun 2009 18:29:14
Message-Id: E1MIoGW-0005Xa-F6@stork.gentoo.org
1 bicatali 09/06/22 18:29:12
2
3 Added: fityk-0.8.7-3rdparty.patch
4 Log:
5 Version bump, thanks Michelangelo Scopelliti bug #27468
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sci-visualization/fityk/files/fityk-0.8.7-3rdparty.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/fityk/files/fityk-0.8.7-3rdparty.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/fityk/files/fityk-0.8.7-3rdparty.patch?rev=1.1&content-type=text/plain
13
14 Index: fityk-0.8.7-3rdparty.patch
15 ===================================================================
16 --- configure.ac~ 2009-06-11 04:40:18.000000000 +0200
17 +++ configure.ac 2009-06-18 21:32:55.000000000 +0200
18 @@ -119,9 +119,11 @@
19 if test "$enable_3rdparty" = "yes"; then
20 CPPFLAGS_3RDPARTY="-I\$(top_srcdir)/3rdparty -I\$(top_srcdir)/3rdparty/xylib"
21 XYLIB_LDADD="\$(top_builddir)/3rdparty/xylib/xylib/libxy.la"
22 + DIR_3RDPARTY=3rdparty
23 else
24 CPPFLAGS_3RDPARTY=
25 XYLIB_LDADD="-lxy"
26 + DIR_3RDPARTY=
27 fi
28
29
30 @@ -185,6 +187,7 @@
31 AC_SUBST(PYBINDINGDIR)
32 AC_SUBST(CPPFLAGS_3RDPARTY)
33 AC_SUBST(XYLIB_LDADD)
34 +AC_SUBST(DIR_3RDPARTY)
35 AC_SUBST(LIBRARY_VERSION_FLAG)
36
37 # check for erf and erfc function
38 --- Makefile.am~ 2009-06-10 13:28:40.000000000 +0200
39 +++ Makefile.am 2009-06-18 21:43:32.000000000 +0200
40 @@ -6,6 +6,7 @@
41 macosx/fityk.icns
42 AUTOMAKE_OPTIONS = dist-bzip2
43 SUBDIRS = @DOC@ 3rdparty src samples config @PYBINDINGDIR@
44 +SUBDIRS = @DOC@ @DIR_3RDPARTY@ src samples config @PYBINDINGDIR@
45
46 icondir = $(datadir)/pixmaps
47 desktopdir = $(datadir)/applications