[webkitgtk] Update to 1.3.10

[Kevin Fenzi]

commit f2cabc322e4898954dc8614f030ff6f077254e8b
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Mon Jan 10 22:29:53 2011 -0700

    Update to 1.3.10

 webkit-1.1.12-atomic-word.patch                    |   73 ----------
 webkit-1.1.12-no-execmem.patch                     |   12 --
 webkit-1.1.13-no-execmem.patch                     |   12 --
 webkit-1.1.14-atomic-word.patch                    |   75 -----------
 webkit-1.1.22-icu44.patch                          |  141 --------------------
 webkit-1.1.22-sparc.patch                          |   15 --
 ...execmem.patch => webkit-1.3.10-no-execmem.patch |    8 +-
 ...er.patch => webkit-1.3.10-nspluginwrapper.patch |    7 +-
 webkit-1.3.4-s390.patch                            |   30 ----
 webkitgtk.spec                                     |   39 +++---
 10 files changed, 26 insertions(+), 386 deletions(-)
---
diff --git a/webkit-1.3.4-no-execmem.patch b/webkit-1.3.10-no-execmem.patch
similarity index 50%
rename from webkit-1.3.4-no-execmem.patch
rename to webkit-1.3.10-no-execmem.patch
index 2c18014..ee49a10 100644
--- a/webkit-1.3.4-no-execmem.patch
+++ b/webkit-1.3.10-no-execmem.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Nur webkit-1.3.10.orig/Source/JavaScriptCore/wtf/Platform.h webkit-1.3.10/Source/JavaScriptCore/wtf/Platform.h
+--- webkit-1.3.10.orig/Source/JavaScriptCore/wtf/Platform.h	2011-01-10 18:07:11.000000000 -0700
++++ webkit-1.3.10/Source/JavaScriptCore/wtf/Platform.h	2011-01-10 20:53:01.422468389 -0700
+@@ -1036,7 +1036,7 @@
  #endif
  /* Setting this flag prevents the assembler from using RWX memory; this may improve
     security but currectly comes at a significant performance cost. */
diff --git a/webkit-1.1.14-nspluginwrapper.patch b/webkit-1.3.10-nspluginwrapper.patch
similarity index 52%
rename from webkit-1.1.14-nspluginwrapper.patch
rename to webkit-1.3.10-nspluginwrapper.patch
index c6d4f02..64989bc 100644
--- a/webkit-1.1.14-nspluginwrapper.patch
+++ b/webkit-1.3.10-nspluginwrapper.patch
@@ -1,6 +1,7 @@
---- webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp.old	2009-12-01 15:22:10.000000000 +0000
-+++ webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp	2009-12-01 15:22:21.000000000 +0000
-@@ -357,6 +357,9 @@ Vector<String> PluginDatabase::defaultPl
+diff -Nur webkit-1.3.10.orig/Source/WebCore/plugins/PluginDatabase.cpp webkit-1.3.10/Source/WebCore/plugins/PluginDatabase.cpp
+--- webkit-1.3.10.orig/Source/WebCore/plugins/PluginDatabase.cpp	2011-01-08 09:50:59.000000000 -0700
++++ webkit-1.3.10/Source/WebCore/plugins/PluginDatabase.cpp	2011-01-10 20:55:42.528231854 -0700
+@@ -393,6 +393,9 @@
      paths.append("/usr/lib64/mozilla/plugins");
      paths.append("/usr/lib/nsbrowser/plugins");
      paths.append("/usr/lib64/nsbrowser/plugins");
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 15422ae..232a80d 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -34,8 +34,8 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.3.9
-Release:	4%{?dist}
+Version:	1.3.10
+Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -53,8 +53,8 @@ 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.4-no-execmem.patch
-Patch2: 	webkit-1.1.14-nspluginwrapper.patch
+Patch1: 	webkit-1.3.10-no-execmem.patch
+Patch2: 	webkit-1.3.10-nspluginwrapper.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -153,26 +153,20 @@ install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
 ##find_lang webkit-2.0
 
 ## Finally, copy over and rename the various files for %%doc inclusion.
-%add_to_doc_files JavaScriptCore/icu/LICENSE
 %add_to_doc_files WebKit/LICENSE
-%add_to_doc_files WebCore/icu/LICENSE
-%add_to_doc_files WebCore/LICENSE-APPLE
-%add_to_doc_files WebCore/LICENSE-LGPL-2
-%add_to_doc_files WebCore/LICENSE-LGPL-2.1
-
-%add_to_doc_files JavaScriptCore/pcre/COPYING
-%add_to_doc_files JavaScriptCore/COPYING.LIB
-
-%add_to_doc_files JavaScriptCore/icu/README
 %add_to_doc_files WebKit/gtk/po/README
-
-%add_to_doc_files JavaScriptCore/AUTHORS
-%add_to_doc_files JavaScriptCore/pcre/AUTHORS
-
-%add_to_doc_files JavaScriptCore/THANKS
-
 %add_to_doc_files WebKit/gtk/NEWS
-
+%add_to_doc_files Source/WebCore/icu/LICENSE
+%add_to_doc_files Source/WebCore/LICENSE-APPLE
+%add_to_doc_files Source/WebCore/LICENSE-LGPL-2
+%add_to_doc_files Source/WebCore/LICENSE-LGPL-2.1
+%add_to_doc_files Source/JavaScriptCore/COPYING.LIB
+%add_to_doc_files Source/JavaScriptCore/THANKS
+%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}
@@ -214,6 +208,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Mon Jan 10 2011 Kevin Fenzi <kevin at tummy.com> - 1.3.10-1
+- Update to 1.3.10
+
 * Tue Jan 04 2011 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1.3.9-4
 - Upgrade to 1.3.9
 - Remove s390 patch, it was absorbed upstream