chromium: update from 103.0.5060.129 to 104.0.5112.101

Stable channel release notes: https://chromereleases.googleblog.com/2022/08/stable-channel-update-for-desktop_16.html Patches: -------- Manually update: 0013-clang-Re-enable-opaque-pointers.patch to deal with a comment change. Update the musl mallinfo patch: musl/0001-mallinfo-implementation-is-glibc-specific.patch to deal with a new header file. Refresh patches to remove fuzz (using devtool). License changes: ---------------- Note that on dunfell, this warning occurs: WARNING: chromium-x11-104.0.5112.101-r0 do_populate_lic: \ chromium-x11: No generic license file exists for: LGPL-2.0-or-later in any provider meta-browser doens't have a dunfell specific branch so it seems that the warning can't be eliminated. Update the license checksums by running the new generate_license_list.py script added to this repo by saying yes to all the exception queries using for example: $ yes | python3 generate_license_list.py ... Added licenses: * base/third_party/cityhash_v103/COPYING - https://chromium-review.googlesource.com/c/chromium/src/+/3412104 * third_party/android_system_sdk/LICENSE - https://chromium-review.googlesource.com/c/angle/angle/+/3251685 * third_party/blink/LICENSE_FOR_ABOUT_CREDITS - https://chromium-review.googlesource.com/c/chromium/src/+/1350011 * third_party/content_analysis_sdk/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3623681 * third_party/cpuinfo/src/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3668676 * third_party/ipcz/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3577818 * third_party/libaom/source/libaom/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/726469 * third_party/libgav1/src/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3412106 * third_party/puffin/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3639351 Removed licenses: (none) Updated licenses: (none) Test-built: ----------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64, qemuarm64, qemuarm - kirkstone, clang, MACHINE=qemux86-64, qemuarm64, qemuarm - dunfell, clang**, MACHINE=qemux86-64, qemuarm64, qemuarm * chromium-x11 - master, clang, MACHINE=qemux86-64, qemuarm64, qemuarm - kirkstone, clang, MACHINE=qemux86-64, qemuarm64, qemuarm - dunfell, clang**, MACHINE=qemux86-64, qemuarm64, qemuarm Also built with TCLIBC=musl for qemux86-64 on master. ** Please note that Chromium requires clang version to be >= 12. For that, when on dunfell branch, use the meta-clang/clang12 branch. Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
OSSystems · Aug 30, 2022 · ebfa266 · ebfa266
1 parent 6e7429c
commit ebfa266
Show file tree

Hide file tree

Showing 37 changed files with 298 additions and 190 deletions.
diff --git a/.../chromium-ozone-wayland_103.0.5060.129.bb → .../chromium-ozone-wayland_104.0.5112.101.bb b/.../chromium-ozone-wayland_103.0.5060.129.bb → .../chromium-ozone-wayland_104.0.5112.101.bb
diff --git a/...r/chromium/chromium-x11_103.0.5060.129.bb → ...r/chromium/chromium-x11_104.0.5112.101.bb b/...r/chromium/chromium-x11_103.0.5060.129.bb → ...r/chromium/chromium-x11_104.0.5112.101.bb
diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc
@@ -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] = "a94718d0c6afe3498b521665d6f72eaea18c87871c4e2ec67bd749245e6674e3"
+SRC_URI[sha256sum] = "60f015e1559de4044cdfa3bdc1f8fde535927c8ab15b0959ccc9b6feec832f5b"
 
 S = "${WORKDIR}/chromium-${PV}"
 
@@ -60,6 +60,7 @@ LIC_FILES_CHKSUM = "\
     file://${S}/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
     file://${S}/LICENSE.chromium_os;md5=87dd8458232da630f5617873d42d8350 \
     file://${S}/base/third_party/cityhash/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
+    file://${S}/base/third_party/cityhash_v103/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
     file://${S}/base/third_party/double_conversion/LICENSE;md5=1ea35644f0ec0d9767897115667e901f \
     file://${S}/base/third_party/dynamic_annotations/LICENSE;md5=b6bd7011ecc1a4f7ac3525589f45e565 \
     file://${S}/base/third_party/libevent/LICENSE;md5=a2b0302a710150293fb85d2bfabd3de6 \
@@ -198,6 +199,7 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/android_sdk/LICENSE;md5=a9559ed17808a8b10eec6672f993ce75 \
     file://${S}/third_party/android_swipe_refresh/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://${S}/third_party/android_system_sdk/LICENSE;md5=cbb64e76df0f98fc138b1918c089417e \
     file://${S}/third_party/angle/LICENSE;md5=7abdb66a6948f39c2f469140db5184e2 \
     file://${S}/third_party/angle/src/common/third_party/xxhash/LICENSE;md5=cb91c07001f1ca6fd50b6bd4f042946a \
     file://${S}/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE;md5=64356ee6f79c94525e102a3264a62653 \
