[packages/gtk-webkit] - fixed build on x32; rel 2

[baggins]

commit 143c89ec37f6ae2464f778a22e37a58ebe76ff67
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 6 21:17:15 2015 +0000

    - fixed build on x32; rel 2
    
    Whoever devised a condition like this deserves a ignorance medal:
    
    if !JIT_ENABLED && (JIT_ENABLED || DISABLE_JIT)
    enable JIT
    endif
    
    This made disabling JIT impossible, what is required on x32 for now :/

 gtk-webkit.spec |  4 +++-
 x32.patch       | 29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index f5637c6..b4a4cb3 100644
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -7,11 +7,12 @@ Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do GTK+ 2
 Name:		gtk-webkit
 # note: 2.4.x is the last series with webkitgtk-1 API and GTK+ 2.x support
 Version:	2.4.8
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 # Source0-md5:	bcdcef8e1ba28dbd5bb05f86c79f76b8
+Patch0:		x32.patch
 URL:		http://webkitgtk.org/
 BuildRequires:	/usr/bin/ld.gold
 BuildRequires:	EGL-devel
@@ -108,6 +109,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 
 %prep
 %setup -q -n webkitgtk-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..03054b7
--- /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) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP))
++#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-webkit.git/commitdiff/143c89ec37f6ae2464f778a22e37a58ebe76ff67