From d6ef89c6a61f0ec132ebe7463bf00e59ef27e616 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Thu, 6 Jan 2011 04:12:06 +1100
Subject: [PATCH] webkit: 1.2.5 -> 1.2.6, added patch thanks aubic

---
 webkit/.footprint                        |  6 +++---
 webkit/.md5sum                           |  3 ++-
 webkit/Pkgfile                           | 10 ++++++++--
 webkit/webkit-1.2.6-parallel_build.patch | 13 +++++++++++++
 4 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 webkit/webkit-1.2.6-parallel_build.patch

diff --git a/webkit/.footprint b/webkit/.footprint
index 68f04d458..9140a377e 100644
--- a/webkit/.footprint
+++ b/webkit/.footprint
@@ -41,9 +41,9 @@ drwxr-xr-x	root/root	usr/include/webkit-1.0/webkit/
 -rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebwindowfeatures.h
 drwxr-xr-x	root/root	usr/lib/
 -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.7
-lrwxrwxrwx	root/root	usr/lib/libwebkit-1.0.so.2 -> libwebkit-1.0.so.2.17.7
--rwxr-xr-x	root/root	usr/lib/libwebkit-1.0.so.2.17.7
+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
 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/webkit/.md5sum b/webkit/.md5sum
index 67353b86a..81ee0d2c0 100644
--- a/webkit/.md5sum
+++ b/webkit/.md5sum
@@ -1 +1,2 @@
-09f04985665b9abf6f0d9956f86a6a31  webkit-1.2.5.tar.gz
+4d4be06efe580ee0e99425e59a7b7aba  webkit-1.2.6-parallel_build.patch
+7afb510040b2a49c65514a06bb8200fc  webkit-1.2.6.tar.gz
diff --git a/webkit/Pkgfile b/webkit/Pkgfile
index 876b48217..ea111f4c0 100644
--- a/webkit/Pkgfile
+++ b/webkit/Pkgfile
@@ -5,13 +5,19 @@
 # Depends on: enchant gst-plugins-base gtk icu libsoup xorg-libxdamage xorg-libxt
 
 name=webkit
-version=1.2.5
+version=1.2.6
 release=1
-source=(http://webkitgtk.org/$name-$version.tar.gz)
+source=(http://webkitgtk.org/$name-$version.tar.gz
+	webkit-1.2.6-parallel_build.patch)
 
 build() {
 	cd $name-$version
 
+	patch -p 1 -i $SRC/webkit-1.2.6-parallel_build.patch
+
+	# Don't force to -O2 but use CXXFLAGS
+	sed -i -e 's/-O2//g' configure
+
 	./configure \
 		--prefix=/usr \
 		--enable-video \
diff --git a/webkit/webkit-1.2.6-parallel_build.patch b/webkit/webkit-1.2.6-parallel_build.patch
new file mode 100644
index 000000000..0d9acda71
--- /dev/null
+++ b/webkit/webkit-1.2.6-parallel_build.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/attachment.cgi?id=255707&action=view
+diff -pruN webkit-1.2.6.orig/JavaScriptCore/wtf/Platform.h webkit-1.2.6/JavaScriptCore/wtf/Platform.h
+--- webkit-1.2.6.orig/JavaScriptCore/wtf/Platform.h	2011-01-05 15:16:47.422539427 +0000
++++ webkit-1.2.6/JavaScriptCore/wtf/Platform.h	2011-01-05 15:17:26.329539427 +0000
+@@ -775,7 +775,7 @@
+ /* ENABLE macro defaults */
+ 
+ #if PLATFORM(QT)
+-// We musn't customize the global operator new and delete for the Qt port.
++/* We musn't customize the global operator new and delete for the Qt port. */
+ #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
+ #endif
+