[webkitgtk/f15/master] Update fedora-15 to latest webkitgtk

[Huzaifa Sidhpurwala]

commit 166d87a1d3846b14d1aa4bf8952cbd643c247f0f
Author: Huzaifa Sidhpurwala <huzaifas at redhat.com>
Date:   Fri Mar 11 13:29:06 2011 +0530

    Update fedora-15 to latest webkitgtk

 .gitignore                     |    1 +
 sources                        |    2 +-
 webkit-1.3.10-no-execmem.patch |   12 ------------
 webkit-1.3.12-no-execmem.patch |   12 ++++++++++++
 webkitgtk.spec                 |   17 ++++++++++++-----
 5 files changed, 26 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0318ae..605a78f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ webkit-1.3.2.tar.gz
 /webkit-1.3.9.tar.gz
 /webkit-1.3.10.tar.gz
 /webkit-1.3.11.tar.gz
+/webkit-1.3.12.tar.gz
diff --git a/sources b/sources
index 03321d7..59d0734 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d4506086fb0d274d1a2c871fcaf851e  webkit-1.3.11.tar.gz
+f76350682f56761e734faba8689903b5  webkit-1.3.12.tar.gz
diff --git a/webkit-1.3.12-no-execmem.patch b/webkit-1.3.12-no-execmem.patch
new file mode 100644
index 0000000..2fa9af9
--- /dev/null
+++ b/webkit-1.3.12-no-execmem.patch
@@ -0,0 +1,12 @@
+diff -Nur webkit-1.3.12.orig/Source/JavaScriptCore/wtf/Platform.h webkit-1.3.12/Source/JavaScriptCore/wtf/Platform.h
+--- webkit-1.3.12.orig/Source/JavaScriptCore/wtf/Platform.h	2011-02-22 04:11:16.000000000 -0700
++++ webkit-1.3.12/Source/JavaScriptCore/wtf/Platform.h	2011-02-23 22:59:16.603860759 -0700
+@@ -1069,7 +1069,7 @@
+ #endif
+ /* Setting this flag prevents the assembler from using RWX memory; this may improve
+    security but currectly comes at a significant performance cost. */
+-#if PLATFORM(IOS)
++#if PLATFORM(IOS) || PLATFORM(X86) || PLATFORM(X86_64)
+ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
+ #endif
+ 
diff --git a/webkitgtk.spec b/webkitgtk.spec
index f636d91..7057ca6 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -34,8 +34,8 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.3.11
-Release:	2%{?dist}
+Version:	1.3.12
+Release:	3%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -53,7 +53,7 @@ Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 ## 32- and 64-bit x86; but until we can fix the JIT to correctly handle WX
 ## memory, at least we'll have a WebKit stack that doesn't crash due to this
 ## bug. :)
-Patch1: 	webkit-1.3.10-no-execmem.patch
+Patch1: 	webkit-1.3.12-no-execmem.patch
 Patch2: 	webkit-1.3.10-nspluginwrapper.patch
 
 BuildRequires:	bison
@@ -165,8 +165,6 @@ install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
 %add_to_doc_files Source/JavaScriptCore/AUTHORS
 %add_to_doc_files Source/JavaScriptCore/icu/README
 %add_to_doc_files Source/JavaScriptCore/icu/LICENSE
-%add_to_doc_files Source/JavaScriptCore/pcre/COPYING
-%add_to_doc_files Source/JavaScriptCore/pcre/AUTHORS
 
 %clean
 rm -rf %{buildroot}
@@ -208,6 +206,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Fri Mar 11 2011 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1.3.12-3
+- Update to 1.3.12 in fedora-15
+
+* Mon Mar 07 2011 Caolán McNamara <caolanm at redhat.com> - 1.3.12-2
+- rebuild for icu 4.6
+
+* Wed Feb 23 2011 Kevin Fenzi <kevin at tummy.com> - 1.3.12-1
+- Update to 1.3.12
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild