Skip to content

Commit

Permalink
chromium: update to 115.0.5790.170
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
MaxIhlenfeldt committed Aug 29, 2023
1 parent 58bed9f commit 6615360
Show file tree
Hide file tree
Showing 25 changed files with 495 additions and 1,579 deletions.
9 changes: 4 additions & 5 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,16 @@ SRC_URI += " \
file://0016-cast-to-bool-to-avoid-constexpr-error.patch \
file://0017-Revert-Fix-std-span-autodetection-7805.patch \
file://0018-Only-default-operator-on-declaration.patch \
file://0019-Backport-constexpr-std-string-fixes.patch \
file://0020-Revert-__attribute__-and-alignas-changes.patch \
file://0021-Add-missing-typename-s.patch \
file://0022-Backport-Avoid-capturing-structured-bindings.patch \
file://0023-Backport-IWYU-for-translate-TranslateUILanguagesMana.patch \
file://0026-Backport-std-string-ends_with-is-C-20.-Use-base-Ends.patch \
file://0027-Don-t-pass-disable-auto-upgrade-debug-info-to-linker.patch \
file://0028-Avoid-capturing-structured-bindings.patch \
file://0029-Backport-IWYU-for-translate-TranslateUiLanguagesMana.patch \
file://0030-Backport-Avoid-operator-which-is-C-20-specific.patch \
file://0031-Backport-ozone-wayland-Fix-nullptr-deref-in-WaylandW.patch \
file://0032-Backport-ozone-wayland-Fix-nullptr-deref-in-WaylandW.patch \
file://0033-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch \
file://0034-Avoid-parenthesized-initialization-of-aggregates.patch \
file://0035-Backport-IWYU-for-chromedriver-chrome-client_hints.h.patch \
"

SRC_URI:append:libc-musl = "\
Expand Down
4 changes: 3 additions & 1 deletion meta-chromium/recipes-browser/chromium/chromium.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
CVE_PRODUCT = "chromium:chromium google:chrome"

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

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

Expand Down Expand Up @@ -212,6 +212,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/arcore-android-sdk/LICENSE;md5=c1bc4f7fbdd7a5a3f2c0dfefd457665e \
file://${S}/third_party/ashmem/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/axe-core/LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
file://${S}/third_party/beto-core/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
file://${S}/third_party/bidimapper/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
file://${S}/third_party/blink/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \
file://${S}/third_party/boringssl/src/LICENSE;md5=2ca501bc96ce9ed0814e2c592c3f9593 \
Expand Down Expand Up @@ -246,6 +247,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE;md5=449f8b1cf0bfef1e5ec7824a4179ac6f \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay/package/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/LICENSE;md5=b8f1fc4a170646d6f75d9572a3bd1339 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Signed-off-by: Maksim Sisov <[email protected]>
2 files changed, 11 insertions(+), 6 deletions(-)

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <[email protected]>
1 file changed, 38 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index d740c7caf9427..8f13f37d347cc 100644
index f7273a944ec68..3d5aa9a79b106 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1005,11 +1005,6 @@ config("compiler_cpu_abi") {
@@ -1095,11 +1095,6 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
Expand All @@ -36,7 +36,7 @@ index d740c7caf9427..8f13f37d347cc 100644
if (!is_nacl) {
cflags += [
"-march=$arm_arch",
@@ -1019,12 +1014,6 @@ config("compiler_cpu_abi") {
@@ -1109,12 +1104,6 @@ config("compiler_cpu_abi") {
if (arm_tune != "") {
cflags += [ "-mtune=$arm_tune" ]
}
Expand All @@ -49,7 +49,7 @@ index d740c7caf9427..8f13f37d347cc 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1032,9 +1021,6 @@ config("compiler_cpu_abi") {
@@ -1122,9 +1111,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mipsel-linux-android" ]
ldflags += [ "--target=mipsel-linux-android" ]
Expand All @@ -59,7 +59,7 @@ index d740c7caf9427..8f13f37d347cc 100644
}
} else {
cflags += [ "-EL" ]
@@ -1114,8 +1100,6 @@ config("compiler_cpu_abi") {
@@ -1204,8 +1190,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -68,7 +68,7 @@ index d740c7caf9427..8f13f37d347cc 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1163,9 +1147,6 @@ config("compiler_cpu_abi") {
@@ -1253,9 +1237,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mips64el-linux-android" ]
ldflags += [ "--target=mips64el-linux-android" ]
Expand All @@ -78,7 +78,7 @@ index d740c7caf9427..8f13f37d347cc 100644
}
} else {
cflags += [
@@ -1223,8 +1204,6 @@ config("compiler_cpu_abi") {
@@ -1313,8 +1294,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -87,7 +87,7 @@ index d740c7caf9427..8f13f37d347cc 100644
} else {
cflags += [
"-EB",
@@ -1387,23 +1366,6 @@ config("compiler_deterministic") {
@@ -1477,23 +1456,6 @@ config("compiler_deterministic") {
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@ index 52504f4f6f009..40425d63454f3 100644
"root_out_dir") +
"/v8_context_snapshot_generator",
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
index 5cda664fdde..1b6919e71ea 100644
index a69e7b2edbc..2e2ae5865e6 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2055,6 +2055,7 @@ template("run_torque") {
@@ -2061,6 +2061,7 @@ template("run_torque") {
}

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
root_build_dir),
@@ -2187,6 +2188,7 @@ action("generate_bytecode_builtins_list") {
@@ -2193,6 +2194,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 = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(
":bytecode_builtins_list_generator($v8_generator_toolchain)",
@@ -2226,6 +2228,7 @@ template("run_mksnapshot") {
@@ -2232,6 +2234,7 @@ template("run_mksnapshot") {
data = []

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

args = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <[email protected]>
1 file changed, 10 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 8f13f37d347cc..e3f22ce0a471b 100644
index 3d5aa9a79b106..6e67e80ea23c1 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1004,16 +1004,6 @@ config("compiler_cpu_abi") {
@@ -1094,16 +1094,6 @@ config("compiler_cpu_abi") {
"-msse3",
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
1 file changed, 5 insertions(+)

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
2 files changed, 4 insertions(+)

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 8417fcda40d49..678c1b736d86f 100644
index 4925a756be531..c4146ef5a831f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1100,7 +1100,9 @@ component("base") {
@@ -1099,7 +1099,9 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 19badda7d644b..88e4bbfc4f8c5 100644
index 3f15e68205a6f..e2e30cbc80557 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1295,7 +1295,6 @@ config("compiler_codegen") {
@@ -1385,7 +1385,6 @@ config("compiler_codegen") {
config("compiler_deterministic") {
cflags = []
ldflags = []
- swiftflags = []

# Eliminate build metadata (__DATE__, __TIME__ and __TIMESTAMP__) for
# deterministic build. See https://crbug.com/314403
@@ -1324,20 +1323,12 @@ config("compiler_deterministic") {
@@ -1414,20 +1413,12 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 88e4bbfc4f8c5..bbfe6cb53ca2a 100644
index e2e30cbc80557..c274a92b3f93e 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -825,9 +825,11 @@ config("compiler") {
@@ -860,9 +860,11 @@ config("compiler") {
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
# lldb doesn't have the needed changes yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
Expand Down
Loading

0 comments on commit 6615360

Please sign in to comment.