[webkitgtk3] fix build for non-JIT arches
Dan Horák
sharkcz at fedoraproject.org
Tue Dec 18 16:22:25 UTC 2012
commit afdc706613a7d0a7013b866d5034943db798552d
Author: Dan Horák <dan at danny.cz>
Date: Tue Dec 18 17:22:19 2012 +0100
fix build for non-JIT arches
webkit-1.11.2-includes.patch | 11 +++++++++++
webkit-1.11.2-yarr.patch | 12 ++++++++++++
webkitgtk3.spec | 12 +++++++++++-
3 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/webkit-1.11.2-includes.patch b/webkit-1.11.2-includes.patch
new file mode 100644
index 0000000..ccc11a1
--- /dev/null
+++ b/webkit-1.11.2-includes.patch
@@ -0,0 +1,11 @@
+diff -up webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h.includes webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h
+--- webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h.includes 2012-12-16 23:12:06.000000000 +0100
++++ webkitgtk-1.11.2/Source/JavaScriptCore/runtime/ArrayConstructor.h 2012-12-16 23:12:21.000000000 +0100
+@@ -21,6 +21,7 @@
+ #ifndef ArrayConstructor_h
+ #define ArrayConstructor_h
+
++#include "ArrayAllocationProfile.h"
+ #include "InternalFunction.h"
+
+ namespace JSC {
diff --git a/webkit-1.11.2-yarr.patch b/webkit-1.11.2-yarr.patch
new file mode 100644
index 0000000..4653594
--- /dev/null
+++ b/webkit-1.11.2-yarr.patch
@@ -0,0 +1,12 @@
+diff -up webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig webkitgtk-1.11.2/Source/WTF/wtf/Platform.h
+--- webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig 2012-12-16 21:27:29.000000000 +0100
++++ webkitgtk-1.11.2/Source/WTF/wtf/Platform.h 2012-12-16 23:16:19.000000000 +0100
+@@ -1001,7 +1001,7 @@
+ #define ENABLE_REGEXP_TRACING 0
+
+ /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
+-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM)
++#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM)
+ #define ENABLE_YARR_JIT 1
+
+ /* Setting this flag compares JIT results with interpreter results. */
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 76d7b1b..760665c 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
Name: webkitgtk3
Version: 1.11.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@@ -21,6 +21,11 @@ Patch2: webkit-1.1.14-nspluginwrapper.patch
# Explicitly link with -lrt
# https://bugs.webkit.org/show_bug.cgi?id=103194
Patch3: webkitgtk-librt.patch
+# workarounds for non-JIT arches
+# https://bugs.webkit.org/show_bug.cgi?id=104270
+Patch4: webkit-1.11.2-yarr.patch
+# https://bugs.webkit.org/show_bug.cgi?id=105295
+Patch5: webkit-1.11.2-includes.patch
BuildRequires: bison
BuildRequires: chrpath
@@ -89,6 +94,8 @@ This package contains developer documentation for %{name}.
# %patch1 -p1 -b .no-execmem
%patch2 -p1 -b .nspluginwrapper
%patch3 -p1 -b .librt
+%patch4 -p1 -b .yarr
+%patch5 -p1 -b .includes
# For patch3
autoreconf --verbose --install -I Source/autotools
@@ -205,6 +212,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog
+* Tue Dec 18 2012 Dan Horák <dan[at]danny.cz> - 1.11.2-2
+- fix build for non-JIT arches
+
* Sat Nov 24 2012 Kalev Lember <kalevlember at gmail.com> - 1.11.2-1
- Update to 1.11.2
- Add a patch to explicitly link with librt
More information about the scm-commits
mailing list