From dafff112f9d69ee9488f0a7ecf241a983cca17fd Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Mon, 5 Feb 2024 13:59:18 -0600
Subject: [PATCH] Update to WebKitGTK 2.42.5

---
 .gitignore         |  2 ++
 i686-build.patch   | 16 ++++++++++++++++
 sources            |  4 ++--
 webkit2gtk4.0.spec |  5 ++++-
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 i686-build.patch

diff --git a/.gitignore b/.gitignore
index ce4e5f1..c4adc8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /webkitgtk-2.42.3.tar.xz.asc
 /webkitgtk-2.42.4.tar.xz
 /webkitgtk-2.42.4.tar.xz.asc
+/webkitgtk-2.42.5.tar.xz
+/webkitgtk-2.42.5.tar.xz.asc
diff --git a/i686-build.patch b/i686-build.patch
new file mode 100644
index 0000000..1b5ec0d
--- /dev/null
+++ b/i686-build.patch
@@ -0,0 +1,16 @@
+From: Alberto Garcia <berto@igalia.com>
+Subject: Fix FTBFS in i386
+Bug: https://bugs.webkit.org/show_bug.cgi?id=268739
+Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+===================================================================
+--- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
++++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc
+     UNUSED_VARIABLE(t2);
+     UNUSED_VARIABLE(t3);
+     UNUSED_VARIABLE(t5);
+-    UNUSED_VARIABLE(t6);
+-    UNUSED_VARIABLE(t7);
+ 
+     struct StackPointerScope {
+         StackPointerScope(CLoopStack& stack)
diff --git a/sources b/sources
index a3307cb..5daca3a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.42.4.tar.xz) = 2019408b3b6b2354ea3da380abaad34d51fed6d5ce9d5a9ff9db6f911d235f8a9eb765ccf1e5608ddc49516cafee9921b4a0f9912b9ae5af56701f8fc0f45293
-SHA512 (webkitgtk-2.42.4.tar.xz.asc) = 49d566e56710ae3d8d7af9b632a83304b63a65f80ce7d518ac47aa1f3ec80fdfbc21bd8233c43b488833a0a3e77baccfe9e8ccfd9a79d8ada74d465d23a29b16
+SHA512 (webkitgtk-2.42.5.tar.xz) = 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0
+SHA512 (webkitgtk-2.42.5.tar.xz.asc) = 9de7c3f7c75319e7d9a37cdf4929e392adb770a65acfdbb48e4288af66e1f6ef7372379e0d08f952b9a184a324e27e73fd64c5b7635aeef785cc3c8bdf4775a7
diff --git a/webkit2gtk4.0.spec b/webkit2gtk4.0.spec
index 5a554f8..08d6088 100644
--- a/webkit2gtk4.0.spec
+++ b/webkit2gtk4.0.spec
@@ -18,7 +18,7 @@
 %bcond_without docs
 
 Name:           webkit2gtk4.0
-Version:        2.42.4
+Version:        2.42.5
 Release:        %autorelease
 Summary:        WebKitGTK for GTK 3 and libsoup 2
 
@@ -56,6 +56,9 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg
 
+# https://bugs.webkit.org/show_bug.cgi?id=268739
+Patch:          i686-build.patch
+
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake