Fix build with poppler-0.26, bug 509280

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

5 files changed, 171 insertions, 16 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 054f7f9ebfc6..2c0c1494af35 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.205 2014/03/05 11:26:30 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.206 2014/05/24 00:07:16 dilfridge Exp $
+
+  24 May 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  inkscape-0.48.4.ebuild, inkscape-0.48.4-r1.ebuild,
+  +files/inkscape-0.48.4-poppler26.patch:
+  Fix build with poppler-0.26, bug 509280
 
   05 Mar 2014; Chema Alonso <nimiux@gentoo.org> inkscape-0.48.4-r1.ebuild:
   Stable for amd64 wrt bug #492244
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 19fc3f2c3455..1cc16cfb1ea6 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -10,21 +10,30 @@ AUX inkscape-0.48.4-epython.patch 441 SHA256 279c1dd278bf69c69f4ac2351d8d069f08a
 AUX inkscape-0.48.4-fix-member-decl.patch 336 SHA256 f80b2a534f0455e2b90c35f369c09c8f8d5cca21f3908e27bdf9fcb0bc4098d4 SHA512 7286c58a666396ae6c9f5664493c512985429872f3da82ea6ae6af33b97dae60e01cd8cc6d23c2ae2fcfc716b287c06cdf634c8740f4f4e6773b3f44785f88d7 WHIRLPOOL 317e8f22c21266f67c9cd56f3755edb66797f1bbf1d48e9282a774ee9294df71872a87ea76e578505d6d932c8c210ddce66ac04cfc897128c16afb40f8bd34a9
 AUX inkscape-0.48.4-gc74-configure.patch 558 SHA256 1d378b0d90f2bde6469a040d61e3dbd8ecfcdf3b8c6c086b5dc8eb744918c20e SHA512 04254fcb2f910e73b30c85de5bed9009ec51dd8936eafa49909a90b8e7b44cdee79a73fca9d043a8659bbd551cc3db26f6dc9155849b6ff3df0d2f73bd4b163c WHIRLPOOL 5b74b3a9cea371f8ae862fba4c9848f13a4d450e1a253b789634b3bbe88df9d86e3e501da04805d3d755e613e8439d79c1ac7ff515a3693cafe615d62effe7c9
 AUX inkscape-0.48.4-gc74.patch 2131 SHA256 e9f308ea08b76af028184fd9e6a3228c7efa57b75697eb65bb0edbf7d6d12f4b SHA512 d4b3189b19c41dff5e835e3ca5454cec7f962cfd5c3bd4098f4346913029bb00d8d8f4b61e6fe056059b3f059c91c350b610cc4d85c830293b5d3ed31202a317 WHIRLPOOL 9ddf564290eb9e7f7b281233c6cac7f1b46fdf338d88a0af699dd48077f10289a482c21ede8f3ceac71cca080b20691dac449b53063805f3d7ababb6b87efdde
+AUX inkscape-0.48.4-poppler26.patch 4481 SHA256 fc07d1133ce703b4fc94706e2fe2377a7e58c216781d699360f8b58fa2787748 SHA512 4ed27cdaa2e0c48875942cf609ecb0de256c4fdb17aa30babc996b9113097032d789e4db957e2edcc6aa600b5148c08597dddd57a651a41949e4ae58d27aa22f WHIRLPOOL f973d7b80b106131cc48409bc27489c9ddaa12b52678bb1338acc0d0687e9ed1d2098ddefe3dd631770fd47a41a332d9288e373a9af3e6953472e1269845890d
 AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
 DIST inkscape-0.48.4-freetype251.patch 355 SHA256 dfbd16faa4f27559561e3bad79b7ecbb3ea7d4824223cbfe2e2c1c2f429ce663 SHA512 4b629974954a6228586a4ddff2a1107b170348d6aa2a5886bf8422c44826ea4b6e1eea2e4fb886a6153029b371a33f56d4a62ecbbcb3c705456cca893d1986b7 WHIRLPOOL 2e419a35993dca56d6b6def94d5f58aea4b56fc100aedf52fe8e2c79a8d93ea8fbbe097197e51b962f015564b2316ce1798771ad038cf1ae48759ea2de0c4751
 DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
