[webkitgtk] fix build on s390(x)
Dan Horák
sharkcz at fedoraproject.org
Wed Oct 12 18:17:03 UTC 2011
commit 96d6f523ba09b5ec0709cf02d4c38d274e3059b1
Author: Dan Horák <dan at danny.cz>
Date: Wed Oct 12 20:17:01 2011 +0200
fix build on s390(x)
webkit-1.6.1-dtoa-s390.patch | 12 ++++++++++++
webkitgtk.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/webkit-1.6.1-dtoa-s390.patch b/webkit-1.6.1-dtoa-s390.patch
new file mode 100644
index 0000000..3cd7806
--- /dev/null
+++ b/webkit-1.6.1-dtoa-s390.patch
@@ -0,0 +1,12 @@
+diff -up webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h
+--- webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa 2011-10-12 15:28:33.000000000 +0200
++++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-12 15:28:52.000000000 +0200
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 5d8538b..a0db2f5 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -35,7 +35,7 @@
Name: webkitgtk
Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK+ Web content engine library
Provides: WebKit-gtk = %{version}-%{release}
@@ -55,6 +55,8 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
## bug. :)
Patch1: webkit-1.3.12-no-execmem.patch
Patch2: webkit-1.3.10-nspluginwrapper.patch
+# https://bugs.webkit.org/show_bug.cgi?id=69940
+Patch3: webkit-1.6.1-dtoa-s390.patch
BuildRequires: bison
BuildRequires: chrpath
@@ -118,6 +120,7 @@ LICENSE, README, and AUTHORS files.
%setup -qn "webkit-%{version}"
%patch1 -p1 -b .no-execmem
%patch2 -p1 -b .nspluginwrapper
+%patch3 -p1 -b .dtoa-s390
%build
%ifarch s390
@@ -207,6 +210,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_docdir}/%{name}-%{version}/
%changelog
+* Wed Oct 12 2011 Dan Horák <dan[at]danny.cz> - 1.6.1-2
+- fix build on s390(x)
+
* Tue Sep 27 2011 Kevin Fenzi <kevin at scrye.com> - 1.6.1-1
- Update to 1.6.1
More information about the scm-commits
mailing list