Backport patch from upstream fixing build with jpeg-9, wrt bug #483348.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 85 insertions, 10 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 5a79378cadc2..6d496afc9652 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.951 2013/09/03 19:49:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.952 2013/09/05 11:28:42 kensington Exp $
+
+  05 Sep 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kdelibs-4.11.1-jpeg-9.patch, kdelibs-4.11.1.ebuild:
+  Backport patch from upstream fixing build with jpeg-9, wrt bug #483348.
 
   03 Sep 2013; Chris Reffett <creffett@gentoo.org> -kdelibs-4.11.0-r1.ebuild,
   -kdelibs-4.11.0.ebuild, files/kdelibs-4.10.0-udisks.patch,
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 682e681b4832..24cc759eb187 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -8,6 +8,7 @@ AUX kdelibs-4.10.2-security-url-dont-show-password.patch 1284 SHA256 c6feac6a698
 AUX kdelibs-4.10.3-dialog-quit-crash.patch 729 SHA256 08574995956ff96593d8bc4aa931b6e4a71e5c841217d6acbfe19703d5d16a80 SHA512 f4f9db3aa4a75a668cb9982aec41ac2ea4887b9a1d381f2993f0a3e045a38dd509b0c9c9c0c94f24d127973701386a62b8266eca1c09302ceaf8b590d8101cc7 WHIRLPOOL 74872525e6c0da5799311d4533eb4597393fa9f1b1b073d87194006f849221a97380772e8ac317e4587fba2ee61e9b7ab011a1d8a55be82e0cbbbc1dcbfe8bac
 AUX kdelibs-4.10.5-home.patch 1453 SHA256 1f194854ff93bc3ae6f1a6d1624ae4ed3893a3524aa3d583f3dcfebd32243ae9 SHA512 1e247299c562e4d68c2655cb66315cabe1b7dc464d7da700b2bd9992ec8cb58f8fea44d02296699523e2570039784a167eb5b95294beeef0f50e344fdd2d971b WHIRLPOOL 7d50ececb98fc7f9672478e4b8e3b63092dbfb0dc8a61cd676ee84159d47d40d81b2582e53ceb723b7b99f07f35d7eab82a2ec47300ef95f4f0ff20e0099f2c2
 AUX kdelibs-4.11.0-themecrash.patch 2176 SHA256 cd5121d090b3d6ead27f027c734b96244cca22f06eda9c049b8351df77e169f9 SHA512 65436c7935bcb88da49c57471d5ab4977feabd6c1af98fe1c591d13546cfa4ee4e5d6b91742006d94192250d31846adb5168c2855c2e69c2fccef3b36df55099 WHIRLPOOL cd11a92bb541032f2935c96a70d2ff8d259036ff0f7121d3c7824ef56b39e9ae52d28ef357ec047063a6e893bf4157e99881529e31fddc8b10de645d2b7a634f
+AUX kdelibs-4.11.1-jpeg-9.patch 2313 SHA256 137d5137890a041dd3d7c4423bbff096451717a5480b573f29a297d4f04329ba SHA512 cb59bd3463377e47d14ce8ef4f774cea5d747cf26011a122b8546b4b55ebf4aee7e6d8fb9ceeb1ab7783ce8987d8c716ad7607a4f9521dc16a1c05f356c5d182 WHIRLPOOL 3912e0fd6b6dfdba4cb81189f246f34606e1d968b4b2f54e597f8de11fa2cc2cdb5c1f2c330a448462c0bd80281ba15877ae92755f15ea8eb091d8f05deebef3
 AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a SHA512 9207f2ab33e757d3d8ed3279350ea4326339129f232bb67bcce7b3806480fe551c9ba03a93d289df311e913055c343c925f957eb0b0b24bec6a7ef59017090a2 WHIRLPOOL f63b26fc0657f7e72856b493fc469af1cfaa68bb18b1dd4078f9dae44c37a3bdec9114c6a2c92c55b2cdde4d7cbc2ea072df1157b26e43f844dccf16ec8b1f8d
 AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46
 AUX kdelibs-4.6.2-armlinking.patch 1129 SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6 SHA512 d0208e095e751d4064e3f9b7d836135bce8c7f1cb7b4f1a20ef4d86d2fd5a08523c563c72ab86a871929000f26e4d50fa58fd81f7996edc57066984ce508ff1d WHIRLPOOL 81535f48c1ab14e37fd0dae7751317e72c53f4c55d4c28be67db8c6782af9a0a5e1ee3aba48680b8d367c9b6dda4d0e481392826b5eb597e1965bfbff70aaf38
