Add hack to make cups-filters build against Poppler 0.34. Partly disables color management, we need a better solution on the long run.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 63 insertions, 9 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 31230e375f66..727b10de12e2 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.158 2015/07/09 18:23:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.159 2015/07/14 17:08:24 dilfridge Exp $
+
+  14 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/cups-filters-1.0.71-poppler0340.patch, cups-filters-1.0.71.ebuild:
+  Add hack to make cups-filters build against Poppler 0.34. Partly disables
+  color management, we need a better solution on the long run.
 
   09 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> cups-filters-1.0.71.ebuild:
   arm stable wrt bug #553836
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 106ed3f90a6b..047b4abd8701 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -5,6 +5,7 @@ AUX cups-browsed.init.d 399 SHA256 d4d27c920ab062532755b553544ff3ef4d561d03bda07
 AUX cups-browsed.service 225 SHA256 f4cd6ac0da207deb3b9991264fcb8d3468ae7c5c4fcd1957d296d344fd9e3d44 SHA512 16d7a8b0c95827582706764ca6f96720561e8c314929f6d53c98dccb68b6df21d5928949b0aaf7c2f738ab5c07ee2678d643b9acb6b581bb77a67db950082cdb WHIRLPOOL d1606f5ebfc84398502282e9c1e42bed6701f2d4e284f1214ef924aa94fe2be3e169d83f9d9fdd34a817514df35e680f38b3e91fb7e965510621e3fad8002f14
 AUX cups-filters-1.0.53-uclibc.patch 445 SHA256 816b7f2b342ae97f0494344467a46b0cb7d8c3cf255f83ae04cfa934d55c3cde SHA512 9a729d4c775b5d4e0afae571286ac049db197d5f1b1b99237af557b4ee51f7d0d80a8629d7bb8f32e3fad914c38fdf106c6817245acc6dfcbb31d35a12cc4bf3 WHIRLPOOL 79dbaf986b3f6dc4b2f2e60de00c4766cf67246e78c67a4080424acb23504d8089a3de134fd28805db22a42bcdaa0a104ab81ea3ce95323e4642b492dcf86780
 AUX cups-filters-1.0.65-poppler0310.patch 2124 SHA256 02c97c5915cb0c41dd47b9e1d0e4e3d6e6bd1a68fe2a19001a38b8bdaaf21607 SHA512 3197070128bff677cd7c7766cd881ba5c6b4750bce2cd9c98821ee31865423f52d9662d9931ce90670999410d8e3144b01dfac90772a303ebc1853b2fc0b8107 WHIRLPOOL 74d194d1594e93cad03e384796ae6731958751ef5537b8db317ba2d20e440f42794051427022aab9111c60b94f9e765a14e83be2d29e3dd4983c91b30156b3c6
+AUX cups-filters-1.0.71-poppler0340.patch 1887 SHA256 8307df77f0780f607351627d02468a4ab9a09055b0c32295df1eb989dcbcad74 SHA512 720f33e466d31738ddd3fa2579874a6a05a952bf9fa3b01cfb26da809c664e7eb6b2529ce806d8334789aa51c54300791c407fc866bf2a5752cc26f026a71c36 WHIRLPOOL fd4d2e423a4f8cfe00beffa998d562a8badca8dab82361cdff66e6d69cb472edb51d71f914014fceaedcffc5767d549c164a28845f21269d8169edb1e4b24ebd
 DIST cups-filters-1.0.66.tar.xz 1335740 SHA256 a46eea35d8c151f1f63c663c5dda290ba11a7f5951d48dba485a02f9146dfb1c SHA512 275d704a52889fd0f18b9c1ed5aad70efd0df3b0beac30fca5467135d9c9b0ccc0ea7e3d1274086cf475c4a569262edc85962b5076df3ba2e9d3fe4d2c376fa2 WHIRLPOOL 040fe61f197187913c90e42a26ada1957e9289854627af3cceff984027fb630417b9e8548e3ca7d713a74ad0074389459a41de3bc7579438335a84e30a694ba5
 DIST cups-filters-1.0.68.tar.xz 1336216 SHA256 d195cc321e65c0a0d208a9491b5869b6fffd7f3fbafc230906b1e18fb556a437 SHA512 5df5c11114a6f0641e4b064abe38b2b882965bbdb2736cb01c605eb4fa267c592ddd1d79767af477de1e66d4e2d3f4c86972dc448276dd04fcdccb80720892fc WHIRLPOOL caad3abe04ec78aca82a46660ebf76460ca9eb060ce2a6b15bbd61633b7aa7f86f96e53bce2e29cb3d33de41c4dde30168c07b70624f1e8db2b85cfb36115dc1
 DIST cups-filters-1.0.70.tar.xz 1338076 SHA256 f605fa635ff3653b4d5543a426d9ece4f890abea032fdd05536016a488520868 SHA512 7ded9e5f959718780fb0619b343c746b59f622e75aee8a01ab7fbb83f23f3ddb1b5b45d14bb48c02f551797fbfb1da6349ba8ca40d833ed8090df815f9aff544 WHIRLPOOL ac8ecdb82f5ca3cad8432dcda133010e13e23697d37a742062532a4a104e5204e63b38cb6a7d3644eb2710a873b638773578b807091c8ac646b6f120428983e3
