Update to 1.3.12

This commit is contained in:
Kevin Fenzi 2011-02-24 13:58:08 -07:00
parent 8b7ad9e866
commit 67c76ad3cd
4 changed files with 8 additions and 18 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -1 +1 @@
6d4506086fb0d274d1a2c871fcaf851e webkit-1.3.11.tar.gz
f76350682f56761e734faba8689903b5 webkit-1.3.12.tar.gz

View File

@ -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

View File

@ -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 <kevin@tummy.com> - 1.3.12-1
- Update to 1.3.12
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild