From 1d827f4cdab7da8bef57cebd6acd4e58c9dd5db8 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Fri, 16 Jan 2026 00:54:10 +0000
Subject: [PATCH] webkitgtk: upgrade 2.50.0 -> 2.50.4

---
 ...able-to-control-macro-__PAS_ALWAYS_I.patch |  8 +-
 ...spection.cmake-prefix-variables-obta.patch |  2 +-
 ...-on-RISCV-https-bugs.webkit.org-show.patch |  4 +-
 .../webkit/webkitgtk/fix-ftbfs-riscv64.patch  | 24 +++--
 .../webkitgtk/fix-musl-compilation.patch      | 94 -------------------
 ...ceof_handler_for_32-bit_C-loop_build.patch | 16 ++--
 .../webkit/webkitgtk/reproducibility.patch    |  2 +-
 .../webkit/webkitgtk/sys_futex.patch          | 11 ++-
 .../webkit/webkitgtk/t6-not-declared.patch    |  6 +-
 ...ebkitgtk_2.50.0.bb => webkitgtk_2.50.4.bb} |  3 +-
 10 files changed, 46 insertions(+), 124 deletions(-)
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/fix-musl-compilation.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.50.0.bb => webkitgtk_2.50.4.bb} (98%)

diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch b/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch
index f990384511..7f16ddd777 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch
@@ -1,4 +1,4 @@
-From bbf661310448d430350eb2ad8c5869ace648dcf8 Mon Sep 17 00:00:00 2001
+From 35b0d7feecbfb96b4fd68082086bd088cf395a3c Mon Sep 17 00:00:00 2001
 From: Kai Kang <kai.kang@windriver.com>
 Date: Fri, 11 Aug 2023 14:20:48 +0800
 Subject: [PATCH] Add a variable to control macro
@@ -44,7 +44,7 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
-index 5d5fb38c..a554f700 100644
+index ea511e5b..2e8df1e5 100644
 --- a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
 +++ b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
 @@ -44,7 +44,7 @@ __PAS_BEGIN_EXTERN_C;
@@ -57,10 +57,10 @@ index 5d5fb38c..a554f700 100644
  #else
  #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE
 diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index f5ec0a55..dfd741e7 100644
+index 77a292fb..bf53d809 100644
 --- a/Source/cmake/WebKitCompilerFlags.cmake
 +++ b/Source/cmake/WebKitCompilerFlags.cmake
-@@ -503,3 +503,10 @@ endif ()
+@@ -512,3 +512,10 @@ endif ()
  
  # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438>
  set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
index b11a18ba22..4a67faa6ef 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
@@ -1,4 +1,4 @@
-From e0dfc113b016227da8a654d625e8f568b56761d0 Mon Sep 17 00:00:00 2001
+From 0451aa864f3e60bc9967fe18f1f9f7bee651c920 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 27 Oct 2015 16:02:19 +0200
 Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
index 40a7133052..9c4a8b00bb 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
@@ -1,4 +1,4 @@
-From 984538dcce7b184269efc1e1b0fb78e1cb932b5d Mon Sep 17 00:00:00 2001
+From 79898d0bcaf96e622d4b95c857524d0566aae28a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 21 Mar 2025 01:21:22 -0700
 Subject: [PATCH] Fix build errors on RISCV
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Source/WebCore/contentextensions/ContentExtensionActions.h b/Source/WebCore/contentextensions/ContentExtensionActions.h
-index 0b75d2e1df78..61cb33c94ce8 100644
+index a600f410..80512454 100644
 --- a/Source/WebCore/contentextensions/ContentExtensionActions.h
 +++ b/Source/WebCore/contentextensions/ContentExtensionActions.h
 @@ -28,6 +28,7 @@
diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch b/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch
index e436896098..0f148a4409 100644
--- a/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch
@@ -1,13 +1,17 @@
+From aa1ed5e0bca2f1b22352ed670882bae51afb7a6a Mon Sep 17 00:00:00 2001
 From: Alberto Garcia <berto@igalia.com>
