Skip to content

Commit a5ceea0

Browse files
msisovmsisov
committed
chromium: update to 101.0.4951.41
Release notes: https://chromereleases.googleblog.com/2022/04/stable-channel-update-for-desktop_26.html License changes: --------------- Removed licenses: * chromeos/third_party/android_bionic_libc/NOTICE - Remove unused chromeos/third_party - https://chromium-review.googlesource.com/c/chromium/src/+/3487892 Updated licesnes: * third_party/libjpeg_turbo/LICENSE.md - Roll src/third_party/libjpeg_turbo/ 02959c3ee..22f1a22c9 (1 commit) - https://chromium-review.googlesource.com/c/chromium/src/+/3500594 --------------- Test-built: * chromium-ozone-wayland: - honister, clang, MACHINE="intel-corei7-64" - 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 169fe52 commit a5ceea0

18 files changed

Lines changed: 32 additions & 379 deletions

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ SRC_URI += " \
2121
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
2222
file://0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
2323
file://0012-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
24-
file://0013-GCC-explicitely-move-return-value-of-SCTHashdanceMet.patch \
2524
file://0014-Fix-no-member-named-tie-in-namespace-std.patch \
26-
file://0015-Fix-xkb_keysym-reverse-look-up-for-Lacros.patch \
2725
"
2826

2927
SRC_URI:append:libc-musl = "\

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_100.0.4896.127.bb renamed to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_101.0.4951.41.bb

File renamed without changes.

meta-chromium/recipes-browser/chromium/chromium-x11_100.0.4896.127.bb renamed to meta-chromium/recipes-browser/chromium/chromium-x11_101.0.4951.41.bb

File renamed without changes.

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

Lines changed: 2 additions & 3 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] = "4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d"
7+
SRC_URI[sha256sum] = "099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37"
88

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

