@@ -1,4 +1,4 @@
-From 891c2de3ea6a3399d0144824c35b2dae0b7a246d Mon Sep 17 00:00:00 2001
+From bf74a02e45b3e147d912833a4ec6ba489a28344d 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
@@ -35,19 +35,21 @@ gcc option `-Og` is used.
* Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h:
* Source/cmake/WebKitCompilerFlags.cmake:
+Rebased on 2.54.2.
+
Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/16601]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h | 2 +-
- Source/cmake/WebKitCompilerFlags.cmake | 7 +++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
+ Source/cmake/WebKitCompilerFlags.cmake | 8 ++++++++
+ 2 files changed, 9 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 a845ed01..4bde7544 100644
+index c42ee5f1..353c58f3 100644
--- a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
+++ b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
-@@ -46,7 +46,7 @@ __PAS_BEGIN_EXTERN_C;
+@@ -45,7 +45,7 @@ __PAS_BEGIN_EXTERN_C;
#define __SUSPICIOUS__
#define __BROKEN__
@@ -57,14 +59,15 @@ index a845ed01..4bde7544 100644
#else
#define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index efdf8d4d..8c57ad5b 100644
+index 0793c789..9a139f2f 100644
--- a/Source/cmake/WebKitCompilerFlags.cmake
+++ b/Source/cmake/WebKitCompilerFlags.cmake
-@@ -570,3 +570,10 @@ endif ()
-
- # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438>
- set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON)
+@@ -635,3 +635,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND WTF_CPU_MIPS)
+ # (see comment #28 in the link above).
+ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-mno-lxc1-sxc1)
+ endif ()
+
++# rebased on 2.54.2
+# It fails to compile with `gcc -Og`
+set(WEBKIT_NO_INLINE_HINTS OFF CACHE BOOL "Disable funtion attribute always_inline for WebKit")
+
@@ -1,4 +1,4 @@
-From 3cec4a230abbe5c2f78f8966c06b009be7504354 Mon Sep 17 00:00:00 2001
+From 1eb26767f3ce493e8fd4ecd7a0d3d8bb645a225b 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
@@ -1,4 +1,4 @@
-From a6e91e04651dbd2d003dbaef0919284a8944184e Mon Sep 17 00:00:00 2001
+From 1899b9f2eadbe4f2cd5b4a68d0788e8a9f02cabb Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Sun, 21 Jun 2026 22:57:24 +0200
Subject: [PATCH] Source/cmake/FindGLib.cmake: do not set include dirs from
@@ -17,10 +17,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
1 file changed, 1 deletion(-)
diff --git a/Source/cmake/FindGLib.cmake b/Source/cmake/FindGLib.cmake
-index 00de647d..68581c25 100644
+index b6ff9283..e9697ba8 100644
--- a/Source/cmake/FindGLib.cmake
+++ b/Source/cmake/FindGLib.cmake
-@@ -191,7 +191,6 @@ function(GLib_HandleComponent name)
+@@ -195,7 +195,6 @@ function(GLib_HandleComponent name)
list(TRANSFORM dependencies PREPEND GLib::)
add_library(GLib::${name} UNKNOWN IMPORTED GLOBAL)
set_target_properties(GLib::${name} PROPERTIES IMPORTED_LOCATION "${GLib_${name}_LIBRARY}")
new file mode 100644
@@ -0,0 +1,57 @@
+From c018bf3bca4a42f9540e50e0f5080c38223c2ddf Mon Sep 17 00:00:00 2001
+From: Pablo Saavedra <psaavedra@igalia.com>
+Date: Thu, 17 Sep 2026 12:05:38 +0200
+Subject: [PATCH] [libpas] Do not include <stdatomic.h> from C++ translation
+ units https://bugs.webkit.org/show_bug.cgi?id=324345
+
+Reviewed by NOBODY (OOPS!).
+
+310886@main added an unconditional <stdatomic.h> include to pas_utils.h.
+GCC 13 cross builds in Yocto fail to compile C++ translation units that
+pull in pas_utils.h because of it. 312138@main fixed the equivalent
+breakage for xcodebuild by moving libpas to gnu++23, but a CMake build
+using an older C++ standard is not covered by that.
+
+The include cannot simply be dropped for C++. clang requires
+<stdatomic.h> to be included wherever the _Atomic qualifier is used
+(-Wqualifier-requires-header), and PAS_ATOMIC_TYPE() expands to _Atomic
+under PAS_COMPILER(CLANG). pas_utils.h suppresses that diagnostic around
+its own body, but PAS_DEFINE_COMPACT_ATOMIC_PTR() expands in other
+headers -- pas_segregated_heap.h and friends -- which are outside that
+region. Satisfying those expansions is what 310886@main needed the
+include for.
+
+No other compiler sees _Atomic here: PAS_ATOMIC_TYPE() expands to a plain
+type and the atomic operations go through the __atomic builtins, and the
+__c11_atomic_* uses in this file are all inside PAS_COMPILER(CLANG)
+blocks. So keep the include for clang, where it is load-bearing and where
+this is a no-op, and skip it only for the C++ compilers that never need
+it.
+
+No new tests. Build fix. Verified by preprocessing pas_utils.h from C++
+with both compilers: g++ no longer reaches <stdatomic.h> while clang++
+still does, and Source/bmalloc/bmalloc/bmalloc.cpp still compiles with
+both.
+
+* Source/bmalloc/libpas/src/libpas/pas_utils.h:
+
+Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/74158]
+Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
+---
+ Source/bmalloc/libpas/src/libpas/pas_utils.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/bmalloc/libpas/src/libpas/pas_utils.h b/Source/bmalloc/libpas/src/libpas/pas_utils.h
+index 9626340809303..e781d8fb12c8d 100644
+--- a/Source/bmalloc/libpas/src/libpas/pas_utils.h
++++ b/Source/bmalloc/libpas/src/libpas/pas_utils.h
+@@ -42,7 +42,9 @@
+ #endif
+
+ #include <limits.h>
++#if !defined(__cplusplus) || defined(__clang__)
+ #include <stdatomic.h>
++#endif
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <string.h>
@@ -1,4 +1,4 @@
-From a7e4c23c7f6faf76307ecad5f879e47b96ca66c9 Mon Sep 17 00:00:00 2001
+From ae017d7bd4d98a28a4f89a4ca75493333172bd35 Mon Sep 17 00:00:00 2001
From: Alberto Garcia <berto@igalia.com>
Date: Fri, 19 Dec 2025 10:10:41 +0000
Subject: [PATCH] Use WTF_CPU_UNKNOWN when building for riscv64
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 10 deletions(-)
diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
-index 8aac1024..d9d69a40 100644
+index fabd6cba..c8639827 100644
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -286,14 +286,6 @@
@@ -36,10 +36,10 @@ index 8aac1024..d9d69a40 100644
#define WTF_CPU_UNKNOWN 1
#endif
diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
-index 639b7e5d..c7e60287 100644
+index d96e1850..3daa0eaf 100644
--- a/Source/cmake/WebKitCommon.cmake
+++ b/Source/cmake/WebKitCommon.cmake
-@@ -129,8 +129,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+@@ -186,8 +186,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
set(WTF_CPU_PPC64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
set(WTF_CPU_PPC64LE 1)
@@ -1,4 +1,4 @@
-From 07ff0c87a0f584c7c6cc1cf723641707a16255f3 Mon Sep 17 00:00:00 2001
+From 5cbe3e7db8982078157de0d2bcc8e8bedf7d3c77 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
@@ -1,4 +1,4 @@
-From 4ca8868a69eaf046db523a0fde869bfd46d9878c Mon Sep 17 00:00:00 2001
+From addce4888885a925f7711efda729d94cea312fe0 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
@@ -1,4 +1,4 @@
-From c480a5dc8491d1422994007b149ee08f8d2cc9c5 Mon Sep 17 00:00:00 2001
+From 8b7bb89d335163162fdc374f5a231273ae5b2f75 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 fcec367d..851f68d9 100644
+index dd0b44de..c0a68a22 100644
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-@@ -341,8 +341,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
+@@ -345,8 +345,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
UNUSED_VARIABLE(t2);
UNUSED_VARIABLE(t3);
UNUSED_VARIABLE(t5);
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.52.6.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.54.2.bb
@@ -17,8 +17,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://sys_futex.patch \
file://fix-ftbfs-riscv64.patch \
file://0001-Source-cmake-FindGLib.cmake-do-not-set-include-dirs-.patch \
+ file://0001-libpas-Do-not-include-stdatomic.h-from-C-translation.patch \
"
-SRC_URI[sha256sum] = "179a2ea3f8f6edd4be7f31fdc55afc57bd0729f1fba648c61d4181539ac116fc"
+SRC_URI[sha256sum] = "a76345b391bef6211fb5ab6cfab2e86b285d18cda17cbb9ade595f1252b86065"
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
ReleaseNotes: https://www.webkitgtk.org/2026/10/23/webkitgtk2.54.2-released.html CompareLog: https://github.com/WebKit/WebKit/compare/webkitgtk-2.52.6...webkitgtk-2.54.2 (CompareLogs shows 5000+ commits) - Refresh existing patches - Add patch 0001-libpas-Do-not-include-stdatomic.h-from-C-translation.patch to fix a build failure with GCC. Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech> --- ...able-to-control-macro-__PAS_ALWAYS_I.patch | 23 ++++---- ...spection.cmake-prefix-variables-obta.patch | 2 +- ...dGLib.cmake-do-not-set-include-dirs-.patch | 6 +- ...clude-stdatomic.h-from-C-translation.patch | 57 +++++++++++++++++++ .../webkit/webkitgtk/fix-ftbfs-riscv64.patch | 8 +-- .../webkit/webkitgtk/reproducibility.patch | 2 +- .../webkit/webkitgtk/sys_futex.patch | 2 +- .../webkit/webkitgtk/t6-not-declared.patch | 6 +- ...ebkitgtk_2.52.6.bb => webkitgtk_2.54.2.bb} | 3 +- 9 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-libpas-Do-not-include-stdatomic.h-from-C-translation.patch rename meta/recipes-sato/webkit/{webkitgtk_2.52.6.bb => webkitgtk_2.54.2.bb} (98%)