Skip to content

Commit 939024c

Browse files
chromium: update to 115.0.5790.170 (#741)
Release notes: https://chromereleases.googleblog.com/2023/07/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2023/07/stable-channel-update-for-desktop_20.html https://chromereleases.googleblog.com/2023/07/stable-channel-update-for-desktop_25.html https://chromereleases.googleblog.com/2023/08/stable-channel-update-for-desktop.html Build and patch changes: ------------------------ Drop 0019-Backport-constexpr-std-string-fixes.patch, 0022-Backport-Avoid-capturing-structured-bindings.patch, 0026-Backport-std-string-ends_with-is-C-20.-Use-base-Ends.patch, and 0030-Backport-Avoid-operator-which-is-C-20-specific.patch as they are included upstream now. Add one more fix to 0018-Only-default-operator-on-declaration.patch, which previously was part of 0030-Backport-Avoid-operator-which-is-C-20-specific.patch to prevent a conflict. Also drop some fixes that are now included upstream. Drop some fixes from 0021-Add-missing-typename-s.patch that are now included upstream, and add two new ones. Add one more fix to 0028-Avoid-capturing-structured-bindings.patch. Add 0033-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch to work around a bug in clang 14 that leads to a build error. Add 0034-Avoid-parenthesized-initialization-of-aggregates.patch to fix build errors with clang < 16. Add 0035-Backport-IWYU-for-chromedriver-chrome-client_hints.h.patch to fix a build error. Rebase remaining patches. License changes: ---------------- Added licenses: * third_party/beto-core/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4444306 * third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay/package/LICENSE - https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/4480871 Removed licenses: none. Updated licenses: none. Test-built: ----------- * chromium-ozone-wayland: - mickledore, clang, MACHINE=qemuarm64 - kirkstone, clang, MACHINE=raspberrypi4-64 * chromium-x11 - dunfell, clang**, MACHINE=raspberrypi4-64 ** Please note that Chromium requires below set-up when on dunfell branch. - The clang version to be >= 14 and for that, use the latest meta-clang/dunfell-clang14 branch. - Require the latest meta-oe with Nodejs 14.x support. - Add the PREFERRED_VERSION_nodejs-native = "14.%" in conf/local.conf file. Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 parent 58bed9f commit 939024c

25 files changed

+495
-1579
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ SRC_URI += " \
2323
file://0016-cast-to-bool-to-avoid-constexpr-error.patch \
2424
file://0017-Revert-Fix-std-span-autodetection-7805.patch \
2525
file://0018-Only-default-operator-on-declaration.patch \
26-
file://0019-Backport-constexpr-std-string-fixes.patch \
2726
file://0020-Revert-__attribute__-and-alignas-changes.patch \
2827
file://0021-Add-missing-typename-s.patch \
29-
file://0022-Backport-Avoid-capturing-structured-bindings.patch \
3028
file://0023-Backport-IWYU-for-translate-TranslateUILanguagesMana.patch \
31-
file://0026-Backport-std-string-ends_with-is-C-20.-Use-base-Ends.patch \
3229
file://0027-Don-t-pass-disable-auto-upgrade-debug-info-to-linker.patch \
3330
file://0028-Avoid-capturing-structured-bindings.patch \
3431
file://0029-Backport-IWYU-for-translate-TranslateUiLanguagesMana.patch \
35-
file://0030-Backport-Avoid-operator-which-is-C-20-specific.patch \
36-
file://0031-Backport-ozone-wayland-Fix-nullptr-deref-in-WaylandW.patch \
32+
file://0032-Backport-ozone-wayland-Fix-nullptr-deref-in-WaylandW.patch \
33+
file://0033-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch \
34+
file://0034-Avoid-parenthesized-initialization-of-aggregates.patch \
35+
file://0035-Backport-IWYU-for-chromedriver-chrome-client_hints.h.patch \
3736
"
3837

3938
SRC_URI:append:libc-musl = "\

meta-chromium/recipes-browser/chromium/chromium.inc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[sha256sum] = "a9f3440feeab51f56b199797b83b458ca545bf67e114c62b21470fadd5a41dea"
7+
SRC_URI[sha256sum] = "ff9862d2e748c56940ffc222c2e6b2066a19ea1de0bc3fd99ed81c0b231172c0"
88

99
S = "${WORKDIR}/chromium-${PV}"
1010

@@ -212,6 +212,7 @@ LIC_FILES_CHKSUM = "\
212212
file://${S}/third_party/arcore-android-sdk/LICENSE;md5=c1bc4f7fbdd7a5a3f2c0dfefd457665e \
213213
file://${S}/third_party/ashmem/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
214214
file://${S}/third_party/axe-core/LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
215+
file://${S}/third_party/beto-core/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
215216
file://${S}/third_party/bidimapper/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
216217
file://${S}/third_party/blink/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \
217218
file://${S}/third_party/boringssl/src/LICENSE;md5=2ca501bc96ce9ed0814e2c592c3f9593 \
@@ -246,6 +247,7 @@ LIC_FILES_CHKSUM = "\
246247
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
247248
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \
248249
file://${S}/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE;md5=449f8b1cf0bfef1e5ec7824a4179ac6f \
250+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay/package/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
249251
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/LICENSE;md5=b8f1fc4a170646d6f75d9572a3bd1339 \
250252
file://${S}/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
251253
file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \

meta-chromium/recipes-browser/chromium/files/0001-limit-number-of-LTO-jobs.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
1717
2 files changed, 11 insertions(+), 6 deletions(-)
1818

1919
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
20-
index 28c2255ba8090..d740c7caf9427 100644
20+
index 23a8da453c3d2..f7273a944ec68 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -680,7 +680,7 @@ config("compiler") {
23+
@@ -710,7 +710,7 @@ config("compiler") {
2424

2525
if (is_win) {
2626
ldflags += [
@@ -29,7 +29,7 @@ index 28c2255ba8090..d740c7caf9427 100644
2929
"-mllvm:-import-instr-limit=$import_instr_limit",
3030
"/lldltocache:" +
3131
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
32-
@@ -694,11 +694,11 @@ config("compiler") {
32+
@@ -724,11 +724,11 @@ config("compiler") {
3333
# usage in crbug.com/1038040. Note this will increase build time in
3434
# Chrome OS.
3535

meta-chromium/recipes-browser/chromium/files/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
2121
1 file changed, 38 deletions(-)
2222

2323
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
24-
index d740c7caf9427..8f13f37d347cc 100644
24+
index f7273a944ec68..3d5aa9a79b106 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1005,11 +1005,6 @@ config("compiler_cpu_abi") {
27+
@@ -1095,11 +1095,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index d740c7caf9427..8f13f37d347cc 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1019,12 +1014,6 @@ config("compiler_cpu_abi") {
39+
@@ -1109,12 +1104,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index d740c7caf9427..8f13f37d347cc 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1032,9 +1021,6 @@ config("compiler_cpu_abi") {
52+
@@ -1122,9 +1111,6 @@ config("compiler_cpu_abi") {
5353
if (is_android) {
5454
cflags += [ "--target=mipsel-linux-android" ]
5555
ldflags += [ "--target=mipsel-linux-android" ]
@@ -59,7 +59,7 @@ index d740c7caf9427..8f13f37d347cc 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1114,8 +1100,6 @@ config("compiler_cpu_abi") {
62+
@@ -1204,8 +1190,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index d740c7caf9427..8f13f37d347cc 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1163,9 +1147,6 @@ config("compiler_cpu_abi") {
71+
@@ -1253,9 +1237,6 @@ config("compiler_cpu_abi") {
7272
if (is_android) {
7373
cflags += [ "--target=mips64el-linux-android" ]
7474
ldflags += [ "--target=mips64el-linux-android" ]
@@ -78,7 +78,7 @@ index d740c7caf9427..8f13f37d347cc 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1223,8 +1204,6 @@ config("compiler_cpu_abi") {
81+
@@ -1313,8 +1294,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index d740c7caf9427..8f13f37d347cc 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1387,23 +1366,6 @@ config("compiler_deterministic") {
90+
@@ -1477,23 +1456,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}

meta-chromium/recipes-browser/chromium/files/0003-v8-qemu-wrapper.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,34 @@ index 52504f4f6f009..40425d63454f3 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 5cda664fdde..1b6919e71ea 100644
32+
index a69e7b2edbc..2e2ae5865e6 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2055,6 +2055,7 @@ template("run_torque") {
35+
@@ -2061,6 +2061,7 @@ template("run_torque") {
3636
}
3737

3838
args = [
3939
+ "./v8-qemu-wrapper.sh",
4040
"./" + rebase_path(
4141
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
4242
root_build_dir),
43-
@@ -2187,6 +2188,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2193,6 +2194,7 @@ action("generate_bytecode_builtins_list") {
4444
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
4545
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
4646
args = [
4747
+ "./v8-qemu-wrapper.sh",
4848
"./" + rebase_path(
4949
get_label_info(
5050
":bytecode_builtins_list_generator($v8_generator_toolchain)",
51-
@@ -2226,6 +2228,7 @@ template("run_mksnapshot") {
51+
@@ -2232,6 +2234,7 @@ template("run_mksnapshot") {
5252
data = []
5353

5454
args = [
5555
+ "./v8-qemu-wrapper.sh",
5656
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
5757
"root_out_dir") + "/mksnapshot",
5858
root_build_dir),
59-
@@ -6600,6 +6603,7 @@ if (v8_enable_i18n_support) {
59+
@@ -6647,6 +6650,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

meta-chromium/recipes-browser/chromium/files/0005-BUILD-do-not-specify-march-on-arm.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1919
1 file changed, 10 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index 8f13f37d347cc..e3f22ce0a471b 100644
22+
index 3d5aa9a79b106..6e67e80ea23c1 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -1004,16 +1004,6 @@ config("compiler_cpu_abi") {
25+
@@ -1094,16 +1094,6 @@ config("compiler_cpu_abi") {
2626
"-msse3",
2727
]
2828
}

meta-chromium/recipes-browser/chromium/files/0007-Delete-compiler-options-not-available-in-release-ver.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1313
1 file changed, 5 insertions(+)
1414

1515
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index e3f22ce0a471b..19badda7d644b 100644
16+
index 6e67e80ea23c1..3f15e68205a6f 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1592,6 +1592,11 @@ config("default_warnings") {
19+
@@ -1682,6 +1682,11 @@ config("default_warnings") {
2020
cflags += [
2121
"-Wenum-compare-conditional",
2222

meta-chromium/recipes-browser/chromium/files/0008-avoid-link-latomic-failure-on-CentOS-8-host.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 8417fcda40d49..678c1b736d86f 100644
21+
index 4925a756be531..c4146ef5a831f 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1100,7 +1100,9 @@ component("base") {
24+
@@ -1099,7 +1099,9 @@ component("base") {
2525
# Needed for <atomic> if using newer C++ library than sysroot, except if
2626
# building inside the cros_sdk environment - use host_toolchain as a
2727
# more robust check for this.

0 commit comments

Comments
 (0)