Skip to content

Commit d3d16b4

Browse files
MaxIhlenfeldtMaxIhlenfeldt
committed
chromium: update to 111.0.5563.64
Release notes: https://chromereleases.googleblog.com/2023/03/stable-channel-update-for-desktop.html Build and patch changes: ------------------------ Only rebased patches. License changes: ---------------- Added licenses: * third_party/cardboard/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4112686 * third_party/material_color_utilities/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4031813 Removed licenses: * third_party/gvr-android-keyboard/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4114165 * third_party/minizip/src/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4143824 * third_party/mozilla/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4053303 Updated licenses: * third_party/boringssl/src/LICENSE - https://boringssl-review.googlesource.com/c/boringssl/+/55926 * third_party/flac/COPYING.Xiph - https://chromium-review.googlesource.com/c/chromium/deps/flac/+/4190793 Test-built: ----------- * chromium-ozone-wayland: - langdale, clang, MACHINE=qemuarm64 - kirkstone, clang, MACHINE=raspberrypi3 * chromium-x11 - master, clang, MACHINE=raspberrypi4-64, qemux86-64, qemuarm64, qemuarm - kirkstone, clang, MACHINE=raspberrypi4-64, qemux86-64, qemuarm64, qemuarm - dunfell, clang**, MACHINE=raspberrypi3, qemux86-64, qemuarm64, qemuarm ** Please note that Chromium requires clang version to be >= 12. For that, when on dunfell branch, use the latest meta-clang/dunfell-clang12 branch. Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 parent 37de9f1 commit d3d16b4

13 files changed

+40
-41
lines changed

‎meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_110.0.5481.77.bb renamed to ‎meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_111.0.5563.64.bb

File renamed without changes.

‎meta-chromium/recipes-browser/chromium/chromium-x11_110.0.5481.77.bb renamed to ‎meta-chromium/recipes-browser/chromium/chromium-x11_111.0.5563.64.bb

File renamed without changes.

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

Lines changed: 5 additions & 6 deletions
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] = "e348ab2dc4311083e729d714a81e95dd9db108ff71437dde451c97ac939881ce"
7+
SRC_URI[sha256sum] = "7d5ca0e2bdb22a97713e6bfce74c651006d71aa883056c8e2c2a148039fe4074"
88

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

