webkit, maj 1.2.7-1

6 files changed, 97 insertions, 14 deletions

diff --git a/extra/webkit/.footprint.i686 b/extra/webkit/.footprint.i686
index 5ef1fbc46..73ada3df7 100644
--- a/extra/webkit/.footprint.i686
+++ b/extra/webkit/.footprint.i686
@@ -44,9 +44,9 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/JSCore-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-1.0.typelib
 -rwxr-xr-x	root/root	usr/lib/libwebkit-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so -> libwebkit-1.0.so.2.17.8
-lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so.2 -> libwebkit-1.0.so.2.17.8
--rwxr-xr-x	root/root	usr/lib/libwebkit-1.0.so.2.17.8
+lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so -> libwebkit-1.0.so.2.17.9
+lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so.2 -> libwebkit-1.0.so.2.17.9
+-rwxr-xr-x	root/root	usr/lib/libwebkit-1.0.so.2.17.9
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/webkit-1.0.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/extra/webkit/.footprint.x86_64 b/extra/webkit/.footprint.x86_64
index 5ef1fbc46..73ada3df7 100644
--- a/extra/webkit/.footprint.x86_64
+++ b/extra/webkit/.footprint.x86_64
@@ -44,9 +44,9 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/JSCore-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-1.0.typelib
 -rwxr-xr-x	root/root	usr/lib/libwebkit-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so -> libwebkit-1.0.so.2.17.8
-lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so.2 -> libwebkit-1.0.so.2.17.8
--rwxr-xr-x	root/root	usr/lib/libwebkit-1.0.so.2.17.8
+lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so -> libwebkit-1.0.so.2.17.9
+lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so.2 -> libwebkit-1.0.so.2.17.9
+-rwxr-xr-x	root/root	usr/lib/libwebkit-1.0.so.2.17.9
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/webkit-1.0.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/extra/webkit/.md5sum.i686 b/extra/webkit/.md5sum.i686
index a0900cdbc..2e260b84d 100644
--- a/extra/webkit/.md5sum.i686
+++ b/extra/webkit/.md5sum.i686
@@ -1,2 +1,3 @@
 e7e83312618cb30cc9a1567a21cd0e06  webkit-1.2.6-introspection.patch
-7afb510040b2a49c65514a06bb8200fc  webkit-1.2.6.tar.gz
+45040d3e1458ad7cdf9c060a10526ba1  webkit-1.2.7-libpng-1.5.patch
+25c7e548b65aeb6d83c0182c32ef0927  webkit-1.2.7.tar.gz
diff --git a/extra/webkit/.md5sum.x86_64 b/extra/webkit/.md5sum.x86_64
index a0900cdbc..2e260b84d 100644
--- a/extra/webkit/.md5sum.x86_64
+++ b/extra/webkit/.md5sum.x86_64
@@ -1,2 +1,3 @@
 e7e83312618cb30cc9a1567a21cd0e06  webkit-1.2.6-introspection.patch
-7afb510040b2a49c65514a06bb8200fc  webkit-1.2.6.tar.gz
+45040d3e1458ad7cdf9c060a10526ba1  webkit-1.2.7-libpng-1.5.patch
+25c7e548b65aeb6d83c0182c32ef0927  webkit-1.2.7.tar.gz
diff --git a/extra/webkit/Pkgfile b/extra/webkit/Pkgfile
index 5c8f2479e..be780800e 100755
--- a/extra/webkit/Pkgfile
+++ b/extra/webkit/Pkgfile
@@ -2,19 +2,22 @@
 # URL: http://webkitgtk.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: curl, dbus, gconf, gnome-vfs, gperf, gstreamer, gst-plugins-base, gtk, icu, libpng, orbit2, pango, enchant, libsoup, gir-repository
+# Depends on: curl, dbus, gperf, gst-plugins-base, icu, enchant, libsoup, gobject-introspection
 # Run on: atk,cairo,gstreamer,gst-plugins-base,gtk,icu,libpng,pango,enchant,libsoup
 
 name=webkit
-version=1.2.6
+version=1.2.7
 release=1
 source=(http://webkitgtk.org/$name-$version.tar.gz 
-	webkit-1.2.6-introspection.patch)
+	webkit-1.2.6-introspection.patch
+	webkit-1.2.7-libpng-1.5.patch)
 
 build() {
-	unset MAKEFLAGS
 	cd $name-$version
+
 	patch -Np0 -i ../webkit-1.2.6-introspection.patch
+	patch -Np0 -i ../webkit-1.2.7-libpng-1.5.patch
+
 	./configure --prefix=/usr \
 		--localstatedir=/var \
 		--enable-introspection \
@@ -27,5 +30,3 @@ build() {
 	make
 	make DESTDIR=$PKG install
 }
-
-  
diff --git a/extra/webkit/webkit-1.2.7-libpng-1.5.patch b/extra/webkit/webkit-1.2.7-libpng-1.5.patch
new file mode 100644
index 000000000..f71040e9e
--- /dev/null
+++ b/extra/webkit/webkit-1.2.7-libpng-1.5.patch
@@ -0,0 +1,80 @@
+$NetBSD: patch-ab,v 1.6 2011/01/25 18:38:16 drochner Exp $
+
+Fix build with png-1.5. From John Bowler.
+
+--- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp.orig	2010-12-28 12:28:51.000000000 +0000
++++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+@@ -60,7 +60,11 @@ const unsigned long cMaxPNGSize = 100000
+ // Called if the decoding of the image fails.
+ static void PNGAPI decodingFailed(png_structp png, png_const_charp)
+ {
++#if (PNG_LIBPNG_VER < 10500)
+     longjmp(JMPBUF(png), 1);
++#else
++    png_longjmp(png, 1);
++#endif
+ }
+ 
+ // Callbacks given to the read struct.  The first is for warnings (we want to
+@@ -216,18 +220,26 @@ void PNGImageDecoder::headerAvailable()
+ {
+     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) {
++#if (PNG_LIBPNG_VER < 10500)
+         longjmp(JMPBUF(png), 1);
++#else
++        png_longjmp(png, 1);
++#endif
+         return;
+     }
+     
+     // We can fill in the size now that the header is available.
+     if (!setSize(width, height)) {
++#if (PNG_LIBPNG_VER < 10500)
+         longjmp(JMPBUF(png), 1);
++#else
++        png_longjmp(png, 1);
++#endif
+         return;
+     }
+ 
+@@ -277,8 +289,7 @@ void PNGImageDecoder::headerAvailable()
+ 
+     if (m_reader->decodingSizeOnly()) {
+         // If we only needed the size, halt the reader.     
+-        m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size);
+-        png->buffer_size = 0;
++        m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0/*do not save the data*/));
+     }
+ }
+ 
+@@ -291,7 +302,11 @@ void PNGImageDecoder::rowAvailable(unsig
+     RGBA32Buffer& buffer = m_frameBufferCache[0];
+     if (buffer.status() == RGBA32Buffer::FrameEmpty) {
+         if (!buffer.setSize(scaledSize().width(), scaledSize().height())) {
++#if (PNG_LIBPNG_VER < 10500)
+             longjmp(JMPBUF(m_reader->pngPtr()), 1);
++#else
++            png_longjmp(m_reader->pngPtr(), 1);
++#endif
+             return;
+         }
+         buffer.setStatus(RGBA32Buffer::FramePartial);
+@@ -300,7 +315,8 @@ void PNGImageDecoder::rowAvailable(unsig
+         // For PNGs, the frame always fills the entire image.
+         buffer.setRect(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());
+     }
+