Bug#856498: webkit2gtk: FTBFS on x32

[Thorsten Glaser]

Source: webkit2gtk
Version: 2.14.5-1
Severity: important
Justification: fails to build from source on debian-ports arch

“WTF” doesn’t know that x32 is not amd64; the fix is trivial;
debdiff attached (which I also uploaded to “unreleased”).

Please apply and forward upstream. Thanks!

-- System Information:
Debian Release: 9.0
  APT prefers unreleased
  APT policy: (500, 'unreleased'), (500, 'buildd-unstable'), (500, 'unstable')
Architecture: x32 (x86_64)
Foreign Architectures: i386, amd64

Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/lksh
Init: sysvinit (via /sbin/init)
-------------- next part --------------
--- webkit2gtk-2.14.5/debian/changelog	2017-02-15 09:42:51.000000000 +0100
+++ webkit2gtk-2.14.5/debian/changelog	2017-03-01 15:14:34.000000000 +0100
@@ -1,3 +1,11 @@
+webkit2gtk (2.14.5-1+x32.1) unreleased; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/fix-ftbfs-x32.patch:
+    + Fix FTBFS on x32.
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 01 Mar 2017 15:14:34 +0100
+
 webkit2gtk (2.14.5-1) unstable; urgency=high
 
   * New upstream release (Closes: #855103).
--- webkit2gtk-2.14.5/debian/patches/fix-ftbfs-x32.patch	1970-01-01 01:00:00.000000000 +0100
+++ webkit2gtk-2.14.5/debian/patches/fix-ftbfs-x32.patch	2017-03-01 15:14:26.000000000 +0100
@@ -0,0 +1,11 @@
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -696,7 +696,7 @@
+ #endif
+ 
+ #if !defined(USE_JSVALUE64) && !defined(USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
++#if (CPU(X86_64) && !defined(__ILP32__) && (OS(UNIX) || OS(WINDOWS))) \
+     || (CPU(IA64) && !CPU(IA64_32)) \
+     || CPU(ALPHA) \
+     || CPU(ARM64) \
--- webkit2gtk-2.14.5/debian/patches/series	2017-02-15 09:42:51.000000000 +0100
+++ webkit2gtk-2.14.5/debian/patches/series	2017-03-01 15:08:33.000000000 +0100
@@ -2,3 +2,4 @@
 fix-ftbfs-alpha.patch
 fix-ftbfs-armel.patch
 fix-ftbfs-hurd.patch
+fix-ftbfs-x32.patch