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

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 74 insertions, 2 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/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() {