-EBUILD inkscape-0.48.4-r1.ebuild 3142 SHA256 62109acddf67393a9a3c3ff7bf9dc3e53130fd1f2565d5a81a5bbc814324b31a SHA512 86fcc6f765609dcbb27e3ce90aef16e98da3411174bb09496ce71cb2567d369693d704781b91e64e87ae7be172ec50b59c78db73b893ba7d4390b438357f9359 WHIRLPOOL 4d157606cd8a6bad5a2910ba584641b877a8aeaaccf98a2cbf427d66893ce9c0b330a51514a42cfa42a2b1dedd60c77c86b7a99b57900f2ce5cccc71b9c2cc33
-EBUILD inkscape-0.48.4.ebuild 2587 SHA256 3802d97d446339961106577d5b1b7d5828d84fe377a635630c3b58596e635c50 SHA512 e979fa089a773fe5e07eca605036c58386a54f56daa3beda1d0b6c134a06b576df0a84e3cc2c4dd7aa7588424c6135440e4c4a45a2e90d15010e1d1dc38eebd0 WHIRLPOOL fb4d4dca9d58e576c87a45d05fb114f0416410bbd51d9eda51e64033b5c55d74e8db0505ba5a3f2b402aba0973825cebe69c8e06d72b5a5e3a551bcec9b0c945
-MISC ChangeLog 29077 SHA256 8c20f42852a1fe0bb7819b3614ed6bc2f1d5923959858e5e98781686c0f87091 SHA512 ca835a70e207f62802b58ee6666e621e737d3f9c28a26a65704932a40124519294ca4b1fe1cb1232a247f67a0970c2c0bbeef0a3ef290ea414c44eff4d16b2e0 WHIRLPOOL a895bc99fe9098640b764e0a6cf0f4705d2a210600f3c29a3aeb8d7cb46ab39dcab4f2447602741064ebceb9e41578e62d2333858315d11203ec7724497efd76
+EBUILD inkscape-0.48.4-r1.ebuild 3184 SHA256 2b2cfb8bfb4e001cd35d24545bfe25355efb27d314b278642520ef646390d2e5 SHA512 5487889978743e5e6b87b5e49bdda4d1265f2705b90039e93bbe887aad91c17afd10a0fb9f777e90184d2dbbe0ef3a4b564c93673bbc1d08be3594f5b3664861 WHIRLPOOL f83723b9d5a182e52adb39ae1a34737f9e5f624ee352a06d900a447748b7cc8808b73816ea5c3edabd223f5f56a35cf9998a6ce1cc2b4763bac38eea7cc98bc1
+EBUILD inkscape-0.48.4.ebuild 2626 SHA256 b7b296bdf6f7d2cb4db4e37eca4a197de03d29d06432b6629ed3145df316185c SHA512 d92b0273f29bc7323b280eedbb2fab7acc50b3a60a215b42c08ca77901dcda1452a0d21d66fc0ea8134487279d5063c2d8cf76dcb28da265ac4c82cc79fd46e4 WHIRLPOOL 30c48e6d9d253832964863117bb6f78922e19e5ae5b81988f4c0a7ec4d5dffabd217b9744cb4d933626341af630bdd6cd185405e9bf8b7242de589944a168e31
+MISC ChangeLog 29275 SHA256 8ef17282a6a2e68dd3fecd0463ebd932fd5144332270833d6bdd8eadbf5bbf30 SHA512 509a1d81f64fb79a70e486f64f3dd85318ae1ac1a09bd30e55165215a86176ff09d50b53664433f08eb077f47cc77a04a007c230a4749680bb38c501cfba1c06 WHIRLPOOL 923c420d4f4a49ec9ea65fb6ae3d7a3240d71170455d93edea0b97b88120577f1e740b3e999cd960512224c09848a356bf4c72a1f19d38918183780a93b76293
 MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTFwojAAoJEA2sAkrWKOU2XQ4IALJWxJS44jY3JD72+AkGJ3nr