@@ -215,11 +215,12 @@ LIC_FILES_CHKSUM = "\
215215
file://${S}/third_party/axe-core/LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
216216
file://${S}/third_party/bidimapper/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
217217
file://${S}/third_party/blink/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \
218-
file://${S}/third_party/boringssl/src/LICENSE;md5=9b082148f9953258347788edb83e401b \
218+
file://${S}/third_party/boringssl/src/LICENSE;md5=2ca501bc96ce9ed0814e2c592c3f9593 \
219219
file://${S}/third_party/boringssl/src/third_party/fiat/LICENSE;md5=8eb8c1cdeb53faab99e4673182bed9f7 \
220220
file://${S}/third_party/breakpad/LICENSE;md5=828152b41153892a725f0e7f56faff73 \
221221
file://${S}/third_party/brotli/LICENSE;md5=941ee9cd1609382f946352712a319b4b \
222222
file://${S}/third_party/bspatch/LICENSE;md5=3e837ede9697ce4c789c3ca32aabe003 \
223+
file://${S}/third_party/cardboard/LICENSE;md5=3446ed11f63049b8f1e60e833dcdc5b7 \
223224
file://${S}/third_party/cast_core/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
224225
file://${S}/third_party/ced/LICENSE;md5=f63cd7e51ca7b7aac748e20dc60e083f \
225226
file://${S}/third_party/chromevox/LICENSE;md5=45739090b454125d851ac7bb1bbd23a2 \
@@ -255,7 +256,7 @@ LIC_FILES_CHKSUM = "\
255256
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
256257
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=5cdcfe11c9cfd8fe691f8feb32ff12a9 \
257258
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
258-
file://${S}/third_party/flac/COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \
259+
file://${S}/third_party/flac/COPYING.Xiph;md5=3d6da238b5b57a0965d6730291119f65 \
259260
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
260261
file://${S}/third_party/flex/LICENSE;md5=e4742cf92e89040b39486a6219b68067 \
261262
file://${S}/third_party/fontconfig/src/COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
@@ -271,7 +272,6 @@ LIC_FILES_CHKSUM = "\
271272
file://${S}/third_party/google_trust_services/src/LICENSE;md5=cfaf8febfe7b4f3e07a08dd4d0db1914 \
272273
file://${S}/third_party/grpc-java/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
273274
file://${S}/third_party/grpc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
274-
file://${S}/third_party/gvr-android-keyboard/LICENSE;md5=67d07a07ec29a50a3ded12b2ba952257 \
275275
file://${S}/third_party/gvr-android-sdk/LICENSE;md5=634fdf826e0846931133dca5785f59b8 \
276276
file://${S}/third_party/harfbuzz-ng/src/COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
277277
file://${S}/third_party/highway/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
@@ -322,15 +322,14 @@ LIC_FILES_CHKSUM = "\
322322
file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \
323323
file://${S}/third_party/lzma_sdk/LICENSE;md5=eceed1d308734c8051664bc3d1ca175e \
324324
file://${S}/third_party/maldoca/src/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
325+
file://${S}/third_party/material_color_utilities/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
325326
file://${S}/third_party/material_design_icons/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
326327
file://${S}/third_party/material_web_components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
327328
file://${S}/third_party/mesa_headers/LICENSE;md5=072744090020e72ad7387e201873fe43 \
328329
file://${S}/third_party/metrics_proto/LICENSE;md5=cfaf8febfe7b4f3e07a08dd4d0db1914 \
329330
file://${S}/third_party/microsoft_webauthn/LICENSE;md5=b98fddd052bb2f5ddbcdbd417ffb26a8 \
330331
file://${S}/third_party/minigbm/LICENSE;md5=fcd558ab2fd7f53408826e80eb0c11eb \
331-
file://${S}/third_party/minizip/src/LICENSE;md5=3fb541eb8359212703e21d14eba7ac64 \
332332
file://${S}/third_party/modp_b64/LICENSE;md5=eb7e2e0af1d4971360553aedadee8d86 \
333-
file://${S}/third_party/mozilla/LICENSE;md5=282100e70d38d39ebdcc47070327aec0 \
334333
file://${S}/third_party/nasm/LICENSE;md5=90904486f8fbf1861cf42752e1a39efe \
335334
file://${S}/third_party/nearby/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
336335
file://${S}/third_party/neon_2_sse/LICENSE;md5=53abad1ded16f44100126962f4bbef6c \

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

