Skip to content

Commit dcdb45b

Browse files
committed
chromium: update to 100.0.4896.60
Release notes - https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_29.html License changes: --------------- Added licences: * Roll DevTools Frontend from fe68b2d56aa8 to c4035e3b0d3b (4 revisions) - third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE - third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE - third_party/devtools-frontend/src/front_end/third_party/codemirror.next/LICENSE - third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE - third_party/devtools-frontend/src/front_end/third_party/diff/LICENSE - third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE - third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE - third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE - third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE - third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE - third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE - third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3300260 Updated licenses: * base/third_party/xdg_mime/LICENSE - Pick the least restrictive license for xdg_mime - https://chromium-review.googlesource.com/c/chromium/src/+/3447180 * third_party/ffmpeg/CREDITS.chromium - Roll src/third_party/ffmpeg/ 1edb3eb49..574c39cce (866 commits) - https://chromium-review.googlesource.com/c/chromium/src/+/3430711 Removed licenses: * third_party/android_data_chart/LICENSE - Remove data saver UI - https://chromium-review.googlesource.com/c/chromium/src/+/3405459 * third_party/tcmalloc/LICENSE - [tcmalloc] Remove third_party/tcmalloc dir - https://chromium-review.googlesource.com/c/chromium/src/+/3402604 --------------- Test-built with: * chromium-ozone-wayland: * honister, clang, MACHINE="intel-corei7-64" * honister, clang, MACHINE="raspberrypi3 * hardknott, clang, MACHINE="raspberrypi3 * dunfell, clang**, MACHINE="qemuarm64" * chromium-x11 * honister, clang, MACHINE="raspberrypi3" * hardknott, clang, MACHINE="raspberrypi3" * dunfell, clang**, MACHINE="raspberrypi3" ** Please note that Chromium requires clang version to be >= 12. For that, when on dunfell branch, use meta-clang/clang12 branch.
1 parent 061358d commit dcdb45b

20 files changed

+450
-135
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ SRC_URI += " \
1616
file://0003-v8-qemu-wrapper.patch \
1717
file://0004-wrapper-extra-flags.patch \
1818
file://0005-BUILD-do-not-specify-march-on-arm.patch \
19-
file://0006-Consider-armv7ve-define.patch \
2019
file://0007-Delete-compiler-options-not-available-in-release-ver.patch \
2120
file://0008-avoid-link-latomic-failure-on-CentOS-8-host.patch \
2221
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
23-
file://0010-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
2422
file://0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
2523
file://0012-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
24+
file://0013-GCC-explicitely-move-return-value-of-SCTHashdanceMet.patch \
25+
file://0014-Fix-no-member-named-tie-in-namespace-std.patch \
26+
file://0015-Fix-xkb_keysym-reverse-look-up-for-Lacros.patch \
2627
"
2728

2829
SRC_URI:append:libc-musl = "\

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

Lines changed: 15 additions & 5 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] = "415b47e912766cd07f9f52e95bc6470b835acf1d6f566ae32e66ba8be608f33e"
7+
SRC_URI[sha256sum] = "0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc"
88

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

