@@ -1,7 +1,7 @@
-From 73efe0ea75c3ac4cb088f300acc3de44d5dd3344 Mon Sep 17 00:00:00 2001
+From 1bb48eccff87fcc6c55e1ecd70ac5b55c2dbdf84 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] [CMake] Add a variable to control macro
+Subject: [PATCH] Add a variable to control macro
__PAS_ALWAYS_INLINE_BUT_NOT_INLINE
https://bugs.webkit.org/show_bug.cgi?id=260065
@@ -38,13 +38,14 @@ gcc option `-Og` is used.
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(-)
diff --git a/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h b/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h
-index 5d5fb38cddbd..a554f70064eb 100644
+index 5d5fb38c..a554f700 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,7 +58,7 @@ index 5d5fb38cddbd..a554f70064eb 100644
#else
#define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index 9b2fecf9a0d3..7cdc2b6afbe0 100644
+index 9b2fecf9..7cdc2b6a 100644
--- a/Source/cmake/WebKitCompilerFlags.cmake
+++ b/Source/cmake/WebKitCompilerFlags.cmake
@@ -453,3 +453,10 @@ endif ()
@@ -71,6 +72,3 @@ index 9b2fecf9a0d3..7cdc2b6afbe0 100644
+if (WEBKIT_NO_INLINE_HINTS)
+ add_definitions(-DWEBKIT_NO_INLINE_HINTS)
+endif ()
-2.34.1
-
@@ -1,4 +1,4 @@
-From 10cfdcc905915d8814c609008a069102f2bc7e39 Mon Sep 17 00:00:00 2001
+From 1e9fa1d01ba13a756df4a38275cccf653bfd8db8 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
@@ -9,12 +9,13 @@ reasons why this is not approproiate for upstream submission.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
Source/cmake/FindGI.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
-index af039cbb..b3e810cd 100644
+index fdc56b21..d42eca52 100644
--- a/Source/cmake/FindGI.cmake
+++ b/Source/cmake/FindGI.cmake
@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND)
@@ -1,4 +1,4 @@
-From 95398982f4a120147a98a27e176facf6d95b2bf7 Mon Sep 17 00:00:00 2001
+From 909f914f70ee1de5856c9be73281a9cba57caab7 Mon Sep 17 00:00:00 2001
From: Adrian Perez de Castro <aperez@igalia.com>
Date: Thu, 2 Jun 2022 11:19:06 +0300
Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems
@@ -1,4 +1,7 @@
-clang/arm: Do not use MUST_TAIL_CALL
+From 9ed8bf6490217ef88fdce5ad7aef3b4d1ce7d802 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 12 Jan 2024 09:21:39 -0800
+Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL
This causes clang-17 to crash see [1]
this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit
@@ -8,6 +11,13 @@ this code is new in webkit 2.42[2] thats why we do not see the crash in older we
Upstream-Status: Inappropriate [work around to avoid clang compiler crash]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+---
+ Source/WTF/wtf/Compiler.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
+index 0ea5cb76..c5480dbc 100644
--- a/Source/WTF/wtf/Compiler.h
+++ b/Source/WTF/wtf/Compiler.h
@@ -284,7 +284,7 @@
@@ -1,3 +1,8 @@
+From 362d81dbe65310a6ac26444771dfbec680a465a3 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
+
Injection a year based on the current date isn't reproducible. Hack this
to a specific year for now for reproducibilty and to avoid autobuilder failures.
@@ -7,10 +12,14 @@ then this could be submitted upstream, sadly my ruby isn't up to that.
Upstream-Status: Pending [could be reworked]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb
-===================================================================
---- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb
-+++ webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb
+---
+ Source/JavaScriptCore/generator/GeneratedFile.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/generator/GeneratedFile.rb b/Source/JavaScriptCore/generator/GeneratedFile.rb
+index 6ed2b6e4..86a28286 100644
+--- a/Source/JavaScriptCore/generator/GeneratedFile.rb
++++ b/Source/JavaScriptCore/generator/GeneratedFile.rb
@@ -25,7 +25,7 @@ require 'date'
require 'digest'
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.42.2.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.42.4.bb
@@ -16,7 +16,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \
file://no-musttail-arm.patch \
"
-SRC_URI[sha256sum] = "5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118"
+SRC_URI[sha256sum] = "52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86"
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *webkitgtk* to *2.42.4* has Succeeded. Next steps: - apply the patch: git am 0001-webkitgtk-upgrade-2.42.2-2.42.4.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 4fb75ca3e23025a904095b129429dab0ea43ab71 Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Thu, 1 Feb 2024 16:06:36 +0000 Subject: [PATCH] webkitgtk: upgrade 2.42.2 -> 2.42.4 --- ...riable-to-control-macro-__PAS_ALWAYS_I.patch | 12 +++++------- ...rospection.cmake-prefix-variables-obta.patch | 5 +++-- ...3344e17d258106617b0e6d783d073b188a2548.patch | 2 +- .../webkit/webkitgtk/no-musttail-arm.patch | 12 +++++++++++- .../webkit/webkitgtk/reproducibility.patch | 17 +++++++++++++---- ...{webkitgtk_2.42.2.bb => webkitgtk_2.42.4.bb} | 2 +- 6 files changed, 34 insertions(+), 16 deletions(-) rename meta/recipes-sato/webkit/{webkitgtk_2.42.2.bb => webkitgtk_2.42.4.bb} (98%)