[packages/gtk-webkit4] - fix building on x32 - rel 2

[baggins]

commit 72628bc4ef0b038212b35bc932b36b1b16f93e00
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 6 22:57:30 2015 +0000

    - fix building on x32
    - rel 2

 gtk-webkit4.spec |  7 ++++++-
 x32.patch        | 29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index 4df3226..a5348b4 100644
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -13,11 +13,12 @@ Summary:	Port of WebKit embeddable web component to GTK+ 3
 Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do GTK+ 3
 Name:		gtk-webkit4
 Version:	2.6.5
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 # Source0-md5:	44addb5ccdace97642cb7656382293bb
+Patch0:		x32.patch
 URL:		http://webkitgtk.org/
 BuildRequires:	/usr/bin/ld.gold
 BuildRequires:	EGL-devel
@@ -131,6 +132,7 @@ Dokumentacja API WebKita.
 
 %prep
 %setup -q -n webkitgtk-%{version}
+%patch0 -p1
 
 %build
 install -d build
@@ -145,6 +147,9 @@ LDFLAGS="%{rpmldflags} -fuse-ld=gold"
 	%{!?with_gtk2:-DENABLE_PLUGIN_PROCESS_GTK2=OFF} \
 	%{?with_seccomp:-DENABLE_SECCOMP_FILTERS=ON} \
 	%{?with_wayland:-DENABLE_WAYLAND_TARGET=ON} \
+%ifarch x32
+	-DENABLE_JIT=OFF \
+%endif
 	-DENABLE_VIDEO=ON \
 	-DENABLE_WEB_AUDIO=ON \
 	-DENABLE_WEBGL=ON \
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..d47f7cd
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,29 @@
+From: Daniel Schepler <dschepler at gmail.com>
+Subject: Fix FTBFS in x32
+Bug-Debian: https://bugs.debian.org/700795
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -179,8 +179,12 @@
+ /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
+ #if   defined(__x86_64__) \
+     || defined(_M_X64)
++#ifdef __ILP32__
++#define WTF_CPU_X86_64_32 1
++#else
+ #define WTF_CPU_X86_64 1
+ #endif
++#endif
+ 
+ /* CPU(ARM64) - Apple */
+ #if defined(__arm64__) && defined(__APPLE__)
+@@ -826,7 +826,7 @@
+ #define ENABLE_REGEXP_TRACING 0
+ 
+ /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
+-#if !defined(ENABLE_YARR_JIT)
++#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT)
+ #define ENABLE_YARR_JIT 1
+ 
+ /* Setting this flag compares JIT results with interpreter results. */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit4.git/commitdiff/72628bc4ef0b038212b35bc932b36b1b16f93e00