@@ -18,16 +19,18 @@ AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf36
 DIST kdelibs-4.10.5.tar.xz 12023036 SHA256 b6d404950bbe21657bf6362b2dd624d2e3cd22f23c1e6e20fa1ce71c41faf2d1 SHA512 be16f15a38dbd63c1ba077ff383e8dcbd3bf7505ef910b77dd2f8b85f80e2afee3c2d23d8e17450fe632f9739f524a145746b201271b41a0bd46fd3d6a71ddd5 WHIRLPOOL 68aa0aec62b3d634ea6312209698d2a906228ecf5ef45b2da6fd3f2822e6955450d9a1030263a6c3e143278d1354acbb451a416029b4c09806d66c09a93b028a
 DIST kdelibs-4.11.1.tar.xz 12071220 SHA256 8ebf816732a4366d67611a63405135650acd9e5bf0f7594e7ffa9a14e92dfc68 SHA512 43f3dcc423191fecd0c1aceead2e3bfa062d13fbb46ceb514f25cfb5262a0a3bed577907b39d9060cb3c3f0e7886dad237e97aa633c63edc142c9741b42025e9 WHIRLPOOL 79d40d1a49a07ed2ae416d257c0a0742e0e70ce54a209f5d8cd89a7f0901c082dc0d10262c634ba4c867a4b4c316c457fce303ca9c7874cf9611ba6246aaad40
 EBUILD kdelibs-4.10.5-r1.ebuild 8700 SHA256 0dd5ef1630a11cf163ef3fb519fd2d33301eb6d16d45d3f29c230af43ff52fb3 SHA512 6a56d76281f7d7c918fb2d4fb5de13304ceefbf6e685495b0207a3b6de07f7322f8eeff0b6fc95eec8cc68c3dacd139f11d4e75a1f4cbd7897501d0e696c8276 WHIRLPOOL 98a98931eeb9caaad24a61600b02e0bdbc2a8dd551337864c7c58377172ce21a2d0e7eae7417001fb9ad8b796fc3e5ffdacb803f8d4d5cd288964a9ad5c7c346
