inkscape poppler 0.16 fix

Package-Manager: portage-2.1.9.26/cvs/Linux x86_64

4 files changed, 117 insertions, 5 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 13c462c2aad7..50aae8cd3d38 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.150 2010/12/28 01:44:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.151 2010/12/28 10:48:32 hanno Exp $
+
+  28 Dec 2010; Hanno Boeck <hanno@gentoo.org> inkscape-0.48.0.ebuild,
+  +files/inkscape-0.48.0-poppler-0.16.patch:
+  Upstream fix for poppler 0.16.
 
   28 Dec 2010; Brent Baude <ranger@gentoo.org> inkscape-0.48.0.ebuild:
   stable ppc64, bug 343371
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index c0155a03b681..e4e93144f4c4 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX inkscape-0.47-gcc45.patch 4797 RMD160 c6f254b0b2bc1f7ae0e29a6952b9f13516385fc8 SHA1 68f66a3c152e1b472f9505dbac354f86a9059ee3 SHA256 49834c862d145c88d82ea016b0c6a274cf935c10d80bd2aefe45c4a8336d214f
 AUX inkscape-0.47-poppler.patch 3733 RMD160 6fad5479d59f1742216fe673e80dac2b420f768e SHA1 de0d3ab2b55bc0c63ef725bad90bd78258b76bc5 SHA256 43f0e3202e179599719e1a857ae319e332dad082bd8ab64c686a00979174c000
+AUX inkscape-0.48.0-poppler-0.16.patch 2643 RMD160 31ca9704d9df32d9534acace96889782ad4b7e13 SHA1 c3f1821740ed638d2de886a4e7825962c947ac89 SHA256 7e240c3af06daa171c42f0dbca19e5ada05877c8127c7be9129804e053a320c4
 AUX inkscape-0.48.0-spell.patch 1815 RMD160 b2b0d777467da3878074734499f96c8bead465cb SHA1 5b68841610b1e7f12c61c88d3df842f679293abd SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f
 DIST inkscape-0.47.tar.gz 28044445 RMD160 58fe20b2a103bd8909e27811354e1a3700dcd177 SHA1 aa39d5f7306edb21be4987651041bf50c13baf75 SHA256 e5899be10183d86249516a29bc146706600ae5eafb5be5274c465a8029659b97
 DIST inkscape-0.48.0.tar.gz 25870275 RMD160 0d97c17136fe69a2248bb4cf4d2f6296ce18c37f SHA1 220ade981069a91d3afab9cbff75f65c75119da2 SHA256 0812f6ca63aa7c4bb236c932a02bd4e0cb5209404bb42cff5f65ad0f84844176
 EBUILD inkscape-0.47.ebuild 2479 RMD160 0055626ac80a30c35d649dc12e59526b5a286c8a SHA1 3c3be186ddc26cd1a855277ac4231234256cd988 SHA256 538252e40c2bf2bededddbe5564a3628bc13fd3db15831aee85249a9ed429547
-EBUILD inkscape-0.48.0.ebuild 2514 RMD160 8e084150bbeb2e11321f808bcf703b3a592a0c5f SHA1 3fb170f321d4ea536c7c43bc8c629f3414ceef78 SHA256 be467ac2f7c82328df69604ad2a2a83b7a38ee4d6b4fa1b170ef3fb2c682ac7b
-MISC ChangeLog 20726 RMD160 98a9a6181de73ec9e45cb6dde93c38b4d6400a38 SHA1 6942d2171b9b45f2ed01488799534039d309220e SHA256 981fd048d3b39914e8e4bb33a8e5468301b7477fcb5eec154cd58a4ec6b030c2
+EBUILD inkscape-0.48.0.ebuild 2669 RMD160 9509d97354c1c2d0a6c8537893c493c636a2fd71 SHA1 fade0c6c24c06e04eddbe3c0116b777d67c9c6ee SHA256 52eca062c4c66bbe27f859f5ab534b6f627a7f6fbf6817d9da6dace77887d141
+MISC ChangeLog 20874 RMD160 72a4f20e34c1c61b48875eb7006f633b2da22db7 SHA1 927d93591ea238f00c0d52cbc379fd9b9ffa757d SHA256 e6889865a47805856822ff74e0d1d702e7d5d875f11d4c8a64a4d0954d2d5ec7
 MISC metadata.xml 438 RMD160 255e104540381e2eda4bee5e06d13a3e5f9cd978 SHA1 8364d93a2a793fea4d5ace199ac7c25c67e896ab SHA256 d033e82cb1e2d7055baf12ffa4c1a21cfc79d3d45373c122ebf39d4c856437f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0ZwIYACgkQr2QksT29OyA1/wCgjaSGcj1zAE6cYsyDxluZs3sc