@@ -74,7 +74,6 @@ LIC_FILES_CHKSUM = "\
7474
file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \
7575
file://${S}/chrome/installer/mac/third_party/xz/LICENSE;md5=8bbde65ae0523dc878ed1ac1252d2d14 \
7676
file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \
77-
file://${S}/chromeos/third_party/android_bionic_libc/NOTICE;md5=323acddf0a0970d8ad7a7af3ba745f67 \
7877
file://${S}/courgette/third_party/bsdiff/LICENCE;md5=7c2ad392281bc3d9b04a31102ee7abdd \
7978
file://${S}/courgette/third_party/divsufsort/LICENSE;md5=e261f081e52882dad3ff0225497ce451 \
8079
file://${S}/ios/third_party/blink/LICENSE;md5=9fdb47308c4e0a2b6d07c5af39e5da1a \
@@ -285,7 +284,7 @@ LIC_FILES_CHKSUM = "\
285284
file://${S}/third_party/libgifcodec/LICENSE.md;md5=1018a09551825ebc78d78f84855e07fa \
286285
file://${S}/third_party/libipp/LICENSE;md5=af9e58383a1b2b17c75c6c9ff561ca9d \
287286
file://${S}/third_party/libjingle_xmpp/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
288-
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=970f17d51650fe54e4f839c6e6121f79 \
287+
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=a75feaa2de6d8942f50d412241fca1f1 \
289288
file://${S}/third_party/libjxl/LICENSE;md5=6a905a337cc228a1f68f0b5416f52a7f \
290289
file://${S}/third_party/liblouis/LICENSE;md5=8ab69863de0d3a0e00c4f97a4d78dd4a \
291290
file://${S}/third_party/libphonenumber/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ 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 7b9ce0172eedf..cbf1d8aef8680 100644
19+
index 60165f14531c4..5fc19591e9e20 100644
2020
--- a/build/config/compiler/BUILD.gn
2121
+++ b/build/config/compiler/BUILD.gn
2222
@@ -674,7 +674,7 @@ config("compiler") {

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@ Rebased-by: Maksim Sisov <msisov@igalia.com>
1818
build/config/compiler/BUILD.gn | 35 ----------------------------------
1919
1 file changed, 35 deletions(-)
2020

21+
build/config/compiler/BUILD.gn | 35 ----------------------------------
22+
1 file changed, 35 deletions(-)
23+
2124
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index cbf1d8aef8680..f092c1964e67b 100644
25+
index 5fc19591e9e20..d22994d343857 100644
2326
--- a/build/config/compiler/BUILD.gn
2427
+++ b/build/config/compiler/BUILD.gn
25-
@@ -908,10 +908,6 @@ config("compiler_cpu_abi") {
28+
@@ -917,10 +917,6 @@ config("compiler_cpu_abi") {
2629
]
2730
}
2831
} else if (current_cpu == "arm") {
@@ -33,7 +36,7 @@ index cbf1d8aef8680..f092c1964e67b 100644
3336
if (!is_nacl) {
3437
cflags += [
3538
"-march=$arm_arch",
36-
@@ -922,10 +918,6 @@ config("compiler_cpu_abi") {
39+
@@ -931,10 +927,6 @@ config("compiler_cpu_abi") {
3740
cflags += [ "-mtune=$arm_tune" ]
3841
}
3942
} else if (current_cpu == "arm64") {
@@ -44,7 +47,7 @@ index cbf1d8aef8680..f092c1964e67b 100644
4447
if (is_android) {
4548
# Outline atomics crash on Exynos 9810. http://crbug.com/1272795
4649
cflags += [ "-mno-outline-atomics" ]
47-
@@ -937,9 +929,6 @@ config("compiler_cpu_abi") {
50+
@@ -946,9 +938,6 @@ config("compiler_cpu_abi") {
4851
if (is_android) {
4952
cflags += [ "--target=mipsel-linux-android" ]
5053
ldflags += [ "--target=mipsel-linux-android" ]
@@ -54,7 +57,7 @@ index cbf1d8aef8680..f092c1964e67b 100644
5457
}
5558
} else {
5659
cflags += [ "-EL" ]
57-
@@ -1019,8 +1008,6 @@ config("compiler_cpu_abi") {
60+
@@ -1028,8 +1017,6 @@ config("compiler_cpu_abi") {
5861
ldflags += [ "-Wl,--hash-style=sysv" ]
5962
if (custom_toolchain == "") {
6063
if (is_clang) {
@@ -63,7 +66,7 @@ index cbf1d8aef8680..f092c1964e67b 100644
6366
} else {
6467
cflags += [ "-EB" ]
6568
ldflags += [ "-EB" ]
66-
@@ -1068,9 +1055,6 @@ config("compiler_cpu_abi") {
69+
@@ -1077,9 +1064,6 @@ config("compiler_cpu_abi") {
6770
if (is_android) {
6871
cflags += [ "--target=mips64el-linux-android" ]
6972
ldflags += [ "--target=mips64el-linux-android" ]
@@ -73,7 +76,7 @@ index cbf1d8aef8680..f092c1964e67b 100644
7376
}
7477
} else {
7578
cflags += [
76-
@@ -1128,8 +1112,6 @@ config("compiler_cpu_abi") {
79+
@@ -1137,8 +1121,6 @@ config("compiler_cpu_abi") {
7780
ldflags += [ "-Wl,--hash-style=sysv" ]
7881
if (custom_toolchain == "") {
7982
if (is_clang) {
@@ -82,7 +85,7 @@ index cbf1d8aef8680..f092c1964e67b 100644
8285
} else {
8386
cflags += [
8487
"-EB",
85-
@@ -1274,23 +1256,6 @@ config("compiler_deterministic") {
88+
@@ -1283,23 +1265,6 @@ config("compiler_deterministic") {
8689
}
8790
}
8891
}

‎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 a06eae4ab3217..ba13c92a74bfc 100644
2929
"/v8_context_snapshot_generator",
3030

3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index fb68d0ec4d..0c4f2ca5a7 100644
32+
index 7304e8c3f9..aa0789fb74 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -1902,6 +1902,7 @@ template("run_torque") {
35+
@@ -1882,6 +1882,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-
@@ -2034,6 +2035,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2014,6 +2015,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-
@@ -2079,6 +2081,7 @@ template("run_mksnapshot") {
51+
@@ -2059,6 +2061,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-
@@ -5879,6 +5882,7 @@ if (v8_enable_i18n_support) {
59+
@@ -5829,6 +5832,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 f092c1964e67b..0aee3e4011e04 100644
21+
index d22994d343857..6eac8ceba1a73 100644
2222
--- a/build/config/compiler/BUILD.gn
2323
+++ b/build/config/compiler/BUILD.gn
24-
@@ -907,16 +907,6 @@ config("compiler_cpu_abi") {
24+
@@ -916,16 +916,6 @@ config("compiler_cpu_abi") {
2525
"-msse3",
2626
]
2727
}

‎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 0aee3e4011e04..edf3e1a921cd7 100644
14+
index 6eac8ceba1a73..1124f68b655ea 100644
1515
--- a/build/config/compiler/BUILD.gn
1616
+++ b/build/config/compiler/BUILD.gn
17-
@@ -1478,6 +1478,11 @@ config("default_warnings") {
17+
@@ -1487,6 +1487,11 @@ config("default_warnings") {
1818
cflags += [
1919
"-Wenum-compare-conditional",
2020

‎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
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1616
2 files changed, 4 insertions(+)
1717

1818
diff --git a/base/BUILD.gn b/base/BUILD.gn
19-
index 855ad1489f456..cf4fcbd57ee14 100644
19+
index 6e93d84600ea6..f7f205ec5eb69 100644
2020
--- a/base/BUILD.gn
2121
+++ b/base/BUILD.gn
22-
@@ -1477,8 +1477,10 @@ mixed_component("base") {
22+
@@ -1491,8 +1491,10 @@ mixed_component("base") {
2323
# Needed for <atomic> if using newer C++ library than sysroot, except if
2424
# building inside the cros_sdk environment - use host_toolchain as a
2525
# more robust check for this.

0 commit comments

Comments
 (0)