-Description: Use WTF_CPU_UNKNOWN when building for riscv64
- WebKitGTK doesn't build on riscv64 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.
-Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
+Date: Fri, 16 Jan 2026 00:52:54 +0000
+Subject: [PATCH] Upstream-Status: Submitted
+ [https://bugs.webkit.org/show_bug.cgi?id=271371#c1] Signed-off-by: Khem Raj
+ <raj.khem@gmail.com>
 
-Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=271371#c1]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Source/WTF/wtf/PlatformCPU.h    | 8 --------
+ Source/cmake/WebKitCommon.cmake | 2 --
+ 2 files changed, 10 deletions(-)
+
+diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
+index 8aac1024..d9d69a40 100644
 --- a/Source/WTF/wtf/PlatformCPU.h
 +++ b/Source/WTF/wtf/PlatformCPU.h
 @@ -286,14 +286,6 @@
@@ -25,9 +29,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #if !CPU(KNOWN)
  #define WTF_CPU_UNKNOWN 1
  #endif
+diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
+index 98ee788a..3861c0a4 100644
 --- a/Source/cmake/WebKitCommon.cmake
 +++ b/Source/cmake/WebKitCommon.cmake
-@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+@@ -129,8 +129,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
          set(WTF_CPU_PPC64 1)
      elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
          set(WTF_CPU_PPC64LE 1)
diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-musl-compilation.patch b/meta/recipes-sato/webkit/webkitgtk/fix-musl-compilation.patch
deleted file mode 100644
index c0112cad18..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/fix-musl-compilation.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 820e4bb46d7e72ba2b14b15819166919c2e81205 Mon Sep 17 00:00:00 2001
-From: Adrian Perez de Castro <aperez@igalia.com>
-Date: Wed, 15 Oct 2025 00:58:59 +0300
-Subject: [PATCH] [libpas] Build fails with libc implementations that lack
- execinfo.h https://bugs.webkit.org/show_bug.cgi?id=300701
-
-Reviewed by NOBODY (OOPS!).
-
-Change guards to use backtrace() and execinfo.h on Linux only when using
-glibc as the C library. The PlayStation and Windows cases no longer need
-to be matched, as they are neither Linux nor Darwin, both of which are now
-explicitly listed. The Android check is kept as it was.
-
-* Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c:
-* Source/bmalloc/libpas/src/test/PGMTests.cpp:
-(addPGMTests):
-
-
-Fixes the following error in OE, when compiled with musl:
-
-| ${UNPACKDIR}/webkitgtk-2.50.0/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c:52:10: fatal error: execinfo.h: No such file or directory
-|    52 | #include <execinfo.h>
-
-
-Upstream-Status: Backport [https://github.com/WebKit/WebKit/pull/52300]
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
-
----
- .../pas_probabilistic_guard_malloc_allocator.c      |  4 ++--
- Source/bmalloc/libpas/src/test/PGMTests.cpp         | 13 ++++++-------
- 2 files changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c b/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c
-index ff3adefa7dcc..58ec32eb4fed 100644
---- a/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c
-+++ b/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c
-@@ -43,8 +43,8 @@
- #include <unistd.h>
- #endif
- 
--/* PlayStation does not currently support the backtrace API. Android API versions < 33 don't, either. Windows does not either. */
--#if !PAS_PLATFORM(PLAYSTATION) && (!PAS_OS(ANDROID) || __ANDROID_API__ >= 33) && !PAS_OS(WINDOWS)
-+/* PlayStation does not currently support the backtrace API. Android API versions < 33 don't, either. Windows does not either. Linux only with GLibc and not uCLibc/Musl. */
-+#if (PAS_OS(ANDROID) && __ANDROID_API__ >= 33) || PAS_OS(DARWIN) || (PAS_OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
- #include <execinfo.h>
- #else
- size_t backtrace(void** buffer, size_t size)
-diff --git a/Source/bmalloc/libpas/src/test/PGMTests.cpp b/Source/bmalloc/libpas/src/test/PGMTests.cpp
-index 0432f46ba3b0..dfbf957a3421 100644
---- a/Source/bmalloc/libpas/src/test/PGMTests.cpp
-+++ b/Source/bmalloc/libpas/src/test/PGMTests.cpp
-@@ -43,9 +43,9 @@
- #include "pas_report_crash.h"
- #include "pas_root.h"
- 
--#if !PAS_PLATFORM(PLAYSTATION)
-+#if (PAS_OS(ANDROID) && __ANDROID_API__ >= 33) || PAS_OS(DARWIN) || (PAS_OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
- #include <execinfo.h>
--#endif // !PAS_PLATFORM(PLAYSTATION)
-+#endif
- 
- using namespace std;
- 
-@@ -383,8 +383,7 @@ void testPGMMetadataVectorManagementFewDeallocations()
-     pas_heap_lock_unlock();
- }
- 
--/* Backtrace API is currently not supported on PlayStation. */
--#if !PAS_PLATFORM(PLAYSTATION)
-+#if (PAS_OS(ANDROID) && __ANDROID_API__ >= 33) || PAS_OS(DARWIN) || (PAS_OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
- void testPGMMetadataDoubleFreeBehavior()
- {
-     pas_probabilistic_guard_malloc_initialize_pgm_as_enabled(1);
-@@ -583,7 +582,7 @@ void testPGMAllocMetadataOnly()
-         CHECK(!dealloc_metadata);
-     }
- }
--#endif // !PAS_PLATFORM(PLAYSTATION)
-+#endif
- 
- } // anonymous namespace
- 
-@@ -598,9 +597,9 @@ void addPGMTests()
-     ADD_TEST(testPGMMetadataVectorManagement());
-     ADD_TEST(testPGMMetadataVectorManagementFewDeallocations());
-     ADD_TEST(testPGMMetadataVectorManagementRehash());
--#if !PAS_PLATFORM(PLAYSTATION)
-+#if (PAS_OS(ANDROID) && __ANDROID_API__ >= 33) || PAS_OS(DARWIN) || (PAS_OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
-     ADD_TEST(testPGMMetadataDoubleFreeBehavior());
-     ADD_TEST(testPGMBmallocAllocationBacktrace());
-     ADD_TEST(testPGMAllocMetadataOnly());
--#endif // !PAS_PLATFORM(PLAYSTATION)
-+#endif
- }
diff --git a/meta/recipes-sato/webkit/webkitgtk/fix_op_instanceof_handler_for_32-bit_C-loop_build.patch b/meta/recipes-sato/webkit/webkitgtk/fix_op_instanceof_handler_for_32-bit_C-loop_build.patch
index aa3b53e1bb..ceb88a4d81 100644
--- a/meta/recipes-sato/webkit/webkitgtk/fix_op_instanceof_handler_for_32-bit_C-loop_build.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/fix_op_instanceof_handler_for_32-bit_C-loop_build.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Fri Sep 19 11:55:30 2025 
+From 88e8b5a05743f043583591ced6b157955fb5f67a Mon Sep 17 00:00:00 2001
 From: amaxcz <amaxcz@gmail.com>
 Date: Fri, 19 Sep 2025 11:55:30 +0000
 Subject: [PATCH] JSC: fix op_instanceof handler for 32-bit C-loop build
