summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-05-01 13:33:23 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-05-01 13:33:23 +0000
commit61c72fbc3202b721603fb171fcae960f4a21c95b (patch)
treed8e261f96ef7ee441ce9b87cfc5b290f9e896a80 /media-gfx/inkscape/files
parentold (diff)
downloadgentoo-2-61c72fbc3202b721603fb171fcae960f4a21c95b.tar.gz
gentoo-2-61c72fbc3202b721603fb171fcae960f4a21c95b.tar.bz2
gentoo-2-61c72fbc3202b721603fb171fcae960f4a21c95b.zip
convert to python-single-r1 wrt #467234 and fix build with automake-1.13 wrt #467228
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'media-gfx/inkscape/files')
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch21
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.4-epython.patch11
2 files changed, 32 insertions, 0 deletions
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch b/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch
new file mode 100644
index 000000000000..6d649da99dea
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.3.patch
@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Apr 25 15:06:01 UTC 2013
+Subject: fix building with automake-1.3
+
+--- inkscape-0.48.4/configure.ac
++++ inkscape-0.48.4/configure.ac
+@@ -21,12 +21,12 @@
+ export CC CXX
+ ])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_LANG(C++)
+ AC_ISC_POSIX
+ AC_PROG_CXX
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ AM_PROG_AS
+ AC_PROG_RANLIB
+ AC_PROG_INTLTOOL(0.22)
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch b/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch
new file mode 100644
index 000000000000..2e2483c1b1e3
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch
@@ -0,0 +1,11 @@
+--- inkscape-0.48.4/src/extension/implementation/script.cpp
++++ inkscape-0.48.4/src/extension/implementation/script.cpp
+@@ -89,7 +89,7 @@
+ #ifdef WIN32
+ {"python", "python-interpreter", "pythonw" },
+ #else
+- {"python", "python-interpreter", "python" },
++ {"python", "python-interpreter", "@EPYTHON@" },
+ #endif
+ {"ruby", "ruby-interpreter", "ruby" },
+ {"shell", "shell-interpreter", "sh" },