@@ -12,16 +13,24 @@ DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca4
 EBUILD cups-filters-1.0.66.ebuild 3389 SHA256 a2ec6d62c893496bb0c0ea9bcc73241d31cef5a51c08f3970bd52515cde05950 SHA512 3b28cf5f223a58721f856874fdf579e1cf2af7ffdf6dd0f850912a777d3a82a307a591789e1afcd2531deafb6faa840f725af3704e760df17c9842b5534ad9ff WHIRLPOOL 83612ee1ed17de3f58000cebec7d45581cf363dcea88c3c0586441634b1ff986abcd098d754bb4b611f13f9ecc4ce50cbfaf09252019c52e7ef58cca12ef0ae6
 EBUILD cups-filters-1.0.68.ebuild 3358 SHA256 eaa9a2ec3e101dceaadeb71592ff116fa72e9bb287e90f9593efa8437e001640 SHA512 189890fdb5404932431915042a51979944bac2c3f833e2aa9bc0fcbbc9fcda8ec58319b006ae333b72c868a62c04d171f9be09d40d130fffec6e32f3105b4844 WHIRLPOOL 9f6c3d75c24a8ee9b0f13eedd2791f0ed374e212f53739a3aef71e49346c159884a28e4f70df31a1397ca5e9c7298b6bd46c1ccf574b1f71b0b9327afeed5209
 EBUILD cups-filters-1.0.70.ebuild 3357 SHA256 f27fe8140ec845232cdf803c0998f32fb2bd6c12c5bf8df4665ca7c440721500 SHA512 3b075e1341194247082d87707fdff66e73f81bca46ee7697d58a5ae8095c976d1718342fc81ea5e01f3b41a4ec7f223fe9d976996d54ad78e480087d7ef25092 WHIRLPOOL 3c6073897eba4777c8c077763bc2371ba2f518ea5f16f637b29929db2a4481d189bfefb612a74b4fc137f80a486ece9d94dfc38f0c42f0423f925c6d5953931d
-EBUILD cups-filters-1.0.71.ebuild 3377 SHA256 ec7b09e849febb683b0eb0954feb4c9815df5a11ab745f7119570eee8843b897 SHA512 7c3dcf01146a3d89bdc44bf05f2258e75f1fb4711b5528b038a4c4ff01c07dd0b08c362fccaa9c87086c8562e750f6703db43f8ac0cc2581ba9c483cd72eaccf WHIRLPOOL 7c509d03e8746709591f2812f570d005d4976e0c1445deaec8a658ac38ceb0c47e0361d2868d09ebde471dcd2c75edd92ea87ee8df6afe6443124c1e873c63d0
+EBUILD cups-filters-1.0.71.ebuild 3437 SHA256 ec7bea54e5428c06304bfd2740bdf8eb6f4252a8df8f3c62cfcb59e9e92a1c4b SHA512 a13d03e16b517ac9a5b8c9ac0a54bd67a260979003bb0892570ea0854a145f2886dcb12083b1267fd05bd8a823760781abd5ad4393b02ee4f94335b0d63290c5 WHIRLPOOL 7f65e932587173364646a6230548e9305ae76e72bb92310270ad5a8b61f0de5b744da7dca195ec099d8983cc66a59facfbbfa42cb0078c0da8763f1c46c3beb3
 EBUILD cups-filters-9999.ebuild 3357 SHA256 727034332dfe920bbca2b5d44cfb1a05b00d018e9d696bb6fa5337849db64fe1 SHA512 cc4603568a5e0e32e9ba0d263b09f796146cac0be117de4c64f7d9568b29e958baafc72c0c5287b51c08c4af6ca2bccbde1e41eb9d2f3c443cac62133a680f80 WHIRLPOOL 5ae5a685ea457a86423726145e448e9200a5f1cbe694c1e9fadbd8179759591dac536b18cb29a37f037407fe1934283b0c511b81287fda30c1f6208b9739f788
-MISC ChangeLog 24839 SHA256 e8408675f95ac46367e2d00d3c17853283cbb6ddcd883d9d8263b2494c620c70 SHA512 2c0d3a027c89c2fc3e8c34c951a8bd8bf16d11150f7375ffe81a06f93692cc6239fe1dd2c44e51ab4e732b25cba42c9b2d8567c29effd0a3d24033994eeea0b6 WHIRLPOOL 50221c1b909df71e7c63a5072333bcd9ae55d1f647428584af1b13255a8e09683dd1d48e43785775625b1d3db564fec050f187817b70d0ee5fdae74940cc6593
+MISC ChangeLog 25114 SHA256 e2cf0cbfb0465648b7037d8c54a5c4a41462ea2d4f549352c50db9fd5d79133c SHA512 2be711660244345a78419091ad2945d542a1b14200125f00dcc763540a9b3d23e09b0c072be5180d8ccaae0caf3886ef40c62bf1b9625cdb9b055369d970117d WHIRLPOOL a6f0102dc680326f8d0d02dd9511fd731e5e5aad3a5448d95f750feeceea4351e8954df5ada83c8b916f1ae60c4461358a1ee23d83c6cefbf0e2992ec403c022
 MISC metadata.xml 290 SHA256 07d21bc9b73af41131dc35b0b30829bb124443a931df199fad5720fd0c6ecb82 SHA512 8614acef9fc5a0d78a7c65ce34d79189c2496946a4bccb215b9404abdc0c821ee89f3a89892e2c320359063fc43750c9e9581b7fb732d9d710ff7bb2dd6229db WHIRLPOOL a0ef99c415a6e3dea7f7c0f2349ea67ce76e8361f36d1f8c828d136ebf01e4d3a5b1038aba6aea92843ab67bed68c38a0a841f3620e7d46aa205360694e682ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlWeu4YACgkQG9wOWsQutdbc2AQAgL3Qgwm2rxZN9I98ou7+qsF/