+QOkAnRsZT0jrAF9LZVkbwIr5hut9BLo2
+=FYrU
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-poppler-0.16.patch b/media-gfx/inkscape/files/inkscape-0.48.0-poppler-0.16.patch
new file mode 100644
index 000000000000..25327d9d1736
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.0-poppler-0.16.patch
@@ -0,0 +1,93 @@
+=== modified file 'configure.ac'
+--- configure.ac	2010-11-15 01:32:59 +0000
++++ configure.ac	2010-11-21 12:38:01 +0000
+@@ -611,11 +611,12 @@
+ 	AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Use GfxFont from Poppler >= 0.8.3])
+ fi
+ 
+-AC_MSG_CHECKING(for new color space API in Poppler)
+ ink_svd_CPPFLAGS=$CPPFLAGS
+ ink_svd_LIBS=$LIBS
+ CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+ LIBS="$LIBS $POPPLER_LIBS"
++
++AC_MSG_CHECKING(for new color space API in Poppler)
+ popplercolor="no"
+ AC_COMPILE_IFELSE([
+ #include <GfxState.h>
+@@ -627,16 +628,36 @@
+   return 0;
+ }
+ ], [popplercolor=yes])
++if test "x$popplercolor" = "xyes"; then
++	AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
++	AC_MSG_RESULT(yes)
++else
++	AC_MSG_RESULT(no)
++fi
++
++# Poppler's b604a008 commit changes this
++AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
++popplergfxcolor="no"
++AC_COMPILE_IFELSE([
++#include <GfxState.h>
++
++int main() {
++  GfxPatch::ColorValue color = {c: {0}};
++  GfxPatch patch;
++  patch.color[[0]][[0]] = color;
++  return 0;
++}
++], [popplergfxcolor=yes])
++if test "x$popplergfxcolor" = "xyes"; then
++	AC_DEFINE(POPPLER_NEW_GFXPATCH, 1, [GfxPatch no longer uses GfxColor in >= 0.15.1])
++	AC_MSG_RESULT(yes)
++else
++	AC_MSG_RESULT(no)
++fi
++
+ CPPFLAGS=$ink_svd_CPPFLAGS
+ LIBS=$ink_svd_LIBS
+ 
+-if test "x$popplercolor" = "xyes"; then
+-	AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
+-	AC_MSG_RESULT(yes)
+-else
+-	AC_MSG_RESULT(no)
+-fi
+-
+ dnl ******************************
+ dnl Inkboard dependency checking
+ dnl ******************************
+
+=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
+--- src/extension/internal/pdfinput/pdf-parser.cpp	2010-03-21 01:53:59 +0000
++++ src/extension/internal/pdfinput/pdf-parser.cpp	2010-11-21 12:38:01 +0000
+@@ -1874,6 +1874,9 @@
+ 
+ void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
+   GfxPatch patch00, patch01, patch10, patch11;
++#ifdef POPPLER_NEW_GFXPATCH
++  GfxColor color;
++#endif
+   double xx[4][8], yy[4][8];
+   double xxm, yym;
+   double patchColorDelta = colorDeltas[pdfPatchMeshShading-1];
+@@ -1890,9 +1893,16 @@
+ 	  > patchColorDelta) {
+       break;
+     }
++#ifdef POPPLER_NEW_GFXPATCH
++    color.c[i] = GfxColorComp(patch->color[0][0].c[i]);
++#endif
+   }
+   if (i == nComps || depth == maxDepths[pdfPatchMeshShading-1]) {
++#ifdef POPPLER_NEW_GFXPATCH
++    state->setFillColor(&color);
++#else
+     state->setFillColor(&patch->color[0][0]);
++#endif
+     state->moveTo(patch->x[0][0], patch->y[0][0]);
+     state->curveTo(patch->x[0][1], patch->y[0][1],
+ 		   patch->x[0][2], patch->y[0][2],
+
diff --git a/media-gfx/inkscape/inkscape-0.48.0.ebuild b/media-gfx/inkscape/inkscape-0.48.0.ebuild
index 42f1692b6675..362ea98452d2 100644
--- a/media-gfx/inkscape/inkscape-0.48.0.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.0.ebuild,v 1.8 2010/12/28 01:44:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.0.ebuild,v 1.9 2010/12/28 10:48:32 hanno Exp $
 
 EAPI=2
 inherit eutils flag-o-matic autotools gnome2
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.inkscape.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc x86"
 IUSE="dia gnome gs inkjar lcms nls spell wmf"
 
 RESTRICT="test"
@@ -81,6 +81,10 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 	epatch "${FILESDIR}"/${P}-spell.patch
+
+	# Upstream commit:
+	# http://bazaar.launchpad.net/~inkscape.dev/inkscape/RELEASE_0_48_BRANCH/revision/9727
+	epatch "${FILESDIR}"/${P}-poppler-0.16.patch
 	eautoreconf
 }