-cfXrgmi5SGF1imOcTPlfkLM/MXITvgWGQ5RJCFiUOf0nFun8JssUDn7vFd28Unvy
-mtZM/3YMrF3w1c9NDyycsrgQX7OBUs7+wyjzLn/gNxKzyGVLZBW1lse5A1Gziwjn
-2QwO8hubAFS2cZzs5QvRKjtvPFWPnyNUn4mtnR6VA5xq5Rl3saIA2EGK5zJw9MOi
-TtWcQi0g+bkn/krjmNhy3CI4vdPPw8Nv2smUrhYQbwKJwUcvH9AG7SM4a+VaOken
-4x4kMnlE9AIo8tWBGhUh04NDpIGi5zBUVwy/MZYlj41nFUgGEXHbcigFQikbAxI=
-=wu08
+iQJ8BAEBCABmBQJTf+K7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc6ygQAMf0/MnpYu5+PelQ/lLTz0Vp
+ugkyAJaGSAWvGIMECkbFYS4han6V7QcOZEpVLzjz1xGJqQiLYm690nuHeSyyN658
+r3t9IW2JE8ENT3pPJuXJitEj5dGo9gnKC2a7GkuYdtubFW/8gu5gIdm71HKgq3Y/
+WD4PfWrjb2Gx7ZGv9q4WBLuXMSyhcCaMv3X8y6u/VIPbm8dKWxIiITpwuhBibM2k
+zUNPOuAYAdVIqO0uWu78M4G1DR/lpX+3xmDtQwMKRWDyvVdgLCR5UtyO7p1rqbFS
+BBj80PCtTWdIzyZVPnAXHptuxgPRM0yfjG1U3+5dkajJl8PjBv46+JY14liEdrHI
+IyVhsUTw/jE6UcStklGYIbD3FCio7u8TQegI+JcDNnumrFxu72AhBTnd2AaPa4Wo
+o+9HVzpthKTDrAAql8ceXBYn1krEYSg6KmSv4dDSCpw9SlWyoZi+L7vRQZzC0NWB
+72xaxSeAFhW/Lm0c9eh8yt8CdOkQR36HoaSIk95AffhhwQWNncV3XmvOO/4AZ1ZH
+P9Gu/SuvEgg7D+wWTaslldSxp45cj+Qb0IzRAgunpD0HOgWVEBhuivCMmNcDHrpS
+mweUxg2WsCfCKADl66pfekwY6RISHNoDwFQz9BP16Qebxz65qYhiw4sF3d0dxCXy
+sXMWS8C473VuYk8WyugM
+=Gbpg
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-poppler26.patch b/media-gfx/inkscape/files/inkscape-0.48.4-poppler26.patch
new file mode 100644
index 000000000000..af5189777d7f
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-poppler26.patch
@@ -0,0 +1,139 @@
+diff -ruN inkscape-0.48.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.48.4/src/extension/internal/pdfinput/pdf-parser.cpp
+--- inkscape-0.48.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp	2012-12-13 18:00:46.726633000 +0100
++++ inkscape-0.48.4/src/extension/internal/pdfinput/pdf-parser.cpp	2014-05-07 22:50:03.891488716 +0200
+@@ -56,6 +56,11 @@
+ #define M_PI 3.14159265358979323846
+ #endif
+ 
++#include "poppler-features.h"
++#if POPPLER_CHECK_VERSION(0, 26, 0)
++#define POPPLER_26
++#endif
++
+ //------------------------------------------------------------------------
+ // constants
+ //------------------------------------------------------------------------
+@@ -861,8 +866,12 @@
+ 	  isolated = knockout = gFalse;
+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
++#ifndef POPPLER_26
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
+ #else
++	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
++#endif
++#else
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5);
+ #endif
+ 	  }
+@@ -1085,9 +1094,17 @@
+   res->lookupColorSpace(args[0].getName(), &obj);
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+   if (obj.isNull()) {
++#ifndef POPPLER_26
+     colorSpace = GfxColorSpace::parse(&args[0], NULL);
++#else
++    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
++#endif
+   } else {
++#ifndef POPPLER_26
+     colorSpace = GfxColorSpace::parse(&obj, NULL);
++#else
++    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
++#endif
+   }
+ #else
+   if (obj.isNull()) {
+@@ -1120,9 +1137,17 @@
+   res->lookupColorSpace(args[0].getName(), &obj);
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+   if (obj.isNull()) {
++#ifndef POPPLER_26
+     colorSpace = GfxColorSpace::parse(&args[0], NULL);
++#else
++    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
++#endif
+   } else {
++#ifndef POPPLER_26
+     colorSpace = GfxColorSpace::parse(&obj, NULL);
++#else
++    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
++#endif
+   }
+ #else
+   if (obj.isNull()) {
+@@ -1213,7 +1238,11 @@
+     }
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+     if (args[numArgs-1].isName() &&
++#ifndef POPPLER_26
+ 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
++#else
++	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
++#endif
+       state->setFillPattern(pattern);
+       builder->updateStyle(state);
+     }
+@@ -1273,7 +1302,11 @@
+     }
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+     if (args[numArgs-1].isName() &&
++#ifndef POPPLER_26
+ 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
++#else
++	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
++#endif
+       state->setStrokePattern(pattern);
+       builder->updateStyle(state);
+     }
+@@ -1711,7 +1744,11 @@
+   GBool savedState = gFalse;
+ 
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
++#ifndef POPPLER_26
+   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
++#else
++  if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
++#endif
+     return;
+   }
+ #else
+@@ -2727,8 +2764,12 @@
+     }
+     if (!obj1.isNull()) {
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
++#ifndef POPPLER_26
+       colorSpace = GfxColorSpace::parse(&obj1, NULL);
+ #else
++      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
++#endif
++#else
+       colorSpace = GfxColorSpace::parse(&obj1);
+ #endif
+     } else if (csMode == streamCSDeviceGray) {
+@@ -2816,8 +2857,12 @@
+ 	}
+       }
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
++#ifndef POPPLER_26
+       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
+ #else
++      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
++#endif
++#else
+       maskColorSpace = GfxColorSpace::parse(&obj1);
+ #endif
+       obj1.free();
+@@ -3007,8 +3052,12 @@
+       transpGroup = gTrue;
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
++#ifndef POPPLER_26
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
+ #else
++	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
++#endif
++#else
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3);
+ #endif
+       }
diff --git a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
index 0ead1c0ab538..b13e18f8bdad 100644
--- a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.10 2014/03/05 11:26:30 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.11 2014/05/24 00:07:15 dilfridge Exp $
 
 EAPI=5
 
@@ -86,7 +86,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \
 		"${FILESDIR}"/${P}-gc74-configure.patch \
 		"${FILESDIR}"/${P}-gc74.patch \
-		"${DISTDIR}"/${P}-freetype251.patch
+		"${DISTDIR}"/${P}-freetype251.patch \
+		"${FILESDIR}"/${P}-poppler26.patch
 
 	sed -i \
 		-e "s#@EPYTHON@#${EPYTHON}#" \
diff --git a/media-gfx/inkscape/inkscape-0.48.4.ebuild b/media-gfx/inkscape/inkscape-0.48.4.ebuild
index ce018cf1501e..af1059f6db7f 100644
--- a/media-gfx/inkscape/inkscape-0.48.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.8 2013/09/22 10:30:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.9 2014/05/24 00:07:15 dilfridge Exp $
 
 EAPI=5
 
@@ -79,7 +79,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
 		"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
 		"${FILESDIR}"/${P}-python2.patch \
-		"${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch
+		"${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch \
+		"${FILESDIR}"/${P}-poppler26.patch
 
 	eautoreconf