added latest patch for webkit-gtk (still testing on arm)

3 files changed, 35 insertions, 2 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 59bac44..bb5284c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -16,6 +16,7 @@ AUX webkit-gtk-2.2.5-sparc64-build.patch 1169 SHA256 fe6c7c345eb46a0f6856b5f1c54
 AUX webkit-gtk-2.2.6-fix-linking-issue.patch 2187 SHA256 fab1eeb1c392a57edff65943039760bf1875f5e7ca812d22dab404949993b3c3 SHA512 101c7783f69fc357b4ccfc5b2522413ba6994d2a99c2f1f5e00eb1f75d5cc881f466b63bf09d1ff8acca2c019577b2cdb00221ec6714e83596ff68388e44398c WHIRLPOOL bb7acd07d5277fe3607dc899025b850397ce282e083c34a505a6eddfeca9b35adf2b8d76ec167451907f67f16656401f92eb67161b034984ab55f1e5764f4a38
 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
 AUX webkit-gtk-2.4.4-atomic-ppc.patch 1286 SHA256 458942430a4ee4c7f4efe0524b3b2c7d5213609136d1bc6c2a58fff92b247a33 SHA512 2aabf77fc69a26fde006cf16eabe7339bd5839bf205f50258978cad089f368cc5ce51f965ca3684c7958cfe217e50db1f09f47f5ee0b5057f4a108b2cfe23f6b WHIRLPOOL 7d346765d531d4c52423d963da3082398112ac4e82d2f5d6f973237a53917d4b3498d5c5f2398ed53337b7abc2774354496494f01de4dd592a512daff3cfbed9
+AUX webkit-gtk-2.4.4-jpeg-9a.patch 1258 SHA256 bd626ff2df4a44b98b0a82fa3f555a0a2cca8d1233f56104d78ff6959f5b2f2b SHA512 27be24cb4d592b5a8e1378751563baae6862ee64b69a4fe24f9f8da7b31020860adad784ecf6be6959c857566e0893526242ae03268679e3a590d673bf8717b8 WHIRLPOOL d768198c603a85afc56be1aa35506781e2bc7d561c7eda9ee64f6a504f6d77edda1537aa7d652b99350dfdd8213dd701b4d7fc8133946b67a4648ef8d5b7dac0
 AUX webkit-gtk-undefined-symbols-test.patch 1204 SHA256 c5d9d839cc9473c06db2af7c0bdfdd6f11d3d8558e2e5a49ee4a23b3a47ff84a SHA512 9c03ac3d3e2811bde54301d8a0a28bb31aea338daf8874c23120f08ff0791af402fa4626fa680d32c5fae34028912e792a02043e438af75097991e5b07789a16 WHIRLPOOL 772dce0b045c70e724081901941059278222fef36afc5e48cb05e672e58528d2158571b75acf646afa784080c1c8e52db1345c8d5aa0c470f6b02e109af760de
 AUX webkit-gtk-undefined-symbols.patch 480 SHA256 32f64b2ea8f1039b60540d7cc01211d05cbd6aa7c1639c8ed6ee4e37ec86a7c0 SHA512 0068bb4e4bb7d388f140e275696c24d3392e64f32b6cf9ec7e4e483f4b14be1f5fadf788bea146e29d46b5c24d0b3a7b709cd67819ac9fee9672659f0b66718a WHIRLPOOL 764d86944ae82ab80250444c9500f7acc45c2ae9cd2ae6049ed288b4f76b9dec6d6fdc6743196e83e48a8848dd4e20cc10cd711615a737d3e73b1f31eb0b2181
 DIST webkitgtk-2.2.2.tar.xz 9378852 SHA256 4a45768695ccded14fdc47f99dbcdb750076f55dad61560cadac7b55db0b304d SHA512 8098b69438cebc298796d4f1bdd5528bcf2e57102214caccc05256d9f393ae2d925dfdba8e7219f41791c094311f90beb80a957d648ca382df7a110272c0caab WHIRLPOOL 20db7d729eabe958faded0b92655eb1cbdb38803739bb3ec0edb5e3331c1ada26d9013c34d88c80e1e6cca68a8762b736812227f18f2530ae70c89d41800d111