@@ -206,6 +208,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/blink/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \
     file://${S}/third_party/boringssl/src/LICENSE;md5=9b082148f9953258347788edb83e401b \
     file://${S}/third_party/boringssl/src/third_party/fiat/LICENSE;md5=8eb8c1cdeb53faab99e4673182bed9f7 \
     file://${S}/third_party/breakpad/LICENSE;md5=828152b41153892a725f0e7f56faff73 \
@@ -217,6 +220,8 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/cld_3/LICENSE;md5=d8b32ba83f8b11e4badd979f4319e706 \
     file://${S}/third_party/cldr/LICENSE;md5=fe2500bb52e825476d4b93d6f1458232 \
     file://${S}/third_party/closure_compiler/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://${S}/third_party/content_analysis_sdk/LICENSE;md5=ee5fc272be9139e1816c73ce09611ca5 \
+    file://${S}/third_party/cpuinfo/src/LICENSE;md5=cabca80e8e4a4bbe90e9a4b4ad53f5f4 \
     file://${S}/third_party/crashpad/crashpad/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/crc32c/src/LICENSE;md5=e9ed01b5e5ac9eae23fc2bb33701220c \
     file://${S}/third_party/d3/src/LICENSE;md5=0679931d76eb2f1dd1915249da84a722 \
@@ -270,6 +275,7 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/iccjpeg/LICENSE;md5=26834d132689a03abf860f4572705494 \
     file://${S}/third_party/icu/LICENSE;md5=a89d03060ff9c46552434dbd1fe3ed1f \
     file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \
+    file://${S}/third_party/ipcz/LICENSE;md5=12ba2bbc8799113da234257d46138649 \
     file://${S}/third_party/isimpledom/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
     file://${S}/third_party/jinja2/LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462 \
     file://${S}/third_party/jsoncpp/LICENSE;md5=c56ee55c03a55f8105b969d8270632ce \
@@ -279,8 +285,10 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/leveldatabase/src/LICENSE;md5=92d1b128950b11ba8495b64938fc164d \
     file://${S}/third_party/libFuzzer/LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa \
     file://${S}/third_party/libaddressinput/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://${S}/third_party/libaom/source/libaom/LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \
     file://${S}/third_party/libavif/LICENSE;md5=15744a27d810133340dc64ad411ec4cd \
     file://${S}/third_party/libbrlapi/LICENSE;md5=fad9b3332be894bab9bc501572864b29 \
+    file://${S}/third_party/libgav1/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/libgifcodec/LICENSE.md;md5=1018a09551825ebc78d78f84855e07fa \
     file://${S}/third_party/libipp/LICENSE;md5=af9e58383a1b2b17c75c6c9ff561ca9d \
     file://${S}/third_party/libjingle_xmpp/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
@@ -334,6 +342,7 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/private-join-and-compute/src/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
     file://${S}/third_party/private_membership/LICENSE;md5=9d44acd6df6b90cbbabbd467d67e74c7 \
     file://${S}/third_party/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
+    file://${S}/third_party/puffin/LICENSE;md5=b1ed361f9fc790c1054d81a7ef041a34 \
     file://${S}/third_party/pyjson5/src/LICENSE;md5=d2794c0df5b907fdace235a619d80314 \
     file://${S}/third_party/pylint/pylint/LICENSE.txt;md5=4325afd396febcb659c36b49533135d4 \
     file://${S}/third_party/pywebsocket3/src/LICENSE;md5=b661a96f569e068e4af269db23b09a90 \
@@ -388,7 +397,7 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/zxcvbn-cpp/LICENSE.txt;md5=50f9303d0b3adb4952217b0d8c00d83f \
     file://${S}/tools/mac/power/protos/third_party/pprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
-    file://${S}/v8/LICENSE;md5=6611673a9587a522034a4be8f4df564c \
     file://${S}/v8/LICENSE.fdlibm;md5=b17367d6c97e638599071d99a3049dfe \
     file://${S}/v8/LICENSE.strongtalk;md5=956a43818dd13f2e93088fc2c93589d2 \
+    file://${S}/v8/LICENSE;md5=6611673a9587a522034a4be8f4df564c \
     "