@@ -15,10 +15,15 @@ which breaks 32‑bit builds.
 
 Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=299166]
 Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ .../llint/LowLevelInterpreter32_64.asm        | 95 ++++++++++++++++++-
+ 1 file changed, 94 insertions(+), 1 deletion(-)
 
---- ./Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2025-08-08 11:17:51.552549400 +0200
-+++ ./Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2025-09-19 12:34:26.253563496 +0200
-@@ -3445,4 +3445,97 @@
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 23a4c064..3b28fcb8 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -3448,4 +3448,97 @@ slowPathOp(enumerator_has_own_property)
  slowPathOp(mod)
  
  llintSlowPathOp(has_structure_with_flags)
@@ -117,6 +122,3 @@ Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
 +    storei 0, PayloadOffset[cfr, t5, 8]
 +    dispatch()
 +end)
-
--- 
-2.45.0
diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
index 436ad2f02c..1064aaab6c 100644
--- a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
@@ -1,4 +1,4 @@
-From 65e9a68c9d05f4902c2fc34303b7f8233ffa98d5 Mon Sep 17 00:00:00 2001
+From 7787cbb5eb13f04a4e205600c798768eb59336c6 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Mon, 3 Jan 2022 14:18:34 +0000
 Subject: [PATCH] webkitgtk: Add reproducibility fix
diff --git a/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch b/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch
index 19d18dea88..ffdd500bdf 100644
--- a/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch
@@ -1,7 +1,16 @@
-Fix build on newer 32bit architectures with only 64bit time_t
+From e4106381f580be24e34c51147bf932e5da6904c1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 18 Dec 2024 20:24:22 -0800
+Subject: [PATCH] Fix build on newer 32bit architectures with only 64bit time_t
 
 Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/angle/angle/+/6108397]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp b/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
+index 4ed0af51..11feda6c 100644
 --- a/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
 +++ b/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
 @@ -17,6 +17,9 @@
diff --git a/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch b/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch
index 4b0cf364d8..dea667d57e 100644
--- a/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch
@@ -1,4 +1,4 @@
-From 29431aec88764072a032aa4411e26e566a3a6c0b Mon Sep 17 00:00:00 2001
+From ddacdda43dd897b4632d28321a421bb2a0966ea1 Mon Sep 17 00:00:00 2001
 From: Michael Catanzaro <mcatanzaro@redhat.com>
 Date: Mon, 5 Feb 2024 11:00:49 -0600
 Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
@@ -21,10 +21,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-index 76c46889..500be433 100644
+index d80e882a..84448df2 100644
 --- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
 +++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
+@@ -340,8 +340,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
      UNUSED_VARIABLE(t2);
      UNUSED_VARIABLE(t3);
      UNUSED_VARIABLE(t5);
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.50.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.50.4.bb
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.50.0.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.50.4.bb
index a8d0a094b3..cfad411de9 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.50.0.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.50.4.bb
@@ -17,10 +17,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://sys_futex.patch \
            file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
            file://fix-ftbfs-riscv64.patch \
-           file://fix-musl-compilation.patch \
            file://fix_op_instanceof_handler_for_32-bit_C-loop_build.patch \
            "
-SRC_URI[sha256sum] = "e564b8099f9a3ae32409539b290bbd2ad084e99b6d22d4aac5e51e4554df8bc2"
+SRC_URI[sha256sum] = "d3bfa473845acfab72635bada5e0d134fda6792c5b95c5c5cd141b46125bd8e4"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
 
-- 
2.47.1

