From 67c76ad3cd0f0aabaac740ad5b442f6a7af7c5c4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 24 Feb 2011 13:58:08 -0700 Subject: [PATCH 1/4] Update to 1.3.12 --- .gitignore | 1 + sources | 2 +- webkit-1.3.10-no-execmem.patch | 12 ------------ webkitgtk.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 webkit-1.3.10-no-execmem.patch 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.10-no-execmem.patch b/webkit-1.3.10-no-execmem.patch deleted file mode 100644 index ee49a10..0000000 --- a/webkit-1.3.10-no-execmem.patch +++ /dev/null @@ -1,12 +0,0 @@ -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. */ --#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/webkitgtk.spec b/webkitgtk.spec index f636d91..4acf0c8 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: 1%{?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,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Wed Feb 23 2011 Kevin Fenzi - 1.3.12-1 +- Update to 1.3.12 + * Mon Feb 07 2011 Fedora Release Engineering - 1.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From b8088854e1e3fe95eda55231b8606aef4bc95452 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 24 Feb 2011 14:05:37 -0700 Subject: [PATCH 2/4] Commit patch too --- webkit-1.3.12-no-execmem.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 webkit-1.3.12-no-execmem.patch 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 + From 1f736e4e2d3ff18d69ec373b9d3e543b2f8e1679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 7 Mar 2011 15:05:14 +0000 Subject: [PATCH 3/4] rebuild for icu 4.6 --- webkitgtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkitgtk.spec b/webkitgtk.spec index 4acf0c8..abd12f8 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -35,7 +35,7 @@ Name: webkitgtk Version: 1.3.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Provides: WebKit-gtk = %{version}-%{release} @@ -206,6 +206,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Mon Mar 07 2011 Caolán McNamara - 1.3.12-2 +- rebuild for icu 4.6 + * Wed Feb 23 2011 Kevin Fenzi - 1.3.12-1 - Update to 1.3.12 From 2c2890ac81254b8eab6d6868b0d1f6d43950e3db Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 25 Mar 2011 13:58:37 -0600 Subject: [PATCH 4/4] Update to 1.3.13 --- .gitignore | 1 + sources | 2 +- webkitgtk.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 605a78f..6c5f61a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ webkit-1.3.2.tar.gz /webkit-1.3.10.tar.gz /webkit-1.3.11.tar.gz /webkit-1.3.12.tar.gz +/webkit-1.3.13.tar.gz diff --git a/sources b/sources index 59d0734..fdf6b18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f76350682f56761e734faba8689903b5 webkit-1.3.12.tar.gz +984adaafac545a89c24351fd4dbd743c webkit-1.3.13.tar.gz diff --git a/webkitgtk.spec b/webkitgtk.spec index abd12f8..eeb74ec 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -34,8 +34,8 @@ %bcond_with wml Name: webkitgtk -Version: 1.3.12 -Release: 2%{?dist} +Version: 1.3.13 +Release: 1%{?dist} Summary: GTK+ Web content engine library Provides: WebKit-gtk = %{version}-%{release} @@ -150,7 +150,7 @@ make install DESTDIR=%{buildroot} chrpath --delete Programs/GtkLauncher install -d -m 755 %{buildroot}%{_libexecdir}/%{name} install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name} -##find_lang webkit-2.0 +%find_lang webkit-2.0 ## Finally, copy over and rename the various files for %%doc inclusion. %add_to_doc_files Source/WebKit/LICENSE @@ -179,8 +179,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas glib-compile-schemas %{_datadir}/glib-2.0/schemas -##files -f webkit-2.0.lang -%files +%files -f webkit-2.0.lang %defattr(-,root,root,-) %exclude %{_libdir}/*.la %{_libdir}/libwebkitgtk-1.0.so.* @@ -206,6 +205,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Thu Mar 24 2011 Kevin Fenzi - 1.3.13-1 +- Update to 1.3.13 + * Mon Mar 07 2011 Caolán McNamara - 1.3.12-2 - rebuild for icu 4.6