[packages/gtk-webkit4] - rediffed x32 patch; release 2

[qboosh]

commit 3da177b8398f8856096979f39afd280c5c8d4e66
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 13 21:39:02 2021 +0100

    - rediffed x32 patch; release 2

 gtk-webkit4.spec |  2 +-
 x32.patch        | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index 4174a63..717fb11 100644
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -18,7 +18,7 @@ Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do GTK+ 3
 Name:		gtk-webkit4
 # NOTE: 2.30.x is stable, 2.31.x devel
 Version:	2.30.5
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
diff --git a/x32.patch b/x32.patch
index 8ea98d7..d5a922f 100644
--- a/x32.patch
+++ b/x32.patch
@@ -7,21 +7,19 @@ Description: Use WTF_CPU_UNKNOWN when building for X32
 Forwarded: no
 Index: webkitgtk/Source/WTF/wtf/Platform.h
 ===================================================================
---- webkitgtk-2.28.0/Source/WTF/wtf/PlatformCPU.h.orig	2020-02-04 11:24:07.000000000 +0100
-+++ webkitgtk-2.28.0/Source/WTF/wtf/PlatformCPU.h	2020-04-12 22:28:20.564373047 +0200
-@@ -107,10 +107,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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit4.git/commitdiff/3da177b8398f8856096979f39afd280c5c8d4e66