Apply patch for upstream bug 1089 to fix build with poppler 0.22.0

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 82 insertions, 18 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 77ac86896ecd..9f27d3e78f0d 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.49 2013/02/02 20:26:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.50 2013/02/06 12:57:25 gienah Exp $
+
+  06 Feb 2013; Mark Wright <gienah@gentoo.org>
+  +files/cups-filters-1.0.29-poppler-0.22.patch, cups-filters-1.0.29.ebuild:
+  Apply patch for upstream bug 1089 to fix build with poppler 0.22.0
 
 *cups-filters-1.0.29 (02 Feb 2013)
 
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 0169256010e6..32cc16bc634e 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,27 +4,18 @@ Hash: SHA256
 AUX cups-browsed.init.d 285 SHA256 df6b6282d073f074c1491cee5b343532d1cdf32dd7c5d9f8bd9ba058f630808a SHA512 799db5b57018ef66de954aa48820f794ff7b77d60c4ea056c8d8554e39b0b09b54fbe9e5d9fbc3258c25f8a3a94269a8318f2c992c67bcc6bdc935e910d0d9ab WHIRLPOOL 95eacb79e0c0467bc276e668ab5093eb6c287a31ade6f10cc3b73efc82f84c8ed9fd494821b849ffefa54b57d543c0f47f234d60a253c2ce833b68972810b4a6
 AUX cups-filters-1.0.24-rev7009.diff 623 SHA256 020b8140c96f548f4c8de6189fa4d61ea4bdc54c59759167d2ba697a97ea2262 SHA512 32279ce2d9b787bc5d3f8ca378c998749f1fba6bf3fb1384fd5f2f752cb753c780aa19777c759f29e46a7e92cc0085c47cdabb510d6090852446d4c2fa9c412d WHIRLPOOL 179d8712a5b1be5f73286b50bbb1902c9709ab4c4de0f41c7b1a8b31cae3c826911a7b96c27429b9157e722149f36697d12ba6c63fba903914c5fb5a1a61fa49
 AUX cups-filters-1.0.29-openrc.patch 1287 SHA256 5849051486df2a66e93335a7716026370053e577b2d458e93cac36bc43f4bc5a SHA512 432cdca199f01d57910e260c3eda57615dfa3608b7484c18c29b3c00a815aeb280369ae8192ac3f38f43082356bbaa697b9ae7f867cae2cd2bcf604b55206774 WHIRLPOOL 850396b3d6db72ed98a74c1462404f4b5c484ed49b2739a7b53e6458190ae5405930b04c930a6786d8723b50f9c6c171547542a4bcb77ae156d9cd3c826bf273
+AUX cups-filters-1.0.29-poppler-0.22.patch 2402 SHA256 a21ea426f26fb8149e9e1972514053a86cf5958c732857f451d3123a2c7e6c1e SHA512 da5c3a1d5b5f28e51544c81210d3fb557216f848a290699e5c500601a64ba91428d6ff3aaa406e970c3f8e401ae9d62cf18ff1645640bb3dd880ac446a2b8384 WHIRLPOOL 17167112e503aaf45ec41b2aefca97e914988ac9af67ba67774554604e9ee1c86e9046ca629284d62d32644a925e55463522d10a7ee6c37092a47400728e88f2
 DIST cups-filters-1.0.25.tar.xz 997012 SHA256 900cd31c5daa343ae247209cc748bb6c6d411de591ce703d2fb8dd95cf9c8ed5 SHA512 26f33d56ca7603ef776635bf9eebfb1abbb4d8cb1fd7cf0abc31f171597e4d5a37ce7a3e29dd5ffd00a3693ada251f86dad8575137affce38735c0e1a1b04d79 WHIRLPOOL a7cee77f3722ac37a8c3b227a745d61bacbf043dc44a53f23ffe8035345eed6229ba37f14a9e809a48953a28d64c4758bf0faf9e22d52089a7309552a5f5c964
 DIST cups-filters-1.0.29.tar.xz 1007112 SHA256 71e5c0cc23ffb200773ee8043f9e7dfee06378b03547d9da843d587c5d07f3c1 SHA512 a53ea0a4cc1673e0a4ec7da1273f3a750f006eb418cef708eea19ddcd66d134cd8c1e304b44b0c1d8ef7dd293f163947c5c8a7e9a890d1bd1f4a91d9508a0c4a WHIRLPOOL 76775c9d0fa779b9e09ca372292cfe4976bea4c390611b5560d0a09f17db8cf2982b0f55e9d1db14f73cf6f816c76b701b7a77d599f595bcdef62e0fc4c93b62
 EBUILD cups-filters-1.0.25.ebuild 1918 SHA256 75b97fb99d64f49ec61542178e56aa71d752f6e0f923c59f0a0ac6b8a9fceb37 SHA512 f9ac6c518e3ae534e139f01d631d20d32cf6e5c719845084b081405470841bd50cce501c822dc65d3bac71167f7cdd27c931bfc670a248ec9be8c4740b1d6a47 WHIRLPOOL 373e4873d6757cc7838615faf70022ccc11d4b960f6b5808fbecc75b1343a409be71048d809b0f613690346f9ae045094cc8af8804726a9940b5d1a2dd4fdaeb