-EBUILD kdelibs-4.11.1.ebuild 8357 SHA256 bff6bcbc392ab56c8438c3349111a0aac12a01bc530491d772d0aafc1e7c1f3d SHA512 202f63d5e3b970578fbf113735eab8dcbe0a5554e1a273907fab36b462bfff39a44c662d145fe2dbd0023deacb2860921863ba8befb5909cdea760f31f82bae1 WHIRLPOOL 07e31ef126dc64e6ff7785787f9dac6e401a2d6fd83186ade573d505c0c8fb8f7eff96347648034646b719165870c8d85f2d0c163f477007e836f6d4cb697d22
-MISC ChangeLog 46946 SHA256 01303a03b90466554bd2eca8e443a9998d51b9c3b85de41f75368b43131e4a48 SHA512 29b811e2bf34dab1822bb872938fe30dda1a86169bfd1cd9bf27c8f9987ed0d23c721fbf3f475913e1b091d0375d618dea1ef91cb4c0bd6f34a871a5be55bef3 WHIRLPOOL 11232782aae1a22fdd28cf58857f128e5e78e741105cf071b99f9bad4a220465f19f461dff0ca222925dc3856bae67e8c55b4b11d95dcb6ab4dca1229b423179
+EBUILD kdelibs-4.11.1.ebuild 8400 SHA256 ab7a0065ba78924c5e4c82d38f53008a534e9b67d7824cb6eab5f89156db49d7 SHA512 3e97760089ea39e36ea551559a190b32598294cec9babe80272d2031f0e8966be8fc868684553eb7636be227a1314c574dcde0359ea9020858e85b0fcc369549 WHIRLPOOL 5caac6aa8e4e75e668217444c653017f7d72bcb351f19ad7fe785e1533d1b20ebeed55de430d0c8d0c75bf663442a69c34307ecfb9cfd9918fb606c3d5e433cf
+MISC ChangeLog 47140 SHA256 2f51c830ec6faf9e8d2e8ca7c9c849ffd405c336c15d04d3ef573404039c5ba1 SHA512 c27dc6b68581c8b61d221353b655d4651de12b4151fb28742cb6cc29ac60c8b652f604ae74d4089a7f45bc9e260c31d93bf459523fde4151e82f3d3b35813043 WHIRLPOOL d8c18c360517d567f6a3fd9f1f0c1720a7bf51ab1a363570bce6c387908c7f4c752f2b65f0029b4e72c9a22f10eb97673f9e079e5d98e21d1065bca9e67bbb11
 MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
 MISC metadata.xml 391 SHA256 fc53374fd33574da578cb1d31e89f7cbdee57aff3cbf5d7284e778edbce2acc0 SHA512 6c6a2d72311cd226b6f8b4b971bcf3547c43b54148b7286849f37ed1d586984aa39642e83f69034d942c4e478fa41ba7d815a13a0eb01f8ed5b74b3552270c69 WHIRLPOOL 9313efac3ba14c2b1b75703071bde802b41027e46d511bc8cf3efa055cf6967758aac541d60bf10a10e24c96b6f2109e848d12950cf802398d6563290c8c2039
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iKYEAREIAGYFAlImPZZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1RIVgCdEl2jk+SoTJ3eDS4rDDehO92E
-OMQAn08D9r2kt94itgkPyrhO8J+tEGKG
-=TysS
+iQEcBAEBCAAGBQJSKGpTAAoJEMbwO6tnXQ0spOgIAK8pkqaXKDH4sDqpJUNiYz9R
+Hi3Dy4e41nBukDHd4r3WdIqOmHBMb/kyMA2AE2sO2HqHEQ8nM7VXPCup7XN+ytWO
+rwEq24/+M40X/42s4I2UhIlppyeEtlTR6C9AvqKBTjzR6yvVTPULzPLh5jehK+7R
+jvUts0iIPGxL5QINWAwCbhhomesuhwwusFStaI0ZX+MTKwf/hnMT1WrNDMb/TZzz
+/5s1GraQ5Rz8orPGiVo+r2xdZ14VIVtyJ+XrrONDVsaykXJdIK4XBIHPf3XXQjqz
+D7NaHqu3V8PzRpSzFSqS31hxf452yxK+wbYR1uJqCore05lbr11AqSxPi3xVhp0=
+=2xWk
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.11.1-jpeg-9.patch b/kde-base/kdelibs/files/kdelibs-4.11.1-jpeg-9.patch
new file mode 100644
index 000000000000..e645de4d2427
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.11.1-jpeg-9.patch
@@ -0,0 +1,67 @@
+From 206d4137cfd63c47e52ce6630cf6834ab2e759ee Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 5 Sep 2013 21:03:00 +1000
+Subject: [PATCH] Fix build with libjpeg-9.
+
+The breakage occurs because in libjpeg-9, the boolean typedef changes
+from int to typedef enum { FALSE = 0, TRUE = 1 }.
+
+REVIEW: 112458
+---
+ khtml/imload/decoders/jpegloader.cpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/khtml/imload/decoders/jpegloader.cpp b/khtml/imload/decoders/jpegloader.cpp
+index ea25572..2258469 100644
+--- a/khtml/imload/decoders/jpegloader.cpp
++++ b/khtml/imload/decoders/jpegloader.cpp
+@@ -142,10 +142,10 @@ extern "C" {
+ #ifdef BUFFER_DEBUG
+             qDebug("...returning true!");
+ #endif
+-            return true;
++            return TRUE;
+         }
+         else
+-            return false;  /* I/O suspension mode */
++            return FALSE;  /* I/O suspension mode */
+     }
+ 
+     static
+@@ -313,7 +313,7 @@ int JPEGLoader::Private::processData(uchar* buffer, int length)
+ 
+     if(state == Init)
+     {
+-        if(jpeg_read_header(&cinfo, true) != JPEG_SUSPENDED) {
++        if(jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED) {
+             state = startDecompress;
+             
+             // libJPEG can scale down 2x, 4x, and 8x, 
+@@ -337,9 +337,9 @@ int JPEGLoader::Private::processData(uchar* buffer, int length)
+     {
+         jsrc.do_progressive = jpeg_has_multiple_scans( &cinfo );
+         if ( jsrc.do_progressive )
+-            cinfo.buffered_image = true;
++            cinfo.buffered_image = TRUE;
+         else
+-            cinfo.buffered_image = false;
++            cinfo.buffered_image = FALSE;
+         // setup image sizes
+         jpeg_calc_output_dimensions( &cinfo );
+         
+@@ -349,9 +349,9 @@ int JPEGLoader::Private::processData(uchar* buffer, int length)
+         if ( cinfo.jpeg_color_space == JCS_YCCK )
+             cinfo.out_color_space = JCS_CMYK;
+ 
+-        cinfo.do_fancy_upsampling = true;
+-        cinfo.do_block_smoothing = false;
+-        cinfo.quantize_colors = false;
++        cinfo.do_fancy_upsampling = TRUE;
++        cinfo.do_block_smoothing = FALSE;
++        cinfo.quantize_colors = FALSE;
+ 
+         // false: IO suspension
+         if(jpeg_start_decompress(&cinfo)) {
+-- 
+1.8.3.2
+
diff --git a/kde-base/kdelibs/kdelibs-4.11.1.ebuild b/kde-base/kdelibs/kdelibs-4.11.1.ebuild
index 6710c2da0940..a93dedc141aa 100644
--- a/kde-base/kdelibs/kdelibs-4.11.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.11.1.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/kde-base/kdelibs/kdelibs-4.11.1.ebuild,v 1.1 2013/09/03 19:04:49 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.1.ebuild,v 1.2 2013/09/05 11:28:42 kensington Exp $
 
 EAPI=5
 
@@ -129,6 +129,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
 	"${FILESDIR}/${PN}-4.9.3-werror.patch"
 	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
+	"${FILESDIR}/${PN}-4.11.1-jpeg-9.patch"
 )
 
 pkg_pretend() {