add patch from fedora to build with poppler-0.12.3 wrt bug #301250

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 136 insertions, 5 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index aedabc8ec7b1..992d2b8cdaee 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.134 2010/01/14 06:58:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.135 2010/01/31 12:32:21 maekke Exp $
+
+  31 Jan 2010; Markus Meier <maekke@gentoo.org> inkscape-0.47.ebuild,
+  +files/inkscape-0.47-poppler.patch:
+  add patch from fedora to build with poppler-0.12.3 wrt bug #301250
 
   14 Jan 2010; Jeroen Roovers <jer@gentoo.org> inkscape-0.47.ebuild:
   Stable for HPPA (bug #299480).
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 5bf76bebeb16..44411ea6353b 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX inkscape-0.46-bug-174720-0.patch 908 RMD160 ea73954482813cac9644d7dbe99c2f27d1ed9722 SHA1 354f42f93974519391492cda599887dbf89f24ea SHA256 0c42debc80f1cbc254a49f3a737bbadaa8a975d81a850b2448bd1267500ee66e
 AUX inkscape-0.46-bug-174720-1.patch 862 RMD160 c356fe9abfcc79575dcfe58b13240a7ad3939a00 SHA1 b6d3e2f821f0dc877ccb1ff3c5f751406daff767 SHA256 e038344cdb69176eaba5ff5f67e5eea5690608bd69e5b5e4e47b491d55a82394
 AUX inkscape-0.46-bug-214171.patch 952 RMD160 a946a3c2c191fe981c7756ffb9344c8da11f5291 SHA1 c7e492fcbebc8a417e61eb56f8bc70fe2e78eab5 SHA256 e4d74045d8e30289d6d7095461dbe3df083fd4fbc664f1944763bb6e71170226
@@ -6,9 +9,17 @@ AUX inkscape-0.46-gcc44.patch 6201 RMD160 692cd77ea2a25902f606a6dd033b355fc4ed08
 AUX inkscape-0.46-gcc44_p2.patch 1296 RMD160 3c3125bb92856e4f939328849dfef222a3a660ae SHA1 c20cb7caee6f9e27dac77ec3d0fea595e6ffec1c SHA256 35b8f651267431fc8b47bceb9edc6d0e9d9d985d752c40e3593f08e888b3da2e
 AUX inkscape-0.46-glibc2.10.patch 4634 RMD160 d63d5e29efeda9412c37890664da8b788fb8bd9c SHA1 b9078c7c7c8c6654ec646997436b3e78ffc0927e SHA256 4e966730323ef663612c22ab428b0347189812d9db012b8d702730452d5115a1
 AUX inkscape-0.46-poppler-0.8.3.patch 1571 RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c
+AUX inkscape-0.47-poppler.patch 3733 RMD160 6fad5479d59f1742216fe673e80dac2b420f768e SHA1 de0d3ab2b55bc0c63ef725bad90bd78258b76bc5 SHA256 43f0e3202e179599719e1a857ae319e332dad082bd8ab64c686a00979174c000
 DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
 DIST inkscape-0.47.tar.gz 28044445 RMD160 58fe20b2a103bd8909e27811354e1a3700dcd177 SHA1 aa39d5f7306edb21be4987651041bf50c13baf75 SHA256 e5899be10183d86249516a29bc146706600ae5eafb5be5274c465a8029659b97
 EBUILD inkscape-0.46-r5.ebuild 2450 RMD160 2c32b0094af219fb7d68d1e5a9182893f176421d SHA1 848945c00e65ab715c39255a63f221bb8e27fff1 SHA256 bcca3833135d54b96756ff7b1481641ce02e46d24285119c41003b1513f471c7
-EBUILD inkscape-0.47.ebuild 2264 RMD160 44264fdf55c8afa561b5ef0681614be984a5cf1f SHA1 00dad245e33c124b8fea8a80cf53a8b826237014 SHA256 8d5e958da7f732ae95dfc89e8776b456d654d457003eded4933bc5b85dae0426
-MISC ChangeLog 18174 RMD160 662858e35b6cf86e59b192b38d85b922b6e9e936 SHA1 074df9ecdc0934e4ce261857ff55d1ab68c6364b SHA256 9bfc6d96ee917cf6b1c6fed09aa6cf9c4370ab1c2fa034aae822d6c4e94b78cd
+EBUILD inkscape-0.47.ebuild 2355 RMD160 a3057deae587b20b0a4d7be51f95d0f3f7cc4dc6 SHA1 2e86efc9fb3fa9636945081bb4145aa57ca07509 SHA256 373d43ad6ef5565aa45e049bddff926ba7a913259ed2532a951ae24e238d5d64
+MISC ChangeLog 18355 RMD160 459cc0480b4e91a1e13dc44b1363ea5c5296416e SHA1 b5773376933c0bbfba329a2b45b45f84928ca2d4 SHA256 c76212b120ba9b45140435eb5e7705045932ae83aa8a3ff0c2e3734f3772ec67
 MISC metadata.xml 458 RMD160 90cb8f8058926fe666fc2dbec1af647248210f6c SHA1 9af2ef1f67bb9be6e9eecb2dc2f70badeb6277b1 SHA256 52763c744f2f6615fd6f900c3843356432ead07777ebdb548836b1e4fbed20ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktleKYACgkQkKaRLQcq0GKXPwCfdiiiugJ9bc+gk4O3Dfd3P8Or
+UKkAn0+i4VX+/0OpF8JoE2PKY5HIPR3j
+=XkM8
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.47-poppler.patch b/media-gfx/inkscape/files/inkscape-0.47-poppler.patch
new file mode 100644
index 000000000000..304ecc8e0dc5
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.47-poppler.patch
@@ -0,0 +1,110 @@
+Fix Rawhide build (more recent poppler)
+
+Lubomir Rintel <lkundrak@v3.sk>
+
+
+Index: inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp
+===================================================================
+--- inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp	(revision 22620)
++++ inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp	(working copy)
+@@ -56,6 +56,13 @@
+ #define M_PI 3.14159265358979323846
+ #endif
+ 
++#include <glib/poppler-features.h>
++#if POPPLER_CHECK_VERSION(0,12,2)
++#define PGFX ,NULL
++#else
++#define PGFX
++#endif
++
+ //------------------------------------------------------------------------
+ // constants
+ //------------------------------------------------------------------------
+@@ -809,7 +816,7 @@
+ 	  blendingColorSpace = NULL;
+ 	  isolated = knockout = gFalse;
+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+-	    blendingColorSpace = GfxColorSpace::parse(&obj5);
++	    blendingColorSpace = GfxColorSpace::parse(&obj5 PGFX);
+ 	  }
+ 	  obj5.free();
+ 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
+@@ -1009,9 +1016,9 @@
+   state->setFillPattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+   if (obj.isNull()) {
+-    colorSpace = GfxColorSpace::parse(&args[0]);
++    colorSpace = GfxColorSpace::parse(&args[0] PGFX);
+   } else {
+-    colorSpace = GfxColorSpace::parse(&obj);
++    colorSpace = GfxColorSpace::parse(&obj PGFX);
+   }
+   obj.free();
+   if (colorSpace) {
+@@ -1032,9 +1039,9 @@
+   state->setStrokePattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+   if (obj.isNull()) {
+-    colorSpace = GfxColorSpace::parse(&args[0]);
++    colorSpace = GfxColorSpace::parse(&args[0] PGFX);
+   } else {
+-    colorSpace = GfxColorSpace::parse(&obj);
++    colorSpace = GfxColorSpace::parse(&obj PGFX);
+   }
+   obj.free();
+   if (colorSpace) {
+@@ -1101,7 +1108,7 @@
+       builder->updateStyle(state);
+     }
+     if (args[numArgs-1].isName() &&
+-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++	(pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
+       state->setFillPattern(pattern);
+       builder->updateStyle(state);
+     }
+@@ -1145,7 +1152,7 @@
+       builder->updateStyle(state);
+     }
+     if (args[numArgs-1].isName() &&
+-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++	(pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
+       state->setStrokePattern(pattern);
+       builder->updateStyle(state);
+     }
+@@ -1543,7 +1550,7 @@
+   double *matrix = NULL;
+   GBool savedState = gFalse;
+ 
+-  if (!(shading = res->lookupShading(args[0].getName()))) {
++  if (!(shading = res->lookupShading(args[0].getName() PGFX))) {
+     return;
+   }
+ 
+@@ -2507,7 +2514,7 @@
+       }
+     }
+     if (!obj1.isNull()) {
+-      colorSpace = GfxColorSpace::parse(&obj1);
++      colorSpace = GfxColorSpace::parse(&obj1 PGFX);
+     } else if (csMode == streamCSDeviceGray) {
+       colorSpace = new GfxDeviceGrayColorSpace();
+     } else if (csMode == streamCSDeviceRGB) {
+@@ -2592,7 +2599,7 @@
+ 	  obj2.free();
+ 	}
+       }
+-      maskColorSpace = GfxColorSpace::parse(&obj1);
++      maskColorSpace = GfxColorSpace::parse(&obj1 PGFX);
+       obj1.free();
+       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
+ 	goto err1;
+@@ -2767,7 +2774,7 @@
+     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+       transpGroup = gTrue;
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+-	blendingColorSpace = GfxColorSpace::parse(&obj3);
++	blendingColorSpace = GfxColorSpace::parse(&obj3 PGFX);
+       }
+       obj3.free();
+       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
diff --git a/media-gfx/inkscape/inkscape-0.47.ebuild b/media-gfx/inkscape/inkscape-0.47.ebuild
index 86af877bfbe8..cb8c23f84e3b 100644
--- a/media-gfx/inkscape/inkscape-0.47.ebuild
+++ b/media-gfx/inkscape/inkscape-0.47.ebuild
@@ -1,9 +1,9 @@
 # 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.47.ebuild,v 1.8 2010/01/14 06:58:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.47.ebuild,v 1.9 2010/01/31 12:32:21 maekke Exp $
 
 EAPI=2
-inherit gnome2
+inherit eutils gnome2
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P}"
@@ -76,6 +76,12 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README*"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-poppler.patch
+
+	gnome2_src_prepare
+}
+
 pkg_postinst() {
 	elog "local configurations (also includes extensions) are moved from"
 	elog "\${HOME}/.inkscape to \${HOME}/.config/inkscape within"