Fix building with media-libs/jpeg >= 9a wrt #481688 by Maurice van der Pot

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 43 insertions, 4 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 09a6728b841b..46e6e3f4daf4 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.274 2014/08/21 10:45:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.275 2014/08/21 11:19:07 ssuominen Exp $
+
+  21 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/webkit-gtk-2.4.4-jpeg-9a.patch, webkit-gtk-2.4.4-r200.ebuild,
+  webkit-gtk-2.4.4.ebuild:
+  Fix building with media-libs/jpeg >= 9a wrt #481688 by Maurice van der Pot
 
   21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> webkit-gtk-2.4.4-r200.ebuild,
   webkit-gtk-2.4.4.ebuild:
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
new file mode 100644
index 000000000000..4226f2fb0780
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/481688
+http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+
+--- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
++++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+@@ -334,5 +334,5 @@
+         case JPEG_HEADER:
+             // Read file parameters with jpeg_read_header().
+-            if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED)
++            if (jpeg_read_header(&m_info, TRUE) == JPEG_SUSPENDED)
+                 return false; // I/O suspension.
+ 
+@@ -420,7 +420,7 @@
+             m_info.dct_method = dctMethod();
+             m_info.dither_mode = ditherMode();
+-            m_info.do_fancy_upsampling = doFancyUpsampling();
+-            m_info.enable_2pass_quant = false;
+-            m_info.do_block_smoothing = true;
++            m_info.do_fancy_upsampling = doFancyUpsampling() ? TRUE : FALSE;
++            m_info.enable_2pass_quant = FALSE;
++            m_info.do_block_smoothing = TRUE;
+ 
+             // Start decompressor.
+@@ -573,5 +573,5 @@
+     // called, then we have hit the end of the buffer.  A return value of false
+     // indicates that we have no data to supply yet.
+-    return false;
++    return FALSE;
+ }
+ 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild
index 99a1999d65d2..e27620827935 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.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/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild,v 1.6 2014/08/21 10:45:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild,v 1.7 2014/08/21 11:19:07 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -175,6 +175,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=129542
 	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
 
+	epatch "${FILESDIR}"/${P}-jpeg-9a.patch #481688
+
 	AT_M4DIR=Source/autotools eautoreconf
 
 	gnome2_src_prepare
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild
index 7c2fe8cb4b01..494d1ef4c92e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.4.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/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild,v 1.7 2014/08/21 10:45:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild,v 1.8 2014/08/21 11:19:07 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -185,6 +185,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=130837
 	epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
 
+	epatch "${FILESDIR}"/${P}-jpeg-9a.patch #481688
+
 	AT_M4DIR=Source/autotools eautoreconf
 
 	gnome2_src_prepare
@@ -301,4 +303,4 @@ nvidia_check() {
 		eerror
 		return 1
 	fi
-}
\ No newline at end of file
+}