[webkitgtk3] fix 32-bit non-JIT arches
Dan Horák
sharkcz at fedoraproject.org
Tue Dec 18 21:49:14 UTC 2012
commit 34229148bca349bc22b0a37f5a90d61fe1cbda9a
Author: Dan Horák <dan at danny.cz>
Date: Tue Dec 18 22:49:08 2012 +0100
fix 32-bit non-JIT arches
webkit-1.11.2-Double2Ints.patch | 22 ++++++++++++++++++++++
webkitgtk3.spec | 8 +++++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/webkit-1.11.2-Double2Ints.patch b/webkit-1.11.2-Double2Ints.patch
new file mode 100644
index 0000000..c602985
--- /dev/null
+++ b/webkit-1.11.2-Double2Ints.patch
@@ -0,0 +1,22 @@
+Index: Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+===================================================================
+--- webkitgtk-1.11.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (Revision 137796)
++++ webkitgtk-1.11.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (Arbeitskopie)
+@@ -116,6 +116,17 @@
+ u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
+ return u.dval;
+ }
++
++static void Double2Ints(double input, intptr_t lo, intptr_t hi)
++{
++ union {
++ double dval;
++ int64_t ival64;
++ } u;
++ u.dval = input;
++ *(reinterpret_cast<int32_t*>(hi)) = static_cast<int32_t>(u.ival64 >> 32);
++ *(reinterpret_cast<int32_t*>(lo)) = static_cast<int32_t>(u.ival64);
++}
+ #endif // USE(JSVALUE32_64)
+
+ } // namespace LLint
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 760665c..8fc3169 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
Name: webkitgtk3
Version: 1.11.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@@ -26,6 +26,8 @@ Patch3: webkitgtk-librt.patch
Patch4: webkit-1.11.2-yarr.patch
# https://bugs.webkit.org/show_bug.cgi?id=105295
Patch5: webkit-1.11.2-includes.patch
+# https://bugs.webkit.org/show_bug.cgi?id=103128
+Patch6: webkit-1.11.2-Double2Ints.patch
BuildRequires: bison
BuildRequires: chrpath
@@ -96,6 +98,7 @@ This package contains developer documentation for %{name}.
%patch3 -p1 -b .librt
%patch4 -p1 -b .yarr
%patch5 -p1 -b .includes
+%patch6 -p1 -b .double2ints
# For patch3
autoreconf --verbose --install -I Source/autotools
@@ -212,6 +215,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-3
+- fix 32-bit non-JIT arches
+
* Tue Dec 18 2012 Dan Horák <dan[at]danny.cz> - 1.11.2-2
- fix build for non-JIT arches
More information about the scm-commits
mailing list