Lines changed: 5 additions & 5 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 944a039d066f6..fe41eb6378372 100644
20+
index ef3285ae74e1b..a704f0f485e4e 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -675,7 +675,7 @@ config("compiler") {
23+
@@ -683,7 +683,7 @@ config("compiler") {
2424

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

@@ -47,10 +47,10 @@ index 944a039d066f6..fe41eb6378372 100644
4747
_object_path_suffix = ""
4848
if (is_ios) {
4949
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
50-
index e0d44eed7a760..21c53c1f8536b 100644
50+
index 4738ee80d307c..7a43b1113a495 100644
5151
--- a/build/config/compiler/compiler.gni
5252
+++ b/build/config/compiler/compiler.gni
53-
@@ -98,6 +98,11 @@ declare_args() {
53+
@@ -99,6 +99,11 @@ declare_args() {
5454
# If true, use Goma for ThinLTO code generation where applicable.
5555
use_goma_thin_lto = false
5656

‎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 fe41eb6378372..6875b93d4f3cd 100644
24+
index a704f0f485e4e..4f4ebdfd80f97 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -973,11 +973,6 @@ config("compiler_cpu_abi") {
27+
@@ -1001,11 +1001,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index fe41eb6378372..6875b93d4f3cd 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -987,12 +982,6 @@ config("compiler_cpu_abi") {
39+
@@ -1015,12 +1010,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index fe41eb6378372..6875b93d4f3cd 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1000,9 +989,6 @@ config("compiler_cpu_abi") {
52+
@@ -1028,9 +1017,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 fe41eb6378372..6875b93d4f3cd 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1082,8 +1068,6 @@ config("compiler_cpu_abi") {
62+
@@ -1110,8 +1096,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index fe41eb6378372..6875b93d4f3cd 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1131,9 +1115,6 @@ config("compiler_cpu_abi") {
71+
@@ -1159,9 +1143,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 fe41eb6378372..6875b93d4f3cd 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1191,8 +1172,6 @@ config("compiler_cpu_abi") {
81+
@@ -1219,8 +1200,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index fe41eb6378372..6875b93d4f3cd 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1354,23 +1333,6 @@ config("compiler_deterministic") {
90+
@@ -1382,23 +1361,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}

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

Lines changed: 7 additions & 7 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, 5 insertions(+)
1818

1919
diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
20-
index eed0eed705d7f..f40dffcd4e194 100644
20+
index 52504f4f6f009..40425d63454f3 100644
2121
--- a/tools/v8_context_snapshot/BUILD.gn
2222
+++ b/tools/v8_context_snapshot/BUILD.gn
23-
@@ -65,6 +65,7 @@ if (use_v8_context_snapshot) {
23+
@@ -44,6 +44,7 @@ if (use_v8_context_snapshot) {
2424
output_path = rebase_path(output_file, root_build_dir)
2525

2626
args = [
@@ -29,34 +29,34 @@ index eed0eed705d7f..f40dffcd4e194 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index c9fec31475..4eceacf084 100644
32+
index 316bcb4d3c7..18dbd4b885e 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -1993,6 +1993,7 @@ template("run_torque") {
35+
@@ -2000,6 +2000,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-
@@ -2125,6 +2126,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2132,6 +2133,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-
@@ -2170,6 +2172,7 @@ template("run_mksnapshot") {
51+
@@ -2171,6 +2173,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-
@@ -6371,6 +6374,7 @@ if (v8_enable_i18n_support) {
59+
@@ -6471,6 +6474,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 6875b93d4f3cd..08066ef5c4967 100644
22+
index 4f4ebdfd80f97..e0b65454ebe67 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -972,16 +972,6 @@ config("compiler_cpu_abi") {
25+
@@ -1000,16 +1000,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 08066ef5c4967..afe2be427e8f3 100644
16+
index e0b65454ebe67..d1d3835578db0 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1562,6 +1562,11 @@ config("default_warnings") {
19+
@@ -1590,6 +1590,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 904eaff4687de..1f192d024033a 100644
21+
index 1f0e5cc5f0fae..f75c71d26f727 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1550,7 +1550,9 @@ component("base") {
24+
@@ -1544,7 +1544,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.

‎meta-chromium/recipes-browser/chromium/files/0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
2424
2 files changed, 11 insertions(+), 17 deletions(-)
2525

2626
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
27-
index afe2be427e8f3..ddff3a1f58c69 100644
27+
index d1d3835578db0..6de8875a45eee 100644
2828
--- a/build/config/compiler/BUILD.gn
2929
+++ b/build/config/compiler/BUILD.gn
30-
@@ -1262,7 +1262,6 @@ config("compiler_codegen") {
30+
@@ -1290,7 +1290,6 @@ config("compiler_codegen") {
3131
config("compiler_deterministic") {
3232
cflags = []
3333
ldflags = []
3434
- swiftflags = []
3535

3636
# Eliminate build metadata (__DATE__, __TIME__ and __TIMESTAMP__) for
3737
# deterministic build. See https://crbug.com/314403
38-
@@ -1291,20 +1290,12 @@ config("compiler_deterministic") {
38+
@@ -1319,20 +1318,12 @@ config("compiler_deterministic") {
3939
# different build directory like "out/feature_a" and "out/feature_b" if
4040
# we build same files with same compile flag.
4141
# Other paths are already given in relative, no need to normalize them.
@@ -63,10 +63,10 @@ index afe2be427e8f3..ddff3a1f58c69 100644
6363
# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
6464
asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
6565
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
66-
index 21c53c1f8536b..7bfbcb7e49507 100644
66+
index 7a43b1113a495..5bec423af6c89 100644
6767
--- a/build/config/compiler/compiler.gni
6868
+++ b/build/config/compiler/compiler.gni
69-
@@ -260,8 +260,11 @@ declare_args() {
69+
@@ -267,8 +267,11 @@ declare_args() {
7070
# deterministic builds to reduce compile times, so this is less relevant for
7171
# official builders.
7272
strip_absolute_paths_from_debug_symbols_default =

0 commit comments

Comments
 (0)