-EBUILD cups-filters-1.0.29.ebuild 2572 SHA256 470cf2d5b50280c932fa41d6b75803077a65a70667c2d5185c2fd5d528d5cc21 SHA512 1d07650cbce340a09ee66d28d8564d6efc0ce32602fd8e0872175ebdf0a3b2d46355f751a12f05fab09b4816b59bc825d63790cdc5a68189387b580869b9b4ed WHIRLPOOL 5697103b703ab44a722c2b1d1e7b5844286eab96aa8ec6168c8296e692dd40fa82cb7cef9720b69ed0a37ba15d8360a1d4f85a66432c29c3ec8920a6067ee52d
+EBUILD cups-filters-1.0.29.ebuild 2615 SHA256 38f08eaaef9ae7266c54337f57a94f7e5860e26bcb98ceb9735f308d49ab596d SHA512 83e1ec6c08b125ef1927889ab2f3c61d9e2deb523e6f1ff98d7de2b5618121d0cfa223381916aab94c0311cb4b15923b1b542cea1ef55b07c0bb0fc494822599 WHIRLPOOL 5d171ca69c04086a1cf24746b903ee5f367be1f9c4b1466fe063b7e4c947af108d03c133a1835247655a3ded95eaad9da3c67e177b23afcd98a99533a1d4f779
 EBUILD cups-filters-9999.ebuild 2571 SHA256 9b31ad0587c87a71e8bb4b69dd1fcbccd21c7c06485fb15dede60bcdcbef9778 SHA512 fbdc35d38a198d166e771567bcefe864fbb44abafa84ec17df876534539c6f51ede2e13eddd3bba3f12e4c824688059ea0ac78d59819c66d3846956b8e00fd93 WHIRLPOOL 3c1c1a54fbd0b7f479b1faf42f0152244508c56fae0b32c8deaf1fe577fa105ce8a0077751b7ea26511fa8da28a0d3b90962761f758cb998c91f215adb2add46
-MISC ChangeLog 8496 SHA256 773a23f7ae5593d806ce23a5749ad3f9db6a428e7492a74352ff927a0cc8bd75 SHA512 d6c5790180f308585db579414719195ed9eb4bdd079f25a3e5d21fb60844b0d27fb4f4faf53b28060b010108e2f403d5c403e1d27e1ac49a82b494d698fcd4eb WHIRLPOOL b538e778ca0e0cb5d58379aa053d7a9eec9dd815c1df9951346cad2ae1d292529632d0a1997407b7413d6fc8e9b657f604644521651d3a05cd3a18d18c7ff3f4
+MISC ChangeLog 8687 SHA256 4c54170dd7159b552e6fc58825e739258bc2fd0eee3cf41233e99f30e9fc365a SHA512 bb9b299c79cbc954dd10cd610ce33a040dbee51a4ba07e0f20920bd0e63a68b5b8ac5823afd849526e4cc59220b156f7d6d9e48239d51539e23e839a2afcc507 WHIRLPOOL 13bf0fe87910ca0a9c9b6b26147e2a27dc744c03b966dd8d8ba3dad47cbb1332911b53d7ab23df3fb8344f1bd8f64b915642bd4efc6a3fe165e8e4bc4beb612f
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRDXZlAAoJENwGBM22xffemX4QAKV+SVYTReLi+2zKO7HtUPsW
-XcmDtRAQ7rDA59SWjiABDDBtd94CUIdszw1KMO+jHe62dbIO8SNWP8toJjECSLPI
-YxaRAUX18JwGBysFqqMXsy6ocn5vEffSwK0ZyBwh3tpOxigHdnwExFyhEODS9x6s
-usNABGXwKTwfsj9UzwT/OrdfF8xvGqRtzfg4NJehSGnTT7ZwzY42aAHrrkYz0+6B
-9Qm2RM4d5JWCk79pfjswO8wJp5nIGIsQyrM7N5WI7PEhECjosfabHGKBUc6ZlqHn
-doXyfXRZXo3hSa/w2GLaw88PEEcTRPKE/dMXOAJqR5IpMr5ZdhsjyZRCAJvnwjk5
-j0iaDEEptNTBWx3KwYqaTGDE9RTCl+kZ6LqMmm8PCS1Au1A1G/cweVlMAPx0K9k2
-DZPJJhoU45mAGQy8SfszOO0ghruYaMx48PD5HzbW5wt9mGF1e/j6Ymb8Qqe1Ohq3
-MacxZvcvw1qYbpsFLxluCBCNCgPR5OklCSzt+otKe+IWv5wBPMfdYWQPyQx/KR1O
-Gjt1niKpjMR83bvsf2GrCgTC5RDzsoL6OElkmYjVs0EGw1cd6DVHxMMFN0NYvvvW
-kGY+7D8hi8/2cd04sewhBVsVJsl3N6jqxAMz4b81XsuZIMy0vNiX2cnPLZ1xQrEe
-i6r2WKq5yTSLbzY3YYpg
-=fhPw
+iF4EAREIAAYFAlESU0gACgkQoBEVQmGOlx/5wwEAvN1Rc3MNRGF8grLZOuEoCX0r
+zVj4KfclfCU3PuXD2WkBANc0T9gDr/a4KaeFgknA/i3M+mAwCMC69FPJ0vGwd94L
+=T2eg
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.29.ebuild b/net-print/cups-filters/cups-filters-1.0.29.ebuild
index 5b5be4558554..bd7294bbae8f 100644
--- a/net-print/cups-filters/cups-filters-1.0.29.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.29.ebuild,v 1.1 2013/02/02 20:26:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.29.ebuild,v 1.2 2013/02/06 12:57:25 gienah Exp $
 
 EAPI=4
 
