- updated to 2.38.6

[packages/gtk-webkit4.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 5a79777c59d14fa9bab5ba9d4c31cd1d069c3c56..62cffb66deea2e854634898537215859c6184d77 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,30 +1,33 @@
-From: Daniel Schepler <dschepler@gmail.com>
-Subject: Fix FTBFS in x32
-Bug-Debian: https://bugs.debian.org/700795
+From: Alberto Garcia <berto@igalia.com>
+Description: Use WTF_CPU_UNKNOWN when building for X32
+ WebKitGTK doesn't build on X32 even with the JIT disabled.
+ Treating the CPU as unknown is perhaps a bit severe, but it allows us
+ to get the build done until someone steps up to maintain this
+ properly.
+Forwarded: no
 Index: webkitgtk/Source/WTF/wtf/Platform.h
 ===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -179,7 +179,11 @@
+--- webkitgtk-2.30.5/Source/WTF/wtf/PlatformCPU.h.orig 2020-08-12 11:17:54.000000000 +0200
++++ webkitgtk-2.30.5/Source/WTF/wtf/PlatformCPU.h      2021-03-13 19:14:43.872248582 +0100
+@@ -105,8 +105,8 @@
+ #endif
+ 
  /* 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
+-#if   defined(__x86_64__) \
+-    || defined(_M_X64)
++#if ( defined(__x86_64__) \
++    || defined(_M_X64) ) && !defined(__ILP32__)
  #define WTF_CPU_X86_64 1
-+#endif
  #define WTF_CPU_X86_SSE2 1
  #define WTF_CPU_KNOWN 1
- #endif
---- webkitgtk-2.24.1/Source/bmalloc/bmalloc/Gigacage.h.orig    2019-04-20 18:12:00.719079717 +0200
-+++ webkitgtk-2.24.1/Source/bmalloc/bmalloc/Gigacage.h 2019-04-20 18:17:04.960764832 +0200
-@@ -35,7 +35,7 @@
- #include <inttypes.h>
- 
- #if ((BOS(DARWIN) || BOS(LINUX)) && \
--(BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) && (!BPLATFORM(IOS_FAMILY) || BPLATFORM(IOS)))))
-+((BCPU(X86_64) && !defined(__ILP32__)) || (BCPU(ARM64) && !defined(__ILP32__) && (!BPLATFORM(IOS_FAMILY) || BPLATFORM(IOS)))))
- #define GIGACAGE_ENABLED 1
- #else
- #define GIGACAGE_ENABLED 0
+--- webkitgtk-2.32.0/Source/cmake/WebKitCommon.cmake.orig      2021-02-26 10:57:17.000000000 +0100
++++ webkitgtk-2.32.0/Source/cmake/WebKitCommon.cmake   2021-03-28 07:30:53.574578782 +0200
+@@ -90,6 +90,8 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+         set(WTF_CPU_MIPS64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+         set(WTF_CPU_MIPS 1)
++    elseif (CMAKE_CXX_COMPILER_ABI STREQUAL "ELF X32")
++        set(WTF_CPU_UNKNOWN 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
+         # FORCE_32BIT is set in the build script when --32-bit is passed
+         # on a Linux/intel 64bit host. This allows us to produce 32bit