@@ -65,7 +65,7 @@ LIC_FILES_CHKSUM = "\
6565
file://${S}/base/third_party/superfasthash/LICENSE;md5=c66981f8ad23c9f279a5b9e07385128c \
6666
file://${S}/base/third_party/symbolize/LICENSE;md5=17ae3b22fe8fa438966625593e2eea85 \
6767
file://${S}/base/third_party/valgrind/LICENSE;md5=b95c9cb2560f157c60ea60ac1aa69469 \
68-
file://${S}/base/third_party/xdg_mime/LICENSE;md5=8e8261c342b33e06648483ac7f4862c9 \
68+
file://${S}/base/third_party/xdg_mime/LICENSE;md5=743a91118d40f173467c8ecfd8793c62 \
6969
file://${S}/base/third_party/xdg_user_dirs/LICENSE;md5=d998f250c491c329a8254dd1ca62c647 \
7070
file://${S}/buildtools/third_party/libc++/trunk/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
7171
file://${S}/buildtools/third_party/libc++abi/trunk/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
@@ -98,7 +98,6 @@ LIC_FILES_CHKSUM = "\
9898
file://${S}/third_party/accessibility-audit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9999
file://${S}/third_party/afl/src/docs/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
100100
file://${S}/third_party/android_crazy_linker/LICENSE;md5=997351b5bb1c56ca5be66be8060bb383 \
101-
file://${S}/third_party/android_data_chart/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
102101
file://${S}/third_party/android_deps/libs/android_arch_core_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
103102
file://${S}/third_party/android_deps/libs/android_arch_core_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
104103
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -225,6 +224,18 @@ LIC_FILES_CHKSUM = "\
225224
file://${S}/third_party/dawn/LICENSE;md5=94758054e79f4a16d45043dfa6248541 \
226225
file://${S}/third_party/decklink/LICENSE;md5=85b197f7b7b1ef270b01a1b6377be50e \
227226
file://${S}/third_party/devtools-frontend/src/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \
227+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE;md5=33e8b86a084578431a31c72608f226b8 \
228+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE;md5=33e8b86a084578431a31c72608f226b8 \
229+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/codemirror.next/LICENSE;md5=b5494d4f10ac6bb043e5f684e59cd13f \
230+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE;md5=8554e1ee437cc3fb3cfee9ad4a11b8ab \
231+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/diff/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
232+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
233+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE;md5=913015c0e75ff89ef9461fadca555f65 \
234+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
235+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE;md5=cfc0c20794ef30f41515b56ff0d51668 \
236+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE;md5=449f8b1cf0bfef1e5ec7824a4179ac6f \
237+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE;md5=b8f1fc4a170646d6f75d9572a3bd1339 \
238+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
228239
file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
229240
file://${S}/third_party/dom_distiller_js/LICENSE;md5=1399a5b89c7ed8167d261770432511e8 \
230241
file://${S}/third_party/eigen3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -233,7 +244,7 @@ LIC_FILES_CHKSUM = "\
233244
file://${S}/third_party/expat/src/expat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
234245
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
235246
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
236-
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=aa2247c58648fadacf4d7f865259eebe \
247+
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=59444bcdde2b97bcd19305f2f60e1b54 \
237248
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
238249
file://${S}/third_party/flac/COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \
239250
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
@@ -345,7 +356,6 @@ LIC_FILES_CHKSUM = "\
345356
file://${S}/third_party/subresource-filter-ruleset/LICENSE;md5=408c32b7944dedb9d57797eca2447ea1 \
346357
file://${S}/third_party/sudden_motion_sensor/LICENSE;md5=6f89397ba4dda73a940f27f76e9ad9d4 \
347358
file://${S}/third_party/swiftshader/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87 \
348-
file://${S}/third_party/tcmalloc/LICENSE;md5=8ecc91ee1a2c17333b40126bfa32b7ca \
349359
file://${S}/third_party/tensorflow-text/LICENSE;md5=01e86893010a1b87e69a213faa753ebd \
350360
file://${S}/third_party/test_fonts/LICENSE;md5=a78e43d492b7bd2ad4a4529c7a6266ca \
351361
file://${S}/third_party/text-fragments-polyfill/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \

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
@@ -16,10 +16,10 @@ Thus, use the previously used number of threads.
1616
2 files changed, 11 insertions(+), 6 deletions(-)
1717