-k1SsNSWvoDt/bRAkqy8MaBbNBAXUQPwXvB7BwKEJXPWUT5eN+GWWCkmFc/V6XWsZ
-04VAInYRqMlTHto4nhrheS9mNf9hIIcrhPgc3hrhiPTvQLnMutxSZj1TOVHfovPQ
-MYUWzYU407CIAh1aQjU=
-=DP9r
+iQIcBAEBCAAGBQJVpUIWAAoJEB9VdM6hupKVVjcP/1EwrfrL0MzZqy808GilUj63
+dUaUT8a1ZnM2BF5wPg0ZLmHRsOnucqBvULe6wnTdL/UT3bDazF+I1ttGXFqzeov7
+2t8VjQFRi9dN8y5WWffxXG/3YQ51ewTeqWbWu2au+NvjsGWBA1/D70FpkstPTOSV
+fdsYZ6c4+t/DFY0AOwTUwOUAQWvkDu3xNXyauSiMNn+AqVaJXOpnrTxjMUaab7EE
+IwqZfTwNSiZ1yX36kwH+Dp0fWvYWMtR6EnIfXk6QIsXjIVAPWTsAJgTWY6XUQNtT
+xc2LwRDgPFPhZ/ctbLx8Rps5qpPqvn4ZJAHWBw7zuzQvpk3+8tDwJ3/AT9WD9Uyk
+6z9kaETsV9vtU1ZZo3Qi/5t+ZxvqxTta6AvWl9h3XoCuJiHip/3eMUdJQhFtUD7o
+z+yaFO80MVEwu3MC1S08lS4m5snCdk0qdrMPOA/OpG7nWrICDxbhPDwSus2rJhfT
+Kh1Jojs4Qz9mO/WvBrDllSUX5s1UhuX/Zk81dbDIocqARVbAyJcn6oMLJbPyPmE4
+8qscpxh0imYggH3rB4T7uLbQ6jN8ADZr1GWbtiYse8GMsP2QhAeD9oeA8k4JoLS+
+MVkGCZEEbw3Qy/su1w+8G9tMlJ/T8gXabbw82v5sqiv7emo0v9V0UEcj29UmVXrB
+ceDZmmVCz1DxPG0luvnk
+=GvLa
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.71.ebuild b/net-print/cups-filters/cups-filters-1.0.71.ebuild
index e854883736f8..9f84adf0b8de 100644
--- a/net-print/cups-filters/cups-filters-1.0.71.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.71.ebuild,v 1.5 2015/07/09 18:23:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.71.ebuild,v 1.6 2015/07/14 17:08:24 dilfridge Exp $
 
 EAPI=5
 
@@ -44,6 +44,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-1.0.71-poppler0340.patch" )
+
 src_prepare() {
 	base_src_prepare
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
diff --git a/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch b/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch
new file mode 100644
index 000000000000..ac0cae3bc7a6
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch
@@ -0,0 +1,38 @@
+Hack to make this build against poppler-0.34. Just disables color management in some places.
+We should probably find a better solution. dilfridge@gentoo.org
+
+
+diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx
+--- cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx	2015-06-26 17:45:26.000000000 +0200
++++ cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx	2015-07-14 19:02:51.666737621 +0200
+@@ -1812,9 +1812,15 @@
+   maskSplash->drawImage(&imageSrc, &imgMaskData,
+ 			splashModeMono8, gFalse, maskWidth, maskHeight, mat);
+ #else
++#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
+   maskSplash->drawImage(&imageSrc, &imgMaskData,
+ 			splashModeMono8, gFalse, maskWidth, maskHeight,
+                         mat,gFalse);
++#else
++  maskSplash->drawImage(&imageSrc, NULL, &imgMaskData,
++			splashModeMono8, gFalse, maskWidth, maskHeight,
++                        mat,gFalse);
++#endif
+ #endif
+   delete imgMaskData.imgStr;
+   maskStr->close();
+diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx
+--- cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx	2015-06-26 17:45:26.000000000 +0200
++++ cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx	2015-07-14 19:00:20.655740720 +0200
+@@ -241,7 +241,11 @@
+ #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
++#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
+ 	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
++#else
++	return splash->drawImage(src,NULL,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
++#endif
+ #endif
+     } else {
+ 	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);