From ec73d872d54d6b571ef5deafb88fc4cf078f407a Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 11 Aug 2025 14:50:24 +0300 Subject: [PATCH] qtwebengine: update patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update patches upon chromium update from 130-based to 134-based. Pick-to: 6.10 Change-Id: Id9c9402182328e9d1c55e9ef2bc45ff1efe5ab9e Reviewed-by: Pasi Petäjäjärvi Reviewed-by: Jani Heikkinen --- .../chromium/0001-v8-qemu-wrapper.patch | 28 +++++++++---------- ...ttings-done-for-clang-that-conflict-.patch | 26 ++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch b/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch index 8ca14fc..558748b 100644 --- a/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch +++ b/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch @@ -1,4 +1,4 @@ -From 03c0f7089ee4f54883073f9df23d379da35c9f35 Mon Sep 17 00:00:00 2001 +From f9ba9160e01ea1448b92d27101db37d0ee5317dd Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Tue, 7 Nov 2017 15:24:32 +0100 Subject: [PATCH] v8: qemu wrapper @@ -16,22 +16,22 @@ Signed-off-by: Maksim Sisov 2 files changed, 5 insertions(+) diff --git a/chromium/tools/v8_context_snapshot/BUILD.gn b/chromium/tools/v8_context_snapshot/BUILD.gn -index 35c8c606a22..d3097e55e56 100644 +index ab4286508f4..5144e631f6a 100644 --- a/chromium/tools/v8_context_snapshot/BUILD.gn +++ b/chromium/tools/v8_context_snapshot/BUILD.gn -@@ -46,6 +46,7 @@ if (use_v8_context_snapshot) { - output_path = rebase_path(output_file, root_build_dir) +@@ -50,6 +50,7 @@ if (use_v8_context_snapshot) { + output_path = rebase_path(output_file, root_build_dir) - args = [ -+ "../../../../v8-qemu-wrapper.sh", - "./" + rebase_path(get_label_info(":v8_context_snapshot_generator", - "root_out_dir") + - "/v8_context_snapshot_generator", + args = [ ++ "../../../../v8-qemu-wrapper.sh", + "./" + rebase_path( + get_label_info( + ":v8_context_snapshot_generator($v8_snapshot_toolchain)", diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn -index dcc3acbf8b3..c1fc540971a 100644 +index 2a367403ecd..b0c7df4ca42 100644 --- a/chromium/v8/BUILD.gn +++ b/chromium/v8/BUILD.gn -@@ -2240,6 +2240,7 @@ template("run_torque") { +@@ -2181,6 +2181,7 @@ template("run_torque") { } args = [ @@ -39,7 +39,7 @@ index dcc3acbf8b3..c1fc540971a 100644 "./" + rebase_path( get_label_info(":torque($toolchain)", "root_out_dir") + "/torque", root_build_dir), -@@ -2403,6 +2404,7 @@ action("generate_bytecode_builtins_list") { +@@ -2344,6 +2345,7 @@ action("generate_bytecode_builtins_list") { outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ] deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ] args = [ @@ -47,7 +47,7 @@ index dcc3acbf8b3..c1fc540971a 100644 "./" + rebase_path( get_label_info( ":bytecode_builtins_list_generator($v8_generator_toolchain)", -@@ -2475,6 +2477,7 @@ template("run_mksnapshot") { +@@ -2416,6 +2418,7 @@ template("run_mksnapshot") { } args += [ @@ -55,7 +55,7 @@ index dcc3acbf8b3..c1fc540971a 100644 "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", "root_out_dir") + "/mksnapshot", root_build_dir), -@@ -7515,6 +7518,7 @@ if (v8_enable_i18n_support) { +@@ -7438,6 +7441,7 @@ if (v8_enable_i18n_support) { outputs = [ output_file ] args = [ diff --git a/recipes-qt/qt6/qtwebengine/chromium/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch b/recipes-qt/qt6/qtwebengine/chromium/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch index 7339c34..05682a1 100644 --- a/recipes-qt/qt6/qtwebengine/chromium/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch +++ b/recipes-qt/qt6/qtwebengine/chromium/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch @@ -1,4 +1,4 @@ -From 7eb6877c15ab9d73c9a7cf3a8a17a1a23f7396f9 Mon Sep 17 00:00:00 2001 +From c189f8c7ae843f08ba844f7cd3a3f4d2ca441a79 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 29 Apr 2019 12:00:19 +0300 Subject: [PATCH] Remove the GN settings done for clang that conflict with OE @@ -15,39 +15,39 @@ Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj Rebased-by: Maksim Sisov Rebased-by: Randy MacLeod - --- - build/config/compiler/BUILD.gn | 38 ---------------------------------- - 1 file changed, 38 deletions(-) + chromium/build/config/compiler/BUILD.gn | 20 -------------------- + 1 file changed, 20 deletions(-) +diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn +index b6a9cfb2058..72a559372c7 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -1065,11 +1065,6 @@ config("compiler_cpu_abi") { +@@ -1305,10 +1305,6 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { -- if (is_clang && !is_android && !is_nacl && -- !(is_chromeos_lacros && is_chromeos_device)) { +- if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { - cflags += [ "--target=arm-linux-gnueabihf" ] - ldflags += [ "--target=arm-linux-gnueabihf" ] - } if (!is_nacl) { cflags += ["-mfloat-abi=$arm_float_abi"] if (arm_arch != "") { -@@ -1082,12 +1077,6 @@ config("compiler_cpu_abi") { +@@ -1321,12 +1317,6 @@ config("compiler_cpu_abi") { if (arm_tune != "") { cflags += [ "-mtune=$arm_tune" ] } - } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia && -- !(is_chromeos_lacros && is_chromeos_device)) { +- !is_chromeos_device) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] - } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { -@@ -1095,9 +1084,6 @@ config("compiler_cpu_abi") { +@@ -1334,9 +1324,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -57,7 +57,7 @@ Rebased-by: Randy MacLeod } } else { cflags += [ "-EL" ] -@@ -1177,8 +1163,6 @@ config("compiler_cpu_abi") { +@@ -1416,8 +1403,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -66,7 +66,7 @@ Rebased-by: Randy MacLeod } else { cflags += [ "-EB" ] ldflags += [ "-EB" ] -@@ -1226,9 +1210,6 @@ config("compiler_cpu_abi") { +@@ -1465,9 +1450,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -76,7 +76,7 @@ Rebased-by: Randy MacLeod } } else { cflags += [ -@@ -1286,8 +1267,6 @@ config("compiler_cpu_abi") { +@@ -1525,8 +1507,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) {