- fix build on x32

- rel 2

diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index 61ca8ff9b67075ed3d48634e8d178b822fd46de2..472da31ec8f8eb2917c6d189a773136d4ea3a8de 100644 (file)
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -11,13 +11,14 @@ Summary(pl.UTF-8):  Port osadzalnego komponentu WWW WebKit do GTK+ 3
 Name:          gtk-webkit3
 # note: for 2.6.x series see gtk-webkit4
 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:                atomic-ops.patch
 Patch1:                webkitgtk-redefined.patch
+Patch2:                x32.patch
 URL:           http://webkitgtk.org/
 BuildRequires: /usr/bin/ld.gold
 BuildRequires: EGL-devel
@@ -140,6 +141,7 @@ Dokumentacja API WebKita.
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..03054b7
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,29 @@
+From: Daniel Schepler <dschepler@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. */