X-Git-Url: http://git.pld-linux.org/?p=packages%2Fwpe-webkit.git;a=blobdiff_plain;f=wpe-webkit-x32.patch;h=62cffb66deea2e854634898537215859c6184d77;hp=715a4ff283cd90e50adc01090a774ae73bcb444f;hb=71af4dc4b541e59cf3cfdff153ca178f26f7f560;hpb=8dd135444b248f274251b3c0a0550594e74d8e1e

diff --git a/wpe-webkit-x32.patch b/wpe-webkit-x32.patch
index 715a4ff..62cffb6 100644
--- a/wpe-webkit-x32.patch
+++ b/wpe-webkit-x32.patch
@@ -7,31 +7,27 @@ Description: Use WTF_CPU_UNKNOWN when building for X32
 Forwarded: no
 Index: webkitgtk/Source/WTF/wtf/Platform.h
 ===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -142,10 +142,12 @@
+--- 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)
-+#if !defined(__ILP32__)
+-#if   defined(__x86_64__) \
+-    || defined(_M_X64)
++#if ( defined(__x86_64__) \
++    || defined(_M_X64) ) && !defined(__ILP32__)
  #define WTF_CPU_X86_64 1
  #define WTF_CPU_X86_SSE2 1
  #define WTF_CPU_KNOWN 1
- #endif
-+#endif
- 
- /* CPU(ARM64) - Apple */
- #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
-Index: webkitgtk/CMakeLists.txt
-===================================================================
---- webkitgtk.orig/CMakeLists.txt
-+++ webkitgtk/CMakeLists.txt
-@@ -93,6 +93,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
-     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
+--- 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