1818
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
19-
index 8048ec5e84c96..b22891956d22f 100644
19+
index 7b9ce0172eedf..cbf1d8aef8680 100644
2020
--- a/build/config/compiler/BUILD.gn
2121
+++ b/build/config/compiler/BUILD.gn
22-
@@ -672,7 +672,7 @@ config("compiler") {
22+
@@ -674,7 +674,7 @@ config("compiler") {
2323

2424
if (is_win) {
2525
ldflags += [
@@ -28,7 +28,7 @@ index 8048ec5e84c96..b22891956d22f 100644
2828
"-mllvm:-import-instr-limit=$import_instr_limit",
2929
"/lldltocache:" +
3030
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
31-
@@ -685,11 +685,11 @@ config("compiler") {
31+
@@ -687,11 +687,11 @@ config("compiler") {
3232
# usage in crbug.com/1038040. Note this will increase build time in
3333
# Chrome OS.
3434

@@ -46,10 +46,10 @@ index 8048ec5e84c96..b22891956d22f 100644
4646
ldflags +=
4747
[ "-Wl,-cache_path_lto," +
4848
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
49-
index a41df193c6a2c..92d28fa3a4d6d 100644
49+
index 9d25c10587c7a..a4ecd9563a5af 100644
5050
--- a/build/config/compiler/compiler.gni
5151
+++ b/build/config/compiler/compiler.gni
52-
@@ -80,6 +80,11 @@ declare_args() {
52+
@@ -81,6 +81,11 @@ declare_args() {
5353
# If true, use Goma for ThinLTO code generation where applicable.
5454
use_goma_thin_lto = false
5555

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
@@ -19,10 +19,10 @@ Rebased-by: Maksim Sisov <msisov@igalia.com>
1919
1 file changed, 35 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index b22891956d22f..9f2d9023912ea 100644
22+
index cbf1d8aef8680..f092c1964e67b 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -903,10 +903,6 @@ config("compiler_cpu_abi") {
25+
@@ -908,10 +908,6 @@ config("compiler_cpu_abi") {
2626
]
2727
}
2828
} else if (current_cpu == "arm") {
@@ -33,7 +33,7 @@ index b22891956d22f..9f2d9023912ea 100644
3333
if (!is_nacl) {
3434
cflags += [
3535
"-march=$arm_arch",
36-
@@ -917,10 +913,6 @@ config("compiler_cpu_abi") {
36+
@@ -922,10 +918,6 @@ config("compiler_cpu_abi") {
3737
cflags += [ "-mtune=$arm_tune" ]
3838
}
3939
} else if (current_cpu == "arm64") {
@@ -44,7 +44,7 @@ index b22891956d22f..9f2d9023912ea 100644
4444
if (is_android) {
4545
# Outline atomics crash on Exynos 9810. http://crbug.com/1272795
4646
cflags += [ "-mno-outline-atomics" ]
47-
@@ -932,9 +924,6 @@ config("compiler_cpu_abi") {
47+
@@ -937,9 +929,6 @@ config("compiler_cpu_abi") {
4848
if (is_android) {
4949
cflags += [ "--target=mipsel-linux-android" ]
5050
ldflags += [ "--target=mipsel-linux-android" ]
@@ -54,7 +54,7 @@ index b22891956d22f..9f2d9023912ea 100644
5454
}
5555
} else {
5656
cflags += [ "-EL" ]
57-
@@ -1014,8 +1003,6 @@ config("compiler_cpu_abi") {
57+
@@ -1019,8 +1008,6 @@ config("compiler_cpu_abi") {
5858
ldflags += [ "-Wl,--hash-style=sysv" ]
5959
if (custom_toolchain == "") {
6060
if (is_clang) {
@@ -63,7 +63,7 @@ index b22891956d22f..9f2d9023912ea 100644
6363
} else {
6464
cflags += [ "-EB" ]
6565
ldflags += [ "-EB" ]
66-
@@ -1063,9 +1050,6 @@ config("compiler_cpu_abi") {
66+
@@ -1068,9 +1055,6 @@ config("compiler_cpu_abi") {
6767
if (is_android) {
6868
cflags += [ "--target=mips64el-linux-android" ]
6969
ldflags += [ "--target=mips64el-linux-android" ]
@@ -73,7 +73,7 @@ index b22891956d22f..9f2d9023912ea 100644
7373
}
7474
} else {
7575
cflags += [
76-
@@ -1123,8 +1107,6 @@ config("compiler_cpu_abi") {
76+
@@ -1128,8 +1112,6 @@ config("compiler_cpu_abi") {
7777
ldflags += [ "-Wl,--hash-style=sysv" ]
7878
if (custom_toolchain == "") {
7979
if (is_clang) {
@@ -82,7 +82,7 @@ index b22891956d22f..9f2d9023912ea 100644
8282
} else {
8383
cflags += [
8484
"-EB",
85-
@@ -1269,23 +1251,6 @@ config("compiler_deterministic") {
85+
@@ -1274,23 +1256,6 @@ config("compiler_deterministic") {
8686
}
8787
}
8888
}

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
@@ -16,10 +16,10 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
1616
2 files changed, 5 insertions(+)
1717

1818
diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
19-
index d868696dbf28b..3bf1fe3f1558e 100644
19+
index a06eae4ab3217..ba13c92a74bfc 100644
2020
--- a/tools/v8_context_snapshot/BUILD.gn
2121
+++ b/tools/v8_context_snapshot/BUILD.gn
22-
@@ -72,6 +72,7 @@ if (use_v8_context_snapshot) {
22+
@@ -66,6 +66,7 @@ if (use_v8_context_snapshot) {
2323
output_path = rebase_path(output_file, root_build_dir)
2424

2525
args = [
@@ -29,34 +29,34 @@ index d868696dbf28b..3bf1fe3f1558e 100644
2929
"/v8_context_snapshot_generator",
3030

3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 19731feebe..52e929cab5 100644
32+
index fb68d0ec4d..0c4f2ca5a7 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -1865,6 +1865,7 @@ template("run_torque") {
35+
@@ -1902,6 +1902,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-
@@ -1997,6 +1998,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2034,6 +2035,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-
@@ -2042,6 +2044,7 @@ template("run_mksnapshot") {
51+
@@ -2079,6 +2081,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-
@@ -5806,6 +5809,7 @@ if (v8_enable_i18n_support) {
59+
@@ -5879,6 +5882,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
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1818
1 file changed, 10 deletions(-)
1919

2020
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
21-
index 9f2d9023912ea..8578489258e6e 100644
21+
index f092c1964e67b..0aee3e4011e04 100644
2222
--- a/build/config/compiler/BUILD.gn
2323
+++ b/build/config/compiler/BUILD.gn
24-
@@ -902,16 +902,6 @@ config("compiler_cpu_abi") {
24+
@@ -907,16 +907,6 @@ config("compiler_cpu_abi") {
2525
"-msse3",
2626
]
2727
}

meta-chromium/recipes-browser/chromium/files/0006-Consider-armv7ve-define.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

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
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1111
1 file changed, 5 insertions(+)
1212

1313
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
14-
index 8578489258e6e..c037c2076f3e9 100644
14+
index 0aee3e4011e04..edf3e1a921cd7 100644
1515
--- a/build/config/compiler/BUILD.gn
1616
+++ b/build/config/compiler/BUILD.gn
17-
@@ -1470,6 +1470,11 @@ config("default_warnings") {
17+
@@ -1478,6 +1478,11 @@ config("default_warnings") {
1818
cflags += [
1919
"-Wenum-compare-conditional",
2020

0 commit comments

Comments
 (0)