[webkitgtk3] Copy changes from webkitgtk

[Matthias Clasen]

commit 4e3c594c891bc854e47e9fc4dc829a9258f7157c
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Fri Sep 24 08:05:37 2010 -0400

    Copy changes from webkitgtk

 webkit-1.3.4-no-execmem.patch |   12 ++++++++++++
 webkitgtk3.spec               |   20 +++++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/webkit-1.3.4-no-execmem.patch b/webkit-1.3.4-no-execmem.patch
new file mode 100644
index 0000000..2c18014
--- /dev/null
+++ b/webkit-1.3.4-no-execmem.patch
@@ -0,0 +1,12 @@
+diff -Nur webkit-1.3.4.orig/JavaScriptCore/wtf/Platform.h webkit-1.3.4/JavaScriptCore/wtf/Platform.h
+--- webkit-1.3.4.orig/JavaScriptCore/wtf/Platform.h	2010-09-22 13:09:17.000000000 -0600
++++ webkit-1.3.4/JavaScriptCore/wtf/Platform.h	2010-09-23 12:13:19.692721521 -0600
+@@ -1025,7 +1025,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
+ #else
+ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index e4ce660..dda05c3 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
 
 Name:           webkitgtk3
 Version:        1.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -16,8 +16,9 @@ URL:            http://www.webkitgtk.org/
 
 Source0:        http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
-Patch0:         webkit-1.1.14-nspluginwrapper.patch
-#Patch1:         webkit-1.3.3-s390.patch
+Patch1:         webkit-1.3.4-no-execmem.patch
+Patch2:         webkit-1.1.14-nspluginwrapper.patch
+#Patch3:         webkit-1.3.3-s390.patch
 
 BuildRequires:  bison
 BuildRequires:  chrpath
@@ -66,8 +67,9 @@ files for developing applications that use %{name}.
 
 %prep
 %setup -qn "webkit-%{version}"
-%patch0 -p1 -b .nspluginwrapper
-#%patch1 -p1 -b .s390
+%patch1 -p1 -b .no-execmem
+%patch2 -p1 -b .nspluginwrapper
+#%patch3 -p1 -b .s390
 
 %build
 %ifarch s390
@@ -77,7 +79,7 @@ files for developing applications that use %{name}.
 
 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure                                                   \
                         --with-gtk=3.0                          \
-                        --disable-jit                           \
+                        --enable-jit                            \
                         --enable-geolocation                    \
                         --enable-introspection
 
@@ -132,11 +134,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_libexecdir}/%{name}/
 %{_datadir}/glib-2.0/schemas/org.webkitgtk-3.0.gschema.xml
 %{_datadir}/webkitgtk-3.0
+%{_datadir}/webkit-3.0
 
 %files  devel
 %defattr(-,root,root,-)
 %{_bindir}/jsc-3
-%{_datadir}/webkit-3.0
 %{_includedir}/webkit-3.0
 %{_libdir}/libwebkitgtk-3.0.so
 %{_libdir}/pkgconfig/webkitgtk-3.0.pc
@@ -145,6 +147,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Fri Sep 24 2010 Matthias Clasen <mclasen at redhat.com> 1.3.4-2
+- Enable JIT/patch for execmem
+- Move inspector to the main package
+
 * Thu Sep 23 2010 Matthias Clasen <mclasen at redhat.com> 1.3.4-1
 - Update to 1.3.4