@@ -42,7 +42,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.29-openrc.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.0.29-openrc.patch"
+	"${FILESDIR}/${PN}-1.0.29-poppler-0.22.patch")
 
 src_prepare() {
 	base_src_prepare
diff --git a/net-print/cups-filters/files/cups-filters-1.0.29-poppler-0.22.patch b/net-print/cups-filters/files/cups-filters-1.0.29-poppler-0.22.patch
new file mode 100644
index 000000000000..5e8d76e3f819
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.0.29-poppler-0.22.patch
@@ -0,0 +1,68 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-01-10
+Initial Package Version: 1.0.29
+Upstream Status:         Fixed upstream
+Origin:                  Upstream
+Description:             Fixes building with Poppler >= 0.22.0
+
+=== modified file 'NEWS'
+--- NEWS	2013-01-02 18:23:25 +0000
++++ NEWS	2013-01-09 10:42:32 +0000
+@@ -1,6 +1,11 @@
+ NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
+ -----------------------------------------------------
+
++CHANGES IN V1.0.30
++
++	- pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
++	  from BBR Inc. (Bug #1089).
++
+ CHANGES IN V1.0.29
+
+	- Fixed ./configure option "--with-rcdir=no". Thanks to Jiri
+
+=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
+--- filter/pdftoopvp/OPVPOutputDev.cxx	2012-07-20 08:32:55 +0000
++++ filter/pdftoopvp/OPVPOutputDev.cxx	2013-01-09 10:42:32 +0000
+@@ -1804,8 +1804,14 @@
+   maskSplash = new Splash(maskBitmap, gFalse);
+   maskColor[0] = 0;
+   maskSplash->clear(maskColor);
++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+   maskSplash->drawImage(&imageSrc, &imgMaskData,
+			splashModeMono8, gFalse, maskWidth, maskHeight, mat);
++#else
++  maskSplash->drawImage(&imageSrc, &imgMaskData,
++			splashModeMono8, gFalse, maskWidth, maskHeight,
++                        mat,gFalse);
++#endif
+   delete imgMaskData.imgStr;
+   maskStr->close();
+   gfree(imgMaskData.lookup);
+
+=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
+--- filter/pdftoopvp/oprs/OPRS.cxx	2012-09-10 19:56:59 +0000
++++ filter/pdftoopvp/oprs/OPRS.cxx	2013-01-09 10:42:32 +0000
+@@ -5,6 +5,9 @@
+ //========================================================================
+
+ #include <config.h>
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -235,7 +238,11 @@
+			      SplashColorMode srcMode, GBool srcAlpha,
+			      int w, int h, SplashCoord *mat) {
+     if (rasterMode) {
++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
++#else
++	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
++#endif
+     } else {
+	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
+     }
+