summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch6
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch4
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-issues-with-latest-Clang.patch251
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch4
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch67
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch36
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch14
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/reproducibility.patch2
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch6
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.46.4.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.44.3.bb)7
10 files changed, 58 insertions, 339 deletions
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 a19008a41f..8376ee8472 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 @@
1From 99a21305ae683a216e9299e5dbdd763190a8cfe3 Mon Sep 17 00:00:00 2001 1From bbf661310448d430350eb2ad8c5869ace648dcf8 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Fri, 11 Aug 2023 14:20:48 +0800 3Date: Fri, 11 Aug 2023 14:20:48 +0800
4Subject: [PATCH] Add a variable to control macro 4Subject: [PATCH] Add a variable to control macro
@@ -57,10 +57,10 @@ index 5d5fb38c..a554f700 100644
57 #else 57 #else
58 #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE 58 #define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE
59diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake 59diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
60index 0732785e..4879ec40 100644 60index f5ec0a55..dfd741e7 100644
61--- a/Source/cmake/WebKitCompilerFlags.cmake 61--- a/Source/cmake/WebKitCompilerFlags.cmake
62+++ b/Source/cmake/WebKitCompilerFlags.cmake 62+++ b/Source/cmake/WebKitCompilerFlags.cmake
63@@ -452,3 +452,10 @@ endif () 63@@ -492,3 +492,10 @@ endif ()
64 64
65 # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438> 65 # FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438>
66 set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON) 66 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 dda20a7b25..b11a18ba22 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 @@
1From d1f6a1b6a1298f6ef2f1677e9996aa60a002134a Mon Sep 17 00:00:00 2001 1From e0dfc113b016227da8a654d625e8f568b56761d0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 27 Oct 2015 16:02:19 +0200 3Date: Tue, 27 Oct 2015 16:02:19 +0200
4Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained 4Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 3 insertions(+) 14 1 file changed, 3 insertions(+)
15 15
16diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake 16diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
17index fdc56b21..d42eca52 100644 17index 8cf372f3..40471487 100644
18--- a/Source/cmake/FindGI.cmake 18--- a/Source/cmake/FindGI.cmake
19+++ b/Source/cmake/FindGI.cmake 19+++ b/Source/cmake/FindGI.cmake
20@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND) 20@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-issues-with-latest-Clang.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-issues-with-latest-Clang.patch
deleted file mode 100644
index 2be899fea8..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-issues-with-latest-Clang.patch
+++ /dev/null
@@ -1,251 +0,0 @@
1From 257ed304fb3e71d412568dcbed7129c145812fdf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Sep 2024 21:38:12 -0700
4Subject: [PATCH] Fix build issues with latest Clang
5 https://bugs.webkit.org/show_bug.cgi?id=276198 rdar://130933637
6
7Reviewed by Yusuke Suzuki.
8
9The use of the template keyword to reference template members without a template argument list was deprecated in the C++ standard.
10e.g. `foo.template bar()` nows needs to be `foo.template bar<>()`. I ran into a different issue with `std::reference_wrapper` that
11blocked me from going any further, which AFAICT is a bug on the Clang side.
12
13This also fixes a few other warnings that popped up while building with the new Clang denoted inline
14
15* Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp:
16(JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost.
17* Source/JavaScriptCore/jit/AssemblyHelpers.cpp:
18(JSC::AssemblyHelpers::emitNonNullDecodeZeroExtendedStructureID): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost.
19* Source/JavaScriptCore/llint/InPlaceInterpreter.cpp:
20* Source/JavaScriptCore/llint/LLIntData.h:
21(JSC::LLInt::getCodeFunctionPtr):
22(JSC::LLInt::getWide16CodeFunctionPtr):
23(JSC::LLInt::getWide32CodeFunctionPtr):
24* Source/JavaScriptCore/parser/Nodes.h: Missing definition of ModuleScopeData added include.
25* Source/JavaScriptCore/runtime/JSCast.h:
26(JSC::JSCastingHelpers::inherits):
27(JSC::jsDynamicCast):
28* Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/crypto/bio/connect.c:
29(conn_callback_ctrl): Had a warning about an incompatible function type. Seems like this is intentional suppressed the warning.
30* Source/WTF/wtf/cf/TypeCastsCF.h: Had a warning about extra namespace qualification. I just moved it out of the namespace. That said, it feels like this warning shouldn't apply to macro expansions...
31* Source/WebCore/PAL/ThirdParty/libavif/ThirdParty/dav1d/src/decode.c:
32(decode_b): Had a warning about different types on the middle/right of a ternary expression. I just pushed the comparison inside the ternary.
33
34Canonical link: https://commits.webkit.org/280700@main
35
36Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/62b6e2db547e#diff-136d848d7c1b400da9b486916b67592b54e5abf7c66ac247697a93ae2fb743a9]
37Signed-off-by: Khem Raj <raj.khem@gmail.com>
38---
39 Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp | 6 ++++--
40 Source/JavaScriptCore/jit/AssemblyHelpers.cpp | 6 ++++--
41 .../JavaScriptCore/llint/InPlaceInterpreter.cpp | 16 ++++++++--------
42 Source/JavaScriptCore/llint/LLIntData.h | 12 ++++++------
43 Source/JavaScriptCore/llint/LLIntThunks.cpp | 2 +-
44 Source/JavaScriptCore/parser/Nodes.h | 4 ++--
45 Source/JavaScriptCore/runtime/JSCast.h | 4 ++--
46 7 files changed, 27 insertions(+), 23 deletions(-)
47
48diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
49index 42a4eae7..dd987726 100644
50--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
51+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
52@@ -22930,8 +22930,10 @@ IGNORE_CLANG_WARNINGS_END
53 return m_out.shl(m_out.zeroExtPtr(structureID), m_out.constIntPtr(StructureID::encodeShiftAmount));
54 #else
55 LValue maskedStructureID = structureID;
56- if constexpr (structureHeapAddressSize < 4 * GB)
57- maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(StructureID::structureIDMask));
58+ if constexpr (structureHeapAddressSize < 4 * GB) {
59+ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask);
60+ maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(static_cast<uint32_t>(StructureID::structureIDMask)));
61+ }
62 return m_out.bitOr(m_out.constIntPtr(startOfStructureHeap()), m_out.zeroExtPtr(maskedStructureID));
63 #endif
64 }
65diff --git a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
66index c939d27a..982dc46f 100644
67--- a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
68+++ b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
69@@ -677,8 +677,10 @@ void AssemblyHelpers::emitNonNullDecodeZeroExtendedStructureID(RegisterID source
70 if constexpr (structureHeapAddressSize >= 4 * GB) {
71 ASSERT(structureHeapAddressSize == 4 * GB);
72 move(source, dest);
73- } else
74- and32(TrustedImm32(StructureID::structureIDMask), source, dest);
75+ } else {
76+ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask);
77+ and32(TrustedImm32(static_cast<uint32_t>(StructureID::structureIDMask)), source, dest);
78+ }
79 or64(TrustedImm64(startOfStructureHeap()), dest);
80 #else // not CPU(ADDRESS64)
81 move(source, dest);
82diff --git a/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp b/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp
83index b9442b4f..a1d5a6c4 100644
84--- a/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp
85+++ b/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp
86@@ -43,8 +43,8 @@ namespace JSC { namespace IPInt {
87 do { \
88 void* base = reinterpret_cast<void*>(ipint_unreachable_validate); \
89 void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
90- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
91- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
92+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
93+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
94 RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
95 } while (false);
96
97@@ -52,8 +52,8 @@ do { \
98 do { \
99 void* base = reinterpret_cast<void*>(ipint_i32_trunc_sat_f32_s_validate); \
100 void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
101- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
102- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
103+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
104+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
105 RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
106 } while (false);
107
108@@ -61,8 +61,8 @@ do { \
109 do { \
110 void* base = reinterpret_cast<void*>(ipint_simd_v128_load_mem_validate); \
111 void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
112- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
113- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
114+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
115+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
116 RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
117 } while (false);
118
119@@ -70,8 +70,8 @@ do { \
120 do { \
121 void* base = reinterpret_cast<void*>(ipint_memory_atomic_notify_validate); \
122 void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
123- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
124- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
125+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
126+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
127 RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
128 } while (false);
129
130diff --git a/Source/JavaScriptCore/llint/LLIntData.h b/Source/JavaScriptCore/llint/LLIntData.h
131index 97de867e..87a2971d 100644
132--- a/Source/JavaScriptCore/llint/LLIntData.h
133+++ b/Source/JavaScriptCore/llint/LLIntData.h
134@@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(OpcodeID opcodeID)
135 #if COMPILER(MSVC)
136 return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr());
137 #else
138- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr());
139+ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>());
140 #endif
141 }
142
143@@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(OpcodeID opcodeID)
144 #if COMPILER(MSVC)
145 return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr());
146 #else
147- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr());
148+ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>());
149 #endif
150 }
151
152@@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(OpcodeID opcodeID)
153 #if COMPILER(MSVC)
154 return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr());
155 #else
156- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr());
157+ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>());
158 #endif
159 }
160 #else // not ENABLE(JIT)
161@@ -361,7 +361,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(WasmOpcodeID opcodeID)
162 #if COMPILER(MSVC)
163 return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr());
164 #else
165- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr());
166+ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>());
167 #endif
168 }
169
170@@ -371,7 +371,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(WasmOpcodeID opcodeID)
171 #if COMPILER(MSVC)
172 return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr());
173 #else
174- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr());
175+ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>());
176 #endif
177 }
178
179@@ -381,7 +381,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(WasmOpcodeID opcodeID)
180 #if COMPILER(MSVC)
181 return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr());
182 #else
183- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr());
184+ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>());
185 #endif
186 }
187 #else // not ENABLE(JIT)
188diff --git a/Source/JavaScriptCore/llint/LLIntThunks.cpp b/Source/JavaScriptCore/llint/LLIntThunks.cpp
189index 13269469..e41fa5b8 100644
190--- a/Source/JavaScriptCore/llint/LLIntThunks.cpp
191+++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp
192@@ -227,7 +227,7 @@ ALWAYS_INLINE void* untaggedPtr(void* ptr)
193 #if COMPILER(MSVC)
194 return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).untaggedPtr();
195 #else
196- return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr();
197+ return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>();
198 #endif
199 }
200
201diff --git a/Source/JavaScriptCore/parser/Nodes.h b/Source/JavaScriptCore/parser/Nodes.h
202index 01af81b7..70b87088 100644
203--- a/Source/JavaScriptCore/parser/Nodes.h
204+++ b/Source/JavaScriptCore/parser/Nodes.h
205@@ -1,7 +1,7 @@
206 /*
207 * Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
208 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
209- * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
210+ * Copyright (C) 2003-2024 Apple Inc. All rights reserved.
211 * Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
212 * Copyright (C) 2007 Maks Orlovich
213 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
214@@ -29,6 +29,7 @@
215 #include "ImplementationVisibility.h"
216 #include "JITCode.h"
217 #include "Label.h"
218+#include "ModuleScopeData.h"
219 #include "ParserArena.h"
220 #include "ParserModes.h"
221 #include "ParserTokens.h"
222@@ -49,7 +50,6 @@ namespace JSC {
223 class FunctionMetadataNode;
224 class FunctionParameters;
225 class ModuleAnalyzer;
226- class ModuleScopeData;
227 class PropertyListNode;
228 class ReadModifyResolveNode;
229 class RegisterID;
230diff --git a/Source/JavaScriptCore/runtime/JSCast.h b/Source/JavaScriptCore/runtime/JSCast.h
231index a44b6e38..e5664a8b 100644
232--- a/Source/JavaScriptCore/runtime/JSCast.h
233+++ b/Source/JavaScriptCore/runtime/JSCast.h
234@@ -236,7 +236,7 @@ template<typename Target, typename From>
235 bool inherits(From* from)
236 {
237 using Dispatcher = InheritsTraits<Target>;
238- return Dispatcher::template inherits(from);
239+ return Dispatcher::template inherits<>(from);
240 }
241
242 } // namespace JSCastingHelpers
243@@ -245,7 +245,7 @@ template<typename To, typename From>
244 To jsDynamicCast(From* from)
245 {
246 using Dispatcher = JSCastingHelpers::InheritsTraits<typename std::remove_cv<typename std::remove_pointer<To>::type>::type>;
247- if (LIKELY(Dispatcher::template inherits(from)))
248+ if (LIKELY(Dispatcher::template inherits<>(from)))
249 return static_cast<To>(from);
250 return nullptr;
251 }
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
index 31535e7ae2..24f484e5e3 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
@@ -1,7 +1,7 @@
1From 57b80aa00be614218552fda67b2bf8d535b4f4cf Mon Sep 17 00:00:00 2001 1From 8b0ff0f2e2882f200f1c21ec76fa679444cb1c43 Mon Sep 17 00:00:00 2001
2From: Jason Schonberg <schonm@gmail.com> 2From: Jason Schonberg <schonm@gmail.com>
3Date: Wed, 20 Nov 2024 11:05:52 -0500 3Date: Wed, 20 Nov 2024 11:05:52 -0500
4Subject: [PATCH] Support ICU 76.1 build 4Subject: [PATCH] Support ICU 76.1 build
5 5
6https://bugs.webkit.org/show_bug.cgi?id=282120 6https://bugs.webkit.org/show_bug.cgi?id=282120
7 7
diff --git a/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch
deleted file mode 100644
index 0d8976c502..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1From 2ee948191de1c561b72ebf462605376cfb3ce7af Mon Sep 17 00:00:00 2001
2From: Thomas Devoogdt <thomas.devoogdt@barco.com>
3Date: Mon, 16 Jan 2023 17:03:30 +0100
4Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
5
6 !ENABLE(WEBASSEMBLY_B3JIT)
7
8https://bugs.webkit.org/show_bug.cgi?id=250681
9
10Reviewed by NOBODY (OOPS!).
11
12WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT).
13Also, toB3Type and simdScalarType are not defined if it is included.
14
15Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
16
17Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798]
18
19Signed-off-by: Markus Volk <f_l_k@t-online.de>
20---
21 Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++---
22 1 file changed, 9 insertions(+), 3 deletions(-)
23
24diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp
25index eaaa3749..1d089783 100644
26--- a/Source/JavaScriptCore/b3/B3Validate.cpp
27+++ b/Source/JavaScriptCore/b3/B3Validate.cpp
28@@ -47,6 +47,12 @@
29 #include <wtf/StringPrintStream.h>
30 #include <wtf/text/CString.h>
31
32+#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT)
33+#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type))
34+#else
35+#define simdScalarTypeToB3Type(type) B3::Type()
36+#endif
37+
38 namespace JSC { namespace B3 {
39
40 namespace {
41@@ -454,7 +460,7 @@ public:
42 case VectorExtractLane:
43 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
44 VALIDATE(value->numChildren() == 1, ("At ", *value));
45- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
46+ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
47 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
48 break;
49 case VectorReplaceLane:
50@@ -462,7 +468,7 @@ public:
51 VALIDATE(value->numChildren() == 2, ("At ", *value));
52 VALIDATE(value->type() == V128, ("At ", *value));
53 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
54- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
55+ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
56 break;
57 case VectorDupElement:
58 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
59@@ -484,7 +490,7 @@ public:
60 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
61 VALIDATE(value->numChildren() == 1, ("At ", *value));
62 VALIDATE(value->type() == V128, ("At ", *value));
63- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
64+ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
65 break;
66
67 case VectorPopcnt:
diff --git a/meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch b/meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch
new file mode 100644
index 0000000000..37e0fdcbbd
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch
@@ -0,0 +1,36 @@
1From 6ab7d3f7d8d0d8e1ab401d0fb13f60bbc64279a2 Mon Sep 17 00:00:00 2001
2From: Thomas Klausner <wiz@gatalith.at>
3Date: Thu, 7 Nov 2024 11:54:30 -0800
4Subject: [PATCH] bmalloc: Build problem in bmalloc when X11/X.h is in the same
5 namespace https://bugs.webkit.org/show_bug.cgi?id=282693
6
7This avoids a build problem when the X11/X.h is included,
8which defines Success to '0'.
9
10Reviewed by Fujii Hironori.
11
12* Source/bmalloc/bmalloc/EligibilityResult.h:
13
14Canonical link: https://commits.webkit.org/286295@main
15Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/6ab7d3f7d8d0d8e1ab401d0fb13f60bbc64279a2]
16Signed-off-by: Alexander Kanavin <alex@linutronix.de>
17---
18 Source/bmalloc/bmalloc/EligibilityResult.h | 5 +++++
19 1 file changed, 5 insertions(+)
20
21diff --git a/Source/bmalloc/bmalloc/EligibilityResult.h b/Source/bmalloc/bmalloc/EligibilityResult.h
22index ead7dbb52c07a..48f9e5bfe8a80 100644
23--- a/Source/bmalloc/bmalloc/EligibilityResult.h
24+++ b/Source/bmalloc/bmalloc/EligibilityResult.h
25@@ -29,6 +29,11 @@
26
27 #if !BUSE(LIBPAS)
28
29+/* avoid conflict with symbol from X11 headers */
30+#ifdef Success
31+#undef Success
32+#endif
33+
34 namespace bmalloc {
35
36 enum class EligibilityKind {
diff --git a/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch
index 793be48df2..c98d8b7727 100644
--- a/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch
@@ -1,4 +1,4 @@
1From 31dca9601888f2a539dfb22693ffd62c22ee8912 Mon Sep 17 00:00:00 2001 1From 4602261fa44d6bbb4c3698c79e08a6a40a6edc5a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 12 Jan 2024 09:21:39 -0800 3Date: Fri, 12 Jan 2024 09:21:39 -0800
4Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL 4Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL
@@ -16,15 +16,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h 18diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
19index 449ca502..daac29d7 100644 19index c01ed849..b69b1527 100644
20--- a/Source/WTF/wtf/Compiler.h 20--- a/Source/WTF/wtf/Compiler.h
21+++ b/Source/WTF/wtf/Compiler.h 21+++ b/Source/WTF/wtf/Compiler.h
22@@ -321,7 +321,7 @@ 22@@ -290,7 +290,7 @@
23 /* MUST_TAIL_CALL */ 23 #if COMPILER(CLANG)
24 24 #if __SIZEOF_POINTER__ == 8
25 #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) 25 #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute)
26-#if __has_cpp_attribute(clang::musttail) 26-#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__)
27+#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) 27+#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(__arm__)
28 #define MUST_TAIL_CALL [[clang::musttail]] 28 #define MUST_TAIL_CALL [[clang::musttail]]
29 #endif 29 #endif
30 #endif 30 #endif
diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
index d614a1ee4f..436ad2f02c 100644
--- a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch
@@ -1,4 +1,4 @@
1From cb5458b5d15aafa3543a47a33975609026d45d32 Mon Sep 17 00:00:00 2001 1From 65e9a68c9d05f4902c2fc34303b7f8233ffa98d5 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Mon, 3 Jan 2022 14:18:34 +0000 3Date: Mon, 3 Jan 2022 14:18:34 +0000
4Subject: [PATCH] webkitgtk: Add reproducibility fix 4Subject: [PATCH] webkitgtk: Add reproducibility fix
diff --git a/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch b/meta/recipes-sato/webkit/webkitgtk/t6-not-declared.patch
index 064925dace..82d20758c2 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 @@
1From 36c092723ec6d4908039341c9d157db8ab1c0a59 Mon Sep 17 00:00:00 2001 1From 29431aec88764072a032aa4411e26e566a3a6c0b Mon Sep 17 00:00:00 2001
2From: Michael Catanzaro <mcatanzaro@redhat.com> 2From: Michael Catanzaro <mcatanzaro@redhat.com>
3Date: Mon, 5 Feb 2024 11:00:49 -0600 3Date: Mon, 5 Feb 2024 11:00:49 -0600
4Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?= 4Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
@@ -21,10 +21,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
21 1 file changed, 2 deletions(-) 21 1 file changed, 2 deletions(-)
22 22
23diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 23diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
24index 75cecbbd..b1020ea4 100644 24index 76c46889..500be433 100644
25--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 25--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
26+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 26+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
27@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, 27@@ -334,8 +334,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
28 UNUSED_VARIABLE(t2); 28 UNUSED_VARIABLE(t2);
29 UNUSED_VARIABLE(t3); 29 UNUSED_VARIABLE(t3);
30 UNUSED_VARIABLE(t5); 30 UNUSED_VARIABLE(t5);
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.46.4.bb
index 2bb6316d89..f7d0b5e050 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.46.4.bb
@@ -15,11 +15,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
15 file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ 15 file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \
16 file://no-musttail-arm.patch \ 16 file://no-musttail-arm.patch \
17 file://t6-not-declared.patch \ 17 file://t6-not-declared.patch \
18 file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
19 file://0001-Fix-build-issues-with-latest-Clang.patch \
20 file://0001-Support-ICU-76.1-build.patch \ 18 file://0001-Support-ICU-76.1-build.patch \
19 file://bmalloc-fix.patch \
21 " 20 "
22SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54" 21SRC_URI[sha256sum] = "0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176"
23 22
24inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen 23inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
25 24
@@ -81,6 +80,7 @@ PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECOR
81PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" 80PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl"
82PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace" 81PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace"
83PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" 82PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette"
83PACKAGECONFIG[sysprof-capture] = "-DUSE_SYSTEM_SYSPROF_CAPTURE=YES,-DUSE_SYSTEM_SYSPROF_CAPTURE=NO,sysprof"
84 84
85EXTRA_OECMAKE = " \ 85EXTRA_OECMAKE = " \
86 -DPORT=GTK \ 86 -DPORT=GTK \
@@ -91,6 +91,7 @@ EXTRA_OECMAKE = " \
91 -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ 91 -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
92 -DUSE_GTK4=ON \ 92 -DUSE_GTK4=ON \
93 -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ 93 -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \
94 -DENABLE_RELEASE_LOG=ON \
94 " 95 "
95 96
96# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the 97# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-21 09:35:40 +0000