diff --git a/meta-chromium/recipes-browser/chromium/files/0001-limit-number-of-LTO-jobs.patch b/meta-chromium/recipes-browser/chromium/files/0001-limit-number-of-LTO-jobs.patch
@@ -16,10 +16,10 @@ Thus, use the previously used number of threads.
  2 files changed, 11 insertions(+), 6 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 60165f14531c4..5fc19591e9e20 100644
+index df8610696c..155f49f146 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -674,7 +674,7 @@ config("compiler") {
+@@ -663,7 +663,7 @@ config("compiler") {
 
      if (is_win) {
        ldflags += [
@@ -28,7 +28,7 @@ index 60165f14531c4..5fc19591e9e20 100644
          "-mllvm:-import-instr-limit=$import_instr_limit",
          "/lldltocache:" +
              rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
-@@ -687,11 +687,11 @@ config("compiler") {
+@@ -676,11 +676,11 @@ config("compiler") {
        # usage in crbug.com/1038040. Note this will increase build time in
        # Chrome OS.
 
@@ -43,16 +43,16 @@ index 60165f14531c4..5fc19591e9e20 100644
 +      ldflags += [ "-Wl,--thinlto-jobs=" + max_jobs_per_link ]
 +
        if (is_apple) {
-         ldflags +=
-             [ "-Wl,-cache_path_lto," +
+         ldflags += [
+           "-Wl,-cache_path_lto," +
 diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index 9d25c10587c7a..a4ecd9563a5af 100644
+index 36108aaf7a..b6299ca54f 100644
 --- a/build/config/compiler/compiler.gni
 +++ b/build/config/compiler/compiler.gni
-@@ -81,6 +81,11 @@ declare_args() {
+@@ -94,6 +94,11 @@ declare_args() {
    # If true, use Goma for ThinLTO code generation where applicable.
    use_goma_thin_lto = false
-
+ 
 +  # Limit the number of jobs (threads/processes) the linker is allowed
 +  # to use (for linkers that support this).
 +  # Upstream chromium uses "all" keyword that is available since llvm 13.
@@ -61,6 +61,3 @@ index 9d25c10587c7a..a4ecd9563a5af 100644
    # Whether we're using a sample profile collected on an architecture different
    # than the one we're compiling for.
    #
---
-2.25.1
-
diff --git a/...es-browser/chromium/files/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch b/...es-browser/chromium/files/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch
@@ -18,14 +18,11 @@ Rebased-by: Maksim Sisov <msisov@igalia.com>
  build/config/compiler/BUILD.gn | 35 ----------------------------------
  1 file changed, 35 deletions(-)
 
- build/config/compiler/BUILD.gn | 35 ----------------------------------
- 1 file changed, 35 deletions(-)
-
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 5fc19591e9e20..d22994d343857 100644
+index 155f49f146..04fa2f13ae 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -917,10 +917,6 @@ config("compiler_cpu_abi") {
+@@ -909,10 +909,6 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -36,7 +33,7 @@ index 5fc19591e9e20..d22994d343857 100644
        if (!is_nacl) {
          cflags += [
            "-march=$arm_arch",
-@@ -931,10 +927,6 @@ config("compiler_cpu_abi") {
+@@ -923,10 +919,6 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -47,7 +44,7 @@ index 5fc19591e9e20..d22994d343857 100644
        if (is_android) {
          # Outline atomics crash on Exynos 9810. http://crbug.com/1272795
          cflags += [ "-mno-outline-atomics" ]
-@@ -946,9 +938,6 @@ config("compiler_cpu_abi") {
+@@ -938,9 +930,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mipsel-linux-android" ]
              ldflags += [ "--target=mipsel-linux-android" ]
@@ -57,7 +54,7 @@ index 5fc19591e9e20..d22994d343857 100644
            }
          } else {
            cflags += [ "-EL" ]
-@@ -1028,8 +1017,6 @@ config("compiler_cpu_abi") {
+@@ -1020,8 +1009,6 @@ config("compiler_cpu_abi") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
          if (is_clang) {
@@ -66,7 +63,7 @@ index 5fc19591e9e20..d22994d343857 100644
          } else {
            cflags += [ "-EB" ]
            ldflags += [ "-EB" ]
-@@ -1077,9 +1064,6 @@ config("compiler_cpu_abi") {
+@@ -1069,9 +1056,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mips64el-linux-android" ]
              ldflags += [ "--target=mips64el-linux-android" ]
@@ -76,7 +73,7 @@ index 5fc19591e9e20..d22994d343857 100644
            }
          } else {
            cflags += [
-@@ -1137,8 +1121,6 @@ config("compiler_cpu_abi") {
+@@ -1129,8 +1113,6 @@ config("compiler_cpu_abi") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
          if (is_clang) {
@@ -85,7 +82,7 @@ index 5fc19591e9e20..d22994d343857 100644
          } else {
            cflags += [
              "-EB",
-@@ -1283,23 +1265,6 @@ config("compiler_deterministic") {
+@@ -1275,23 +1257,6 @@ config("compiler_deterministic") {
        }
      }
    }
@@ -109,5 +106,3 @@ index 5fc19591e9e20..d22994d343857 100644
  }
 
  config("clang_revision") {
---
-2.25.1
diff --git a/meta-chromium/recipes-browser/chromium/files/0003-v8-qemu-wrapper.patch b/meta-chromium/recipes-browser/chromium/files/0003-v8-qemu-wrapper.patch
@@ -1,4 +1,4 @@
-From b611909b9cc2b29afa64ace5933fcf8dffc0b623 Mon Sep 17 00:00:00 2001
+From 666437740c4f3d6c587688d82251f4ba94aaadbc Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Tue, 7 Nov 2017 15:24:32 +0100
 Subject: [PATCH] v8: qemu wrapper
@@ -16,7 +16,7 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
  2 files changed, 5 insertions(+)
 
 diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
-index a06eae4ab3217..ba13c92a74bfc 100644
+index a06eae4ab3..ba13c92a74 100644
 --- a/tools/v8_context_snapshot/BUILD.gn
 +++ b/tools/v8_context_snapshot/BUILD.gn
 @@ -66,6 +66,7 @@ if (use_v8_context_snapshot) {
@@ -29,34 +29,34 @@ index a06eae4ab3217..ba13c92a74bfc 100644
                                 "/v8_context_snapshot_generator",
 
 diff --git a/v8/BUILD.gn b/v8/BUILD.gn
-index 7304e8c3f9..aa0789fb74 100644
+index 00770169bf..73a68b8cd4 100644
 --- a/v8/BUILD.gn
 +++ b/v8/BUILD.gn
-@@ -1882,6 +1882,7 @@ template("run_torque") {
+@@ -1944,6 +1944,7 @@ template("run_torque") {
      }
 
      args = [
 +      "./v8-qemu-wrapper.sh",
        "./" + rebase_path(
                get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
                root_build_dir),
-@@ -2014,6 +2015,7 @@ action("generate_bytecode_builtins_list") {
+@@ -2076,6 +2077,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)",
-@@ -2059,6 +2061,7 @@ template("run_mksnapshot") {
+@@ -2121,6 +2123,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),
-@@ -5829,6 +5832,7 @@ if (v8_enable_i18n_support) {
+@@ -6086,6 +6089,7 @@ if (v8_enable_i18n_support) {
      outputs = [ output_file ]
 
      args = [

diff --git a/meta-chromium/recipes-browser/chromium/files/0004-wrapper-extra-flags.patch b/meta-chromium/recipes-browser/chromium/files/0004-wrapper-extra-flags.patch
@@ -1,4 +1,4 @@
-From e044535edbe379e8f1d8401bd209413b8377aed7 Mon Sep 17 00:00:00 2001
+From f15ffdca46111ce5b5d33f1e7cc2eb71ba30d605 Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Wed, 8 Nov 2017 16:43:47 +0100
 Subject: [PATCH] wrapper: extra flags
@@ -14,7 +14,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/chrome/installer/linux/common/wrapper b/chrome/installer/linux/common/wrapper
-index 63699e047f3ac..0295e9879de78 100755
+index 63699e047f..0295e9879d 100755
 --- a/chrome/installer/linux/common/wrapper
 +++ b/chrome/installer/linux/common/wrapper
 @@ -45,5 +45,7 @@ exec < /dev/null

diff --git a/meta-chromium/recipes-browser/chromium/files/0005-BUILD-do-not-specify-march-on-arm.patch b/meta-chromium/recipes-browser/chromium/files/0005-BUILD-do-not-specify-march-on-arm.patch
@@ -1,4 +1,4 @@
-From 6510aaf312a9ab8c14a11a3a47b411e79d62acbf Mon Sep 17 00:00:00 2001
+From 23f7c3001ee12b75f08119f638eb90c257308eaf Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 22 Jan 2019 00:17:41 -0800
 Subject: [PATCH] BUILD: do not specify march on arm
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 10 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index d22994d343857..6eac8ceba1a73 100644
+index 04fa2f13ae..76cbbb777c 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -916,16 +916,6 @@ config("compiler_cpu_abi") {
+@@ -908,16 +908,6 @@ config("compiler_cpu_abi") {
            "-msse3",
          ]
        }

diff --git a/...es-browser/chromium/files/0007-Delete-compiler-options-not-available-in-release-ver.patch b/...es-browser/chromium/files/0007-Delete-compiler-options-not-available-in-release-ver.patch
@@ -1,4 +1,4 @@
-From 05d3254fd3ed24a85d79b6749fcfc45e6327bc23 Mon Sep 17 00:00:00 2001
+From a159b86422be076d0558bded2bed783670fe24cb Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 4 Dec 2019 19:06:54 -0800
 Subject: [PATCH] Delete compiler options not available in release versions of
@@ -11,13 +11,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 6eac8ceba1a73..1124f68b655ea 100644
+index 76cbbb777c..308c09d525 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1487,6 +1487,11 @@ config("default_warnings") {
+@@ -1480,6 +1480,11 @@ config("default_warnings") {
        cflags += [
          "-Wenum-compare-conditional",
-
+ 
 +        # Disable unknown warnings, since system clang may not have
 +        # backported newer warning yet unlike internal clang that
 +        # chromium uses.

diff --git a/...ium/recipes-browser/chromium/files/0008-avoid-link-latomic-failure-on-CentOS-8-host.patch b/...ium/recipes-browser/chromium/files/0008-avoid-link-latomic-failure-on-CentOS-8-host.patch
@@ -1,4 +1,4 @@
-From 5be6349f8a8b29258094daf5535f6dc7dd188cae Mon Sep 17 00:00:00 2001
+From 8cd645b4bc06b14d9296df1177e417e725e4036e Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Fri, 22 Jan 2021 00:02:25 +0800
 Subject: [PATCH] avoid link latomic failure on CentOS 8 host
@@ -17,22 +17,21 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
  2 files changed, 4 insertions(+)
 
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 7eddfb10ad319..eab29ede9496c 100644
+index 2b1a93670d..e69fa2f3e9 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1495,8 +1495,10 @@ mixed_component("base") {
+@@ -1496,7 +1496,9 @@ mixed_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.
 +  # Only target requires <atomic>
-   if (!use_sysroot &&
-       (is_android || ((is_linux || is_chromeos) && !is_chromecast)) &&
+   if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
 +      (current_toolchain != host_toolchain) &&
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
 diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
-index d304d081009f9..10232ba4181f3 100644
+index d304d08100..10232ba418 100644
 --- a/build/config/linux/BUILD.gn
 +++ b/build/config/linux/BUILD.gn
 @@ -40,7 +40,9 @@ config("runtime_library") {

diff --git a/...es-browser/chromium/files/0009-nomerge-attribute-on-declaration-is-only-available-s.patch b/...es-browser/chromium/files/0009-nomerge-attribute-on-declaration-is-only-available-s.patch
@@ -25,10 +25,10 @@ Change-Id: I32e1f7dc9049737d54d8a16de5308aa5aae1ced1
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/base/compiler_specific.h b/base/compiler_specific.h
-index 1ee80743e2f48..d240a3e631075 100644
+index bb43ab39c7..a3afaa9be6 100644
 --- a/base/compiler_specific.h
 +++ b/base/compiler_specific.h
-@@ -328,7 +328,8 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
+@@ -329,7 +329,8 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
  #endif  // defined(__clang_analyzer__)
 
  // Use nomerge attribute to disable optimization of merging multiple same calls.

diff --git a/...es-browser/chromium/files/0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch b/...es-browser/chromium/files/0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch
@@ -21,10 +21,10 @@ This reverts commit 34a955823630096f5b01c2b01d51c1ea59d22763.
  2 files changed, 11 insertions(+), 15 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 1124f68b655ea..8a009137f6b7b 100644
+index 308c09d525..eeeaedf13d 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1224,19 +1224,12 @@ config("compiler_deterministic") {
+@@ -1216,19 +1216,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.
@@ -51,10 +51,10 @@ index 1124f68b655ea..8a009137f6b7b 100644
        # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
        asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
 diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index a4ecd9563a5af..0298745cb87af 100644
+index b6299ca54f..45b3acb352 100644
 --- a/build/config/compiler/compiler.gni
 +++ b/build/config/compiler/compiler.gni
-@@ -250,8 +250,11 @@ declare_args() {
+@@ -243,8 +243,11 @@ declare_args() {
  # deterministic builds to reduce compile times, so this is less relevant for
  # official builders.
  strip_absolute_paths_from_debug_symbols_default =
@@ -68,5 +68,3 @@ index a4ecd9563a5af..0298745cb87af 100644
 
  # If the platform uses stripped absolute paths by default, then we don't expose
  # it as a configuration option. If this is causing problems, please file a bug.
---
-2.25.1