diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-07-13 20:51:44 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-07-13 20:51:44 +0000 |
| commit | dcd16ffb79d1724f4c6c356fe5e59ebf281a174d (patch) | |
| tree | b74a814451e9e24205a6181ca786cdead12d4d87 /media-gfx/inkscape | |
| parent | x86 stable, bug #372391 (diff) | |
| download | gentoo-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')
| -rw-r--r-- | media-gfx/inkscape/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch | 25 | ||||
| -rw-r--r-- | media-gfx/inkscape/inkscape-0.48.2.ebuild | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog index a4bbec848d3a..e1cfdbbd46a2 100644 --- a/media-gfx/inkscape/ChangeLog +++ b/media-gfx/inkscape/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/inkscape # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.160 2011/07/11 19:53:24 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.161 2011/07/13 20:51:44 radhermit Exp $ + + 13 Jul 2011; Tim Harder <radhermit@gentoo.org> inkscape-0.48.2.ebuild, + +files/inkscape-0.48.2-libwpg.patch: + Fix issue when both slots of libwpg are installed (bug #363703). *inkscape-0.48.2 (11 Jul 2011) 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 diff --git a/media-gfx/inkscape/inkscape-0.48.2.ebuild b/media-gfx/inkscape/inkscape-0.48.2.ebuild index 3da41eee1014..a4fd47224f69 100644 --- a/media-gfx/inkscape/inkscape-0.48.2.ebuild +++ b/media-gfx/inkscape/inkscape-0.48.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.2.ebuild,v 1.1 2011/07/11 19:53:24 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.2.ebuild,v 1.2 2011/07/13 20:51:44 radhermit Exp $ EAPI=4 inherit eutils flag-o-matic autotools gnome2 @@ -84,7 +84,8 @@ src_prepare() { gnome2_src_prepare epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \ "${FILESDIR}"/${PN}-0.48.1-libpng15.patch \ - "${FILESDIR}"/${PN}-0.48.1-lcms.patch + "${FILESDIR}"/${PN}-0.48.1-lcms.patch \ + "${FILESDIR}"/${P}-libwpg.patch eautoreconf } |