Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/inkscape/files: inkscape-0.48.4-automake-1.3.patch inkscape-0.48.4-epython.patch
Date: Wed, 01 May 2013 13:33:28
Message-Id: 20130501133323.2F1EF2171E@flycatcher.gentoo.org
1 hasufell 13/05/01 13:33:23
2
3 Added: inkscape-0.48.4-automake-1.3.patch
4 inkscape-0.48.4-epython.patch
5 Log:
6 convert to python-single-r1 wrt #467234 and fix build with automake-1.13 wrt #467228
7
8 (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
9
10 Revision Changes Path
11 1.1 media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch?rev=1.1&content-type=text/plain
15
16 Index: inkscape-0.48.4-automake-1.3.patch
17 ===================================================================
18 From: Julian Ospald <hasufell@g.o>
19 Date: Thu Apr 25 15:06:01 UTC 2013
20 Subject: fix building with automake-1.3
21
22 --- inkscape-0.48.4/configure.ac
23 +++ inkscape-0.48.4/configure.ac
24 @@ -21,12 +21,12 @@
25 export CC CXX
26 ])
27
28 -AM_CONFIG_HEADER(config.h)
29 +AC_CONFIG_HEADERS(config.h)
30
31 AC_LANG(C++)
32 AC_ISC_POSIX
33 AC_PROG_CXX
34 -AM_PROG_CC_STDC
35 +AC_PROG_CC
36 AM_PROG_AS
37 AC_PROG_RANLIB
38 AC_PROG_INTLTOOL(0.22)
39
40
41
42 1.1 media-gfx/inkscape/files/inkscape-0.48.4-epython.patch
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch?rev=1.1&content-type=text/plain
46
47 Index: inkscape-0.48.4-epython.patch
48 ===================================================================
49 --- inkscape-0.48.4/src/extension/implementation/script.cpp
50 +++ inkscape-0.48.4/src/extension/implementation/script.cpp
51 @@ -89,7 +89,7 @@
52 #ifdef WIN32
53 {"python", "python-interpreter", "pythonw" },
54 #else
55 - {"python", "python-interpreter", "python" },
56 + {"python", "python-interpreter", "@EPYTHON@" },
57 #endif
58 {"ruby", "ruby-interpreter", "ruby" },
59 {"shell", "shell-interpreter", "sh" },