summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-07-13 20:51:44 +0000
committerTim Harder <radhermit@gentoo.org>2011-07-13 20:51:44 +0000
commitdcd16ffb79d1724f4c6c356fe5e59ebf281a174d (patch)
treeb74a814451e9e24205a6181ca786cdead12d4d87 /media-gfx/inkscape/files
parentx86 stable, bug #372391 (diff)
downloadgentoo-2-dcd16ffb79d1724f4c6c356fe5e59ebf281a174d.tar.gz
gentoo-2-dcd16ffb79d1724f4c6c356fe5e59ebf281a174d.tar.bz2
gentoo-2-dcd16ffb79d1724f4c6c356fe5e59ebf281a174d.zip
Fix issue when both slots of libwpg are installed (bug #363703).
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/inkscape/files')
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch b/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch
new file mode 100644
index 000000000000..998ce41ab3ab
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch
@@ -0,0 +1,25 @@
+--- inkscape-0.48.2/configure.ac.orig
++++ inkscape-0.48.2/configure.ac
+@@ -713,14 +713,14 @@
+
+ with_libwpg=no
+
+-PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
+-if test "x$with_libwpg01" = "xyes"; then
+- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
+- with_libwpg=yes
+- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
+- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
+-fi
+-AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
++#PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
++#if test "x$with_libwpg01" = "xyes"; then
++# AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
++# with_libwpg=yes
++# AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
++# AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
++#fi
++#AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
+
+ PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
+ if test "x$with_libwpg02" = "xyes"; then