@@ -27,4 +28,4 @@ EBUILD webkit-gtk-2.2.2.ebuild 9319 SHA256 c6a83bd39f1950a81e42ba829ab3a2c63ac6c
 EBUILD webkit-gtk-2.2.4-r200.ebuild 9169 SHA256 52f77a8c13cc892e9ecc53dc6dea9ae7525891ae37c13f705a05664278837265 SHA512 d8e77fbc76528a47c147efc2fb7fdab0a2a12138c4ac039af16c78eb62a8e7fd7c6f2559e3a4e246dce5745066d0918ceffb012847968888d24c958848401724 WHIRLPOOL 6ee4177e52b932c15cba0bdd60b8f776f0a1cf601639ffab9d3cfbc474f98a0c8540ebefe53b1fe02985df3717d2994dd481c647887db3d95815325fa517d7e5
 EBUILD webkit-gtk-2.2.6.ebuild 8887 SHA256 bb6eb67de9cb0a48f6e120370400d92f8e100336e04afe2a560de65ec2ed7502 SHA512 60245e4882a37deb6aecdb3b7e3b69b37b3f5a67d983c08e52e7464c37754e1aab339ac5a1ffe4aa8c87ba3cd98adb1b9bdd0262a03f93f5c1efa4f574063c63 WHIRLPOOL 7ba5d5a946ab2d21267ad210638cf37ecff4c2de6caca75901c11aeaa7f683d5dd2ba216968ee8f3dbe37ce644178a998df7d02580c1859e4538ecc8891a18de
 EBUILD webkit-gtk-2.4.3.ebuild 9227 SHA256 33ea5699c83fd8443d377142837eb6f735e41f2d8dfab4da9b64825ca09cc327 SHA512 d6a2143a02b8ab0d10ba285d99a6578ce63d58ec7aaeaec0b1ed2b76a1dee62f391bea7acdde9f034cc243759e046fc0ca056f7f266c3d4453ae7f906cf6ddb4 WHIRLPOOL 31ec21dd78b017d4d0f1ef88d561dce4364181a01dac70019c14bcb36dfb707bf727cf256ebaaa96b89449ad441039652aef7676c184f07eee46924dc5c5853d
-EBUILD webkit-gtk-2.4.4.ebuild 10087 SHA256 bef4e10ef85782ac8cc9467ce7fe88880ef171c43a476ae36eab0972facfafeb SHA512 b4706f2c680cb94f4163e54ce5958bf2034606cdbaf931e83843c4c6b60b1deaaed3dcb8e9c2ce2a9f1e85696bfc9104d4204e0a2ce26553e0728cc956321f2e WHIRLPOOL a5a78f40b239f93a30b2c1ad975253fede27b109a804c6e67bdbfa83e36a9cc4c8e278503d83c1d4671f762429c68e936c74dc7ee52fcc15dff212480b7497fd
+EBUILD webkit-gtk-2.4.4.ebuild 10035 SHA256 89c31462959474fef8daf866a8249bbcd6f4c4d649c5b808327a0d92d16fd5f6 SHA512 dc05739b539ff4cbcbe5b85f384dc0752ebacf71ddd9c94e5d9f8a0e903c00fa59a6c397d7f7c7849235289ee7e1c6374d59a6bfc51a0d406af8868a33e9c3c2 WHIRLPOOL 36f69566467b454fa19f2f9d85d7161715cebae541faee38586a041b9fac5dc6b5565f6ae7e1f6c4eae6ba6b0c59cdefec9893685b04e6528d461e46015b7bb7
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 0000000..4226f2f
--- /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.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild
index 52e0402..5aedae7 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.6 2014/07/28 13:48:56 ago Exp $
+# $Header: $
 
 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