[net-libs/webkit-gtk] Sync with portage tree and add libpng15.patch.

4 files changed, 46 insertions, 3 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 890a5d3..6d58a93 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jun 2011; Dustin Polke <dustin.polke@uni-siegen.de>
+  webkit-gtk-1.2.7.ebuild, +files/webkit-gtk-1.2.7-libpng15.patch:
+  Sync with ebuild,v 1.7 which adds libpng15.patch.
+
   19 Mar 2011; Dustin Polke <dustin.polke@uni-siegen.de>
   webkit-gtk-1.2.7.ebuild:
   Sync KEYWORDS with ebuild,v 1.6.
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 21dbd6b..848a61b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -3,7 +3,8 @@ AUX webkit-gtk-1.2.5-darwin-quartz.patch 1984 RMD160 5995be8598b62aff487726de02a
 AUX webkit-gtk-1.2.5-darwin8.patch 1152 RMD160 a546515b8a088f8f11e532662833c3e41ad6df83 SHA1 e1e841cae9d5a70940630a918b40ac4b27497c58 SHA256 51e3fb832793cb0be13ceff63d1b4c4ef82efaa7b3151ab53d04ae966d65efa6
 AUX webkit-gtk-1.2.5-tests-build.patch 526 RMD160 c336c7309899169a2691bf3b984fa4df480b2ad4 SHA1 c25129b41dcca46424d58c3796f7207119e4a790 SHA256 aa2875954048318f2a9c5035b670774a1c5ce1b641b067f936fa076f38659383
 AUX webkit-gtk-1.2.7-fix-testwebdatasource-test.patch 1600 RMD160 48bc8f817fe75784156c41b2f54415fc42237bcb SHA1 5435bbd7764d77ef4d2dcfe4a47d991383127efa SHA256 f369d6d85672249e4e1ea9a9381b860394a53d3321a830cc89cd3464980c9ae1
+AUX webkit-gtk-1.2.7-libpng15.patch 1657 RMD160 19cec5b29437313372b9b25d43029105197a4abf SHA1 2748a46b1a4c9d547094ae2795ad2c812fbf59aa SHA256 0aef21a127b9427cb98684102c91902f38585c7d7642525760c7a7d9f0d39dc7
 DIST webkit-1.2.7.tar.gz 6615990 RMD160 f36b3ae05693e0eeb4d1936ceee52b6fe1517e57 SHA1 e9afc573d2459794c3749ba404f2187f9dcc9ed3 SHA256 228a80b3f0132db1342708e8ef7738996f05e30393e0187acf4cab987283718b
-EBUILD webkit-gtk-1.2.7.ebuild 3469 RMD160 af7a98db3af339edab52986538a88c57a3af8b64 SHA1 602b4ebc1afec23f35a59be9bb18fc20e626e64c SHA256 0027d7cfbe5baca0ee42a504bfcbef7079e99f986f51202dfbb66af9a1e02494
-MISC ChangeLog 656 RMD160 e49c9abda9be6b31e5abbdc493f4f128d4cc00ed SHA1 7c7a16a708fe0efe5a81f2656c4088c8242c50f8 SHA256 087f1f65733c5d62c53f786e434524c87beedd04cbcedb8b3bf57353f896084d
+EBUILD webkit-gtk-1.2.7.ebuild 3511 RMD160 8a6cf1fb2d767e5863bdd41592f1b7c8783ae2c9 SHA1 044abf07454d80a2f942192a2e16342cb90be30f SHA256 a5bc36a0c8e55b3b4087cd0a0a2606979e7dfbce50a5909b1fdcc444aa63619b
+MISC ChangeLog 833 RMD160 4da47e6205a875e73e336cb34690a0ea3b1abab6 SHA1 6be230b5b3bb2bdd6453d9e763e4ab01e6629afd SHA256 2733fa1a1ea0de2ff486b02ef27f0c97379d256fd45642f51732bcdceae0b237
 MISC metadata.xml 522 RMD160 489ac013338a9a2f8dae756bcdc1a6a9ea1e9dbd SHA1 af8ff7ee43834417f453c6d784bb7ea942e1444c SHA256 aae85267242eda1165d571ba146ee1bea312d4745947448a87644b286250e32d
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch
new file mode 100644
index 0000000..5674861
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch
@@ -0,0 +1,36 @@
+--- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
++++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+@@ -242,9 +242,9 @@
+     png_structp png = m_reader->pngPtr();
+     png_infop info = m_reader->infoPtr();
+-    png_uint_32 width = png->width;
+-    png_uint_32 height = png->height;
++    png_uint_32 width = png_get_image_width(png, info);
++    png_uint_32 height = png_get_image_height(png, info);
+     
+     // Protect against large images.
+-    if (png->width > cMaxPNGSize || png->height > cMaxPNGSize) {
++    if (width > cMaxPNGSize || height > cMaxPNGSize) {
+         longjmp(JMPBUF(png), 1);
+         return;
+@@ -319,7 +319,12 @@
+ 
+     if (m_reader->decodingSizeOnly()) {
+-        // If we only needed the size, halt the reader.     
++        // If we only needed the size, halt the reader.
++#if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5))
++        // '0' argument to png_process_data_pause means: Do not cache unprocessed data.
++        m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0));
++#else
+         m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size);
+         png->buffer_size = 0;
++#endif
+     }
+ }
+@@ -344,5 +349,5 @@
+         buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
+ 
+-        if (m_reader->pngPtr()->interlaced)
++        if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr()) != PNG_INTERLACE_NONE)
+             m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height());
+     }
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild
index 9fff0f7..404f777 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild,v 1.6 2011/03/13 15:47:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild,v 1.7 2011/04/04 20:48:14 ssuominen Exp $
 
 EAPI="3"
 
@@ -68,6 +68,8 @@ src_prepare() {
 	# Don't build tests if not needed, part of bug #343249
 	epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
 
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
 	# Fix testwebdatasource test, bug #355387
 	epatch "${FILESDIR}/${P}-fix-testwebdatasource-test.patch"