chromium: Update to 122.0.6261.128 (OSSystems#803)

Fixes OSSystems#795. Release notes: https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop_20.html https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop_22.html https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop_27.html https://chromereleases.googleblog.com/2024/03/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2024/03/stable-channel-update-for-desktop_12.html Build and patch changes: ------------------------ Drop six backported patches that are included upstream now. Drop arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch as it was only needed to fix a build error with clang < 17, which we don't support any more. Rebase remaining patches and renumber remaining ARM patches. License changes: ---------------- Added licenses: * third_party/coremltools/mlmodel/format/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5108678 * third_party/node/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5136956 * third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/LICENSE, third_party/angle/src/third_party/libXNVCtrl/LICENSE, third_party/angle/src/third_party/volk/LICENSE.md, third_party/angle/third_party/android_system_sdk/LICENSE, third_party/angle/third_party/flatbuffers/LICENSE, third_party/catapult/experimental/trace_on_tap/third_party/pako/LICENSE, third_party/catapult/third_party/Paste/docs/license.txt, third_party/catapult/third_party/WebOb/docs/license.txt, third_party/catapult/third_party/apiclient/LICENSE, third_party/catapult/third_party/cachetools/LICENSE, third_party/catapult/third_party/chardet/LICENSE, third_party/catapult/third_party/cloudstorage/COPYING, third_party/catapult/third_party/coverage/LICENSE.txt, third_party/catapult/third_party/flot/LICENSE.txt, third_party/catapult/third_party/google-auth/LICENSE, third_party/catapult/third_party/gsutil/LICENSE, third_party/catapult/third_party/html5lib-python/LICENSE, third_party/catapult/third_party/httplib2/LICENSE, third_party/catapult/third_party/ijson/LICENSE.txt, third_party/catapult/third_party/oauth2client/LICENSE, third_party/catapult/third_party/polymer/LICENSE.polymer, third_party/catapult/third_party/polymer2/LICENSE.polymer, third_party/catapult/third_party/polymer3/LICENSE.polymer, third_party/catapult/third_party/pyfakefs/COPYING, third_party/catapult/third_party/pyparsing/LICENSE, third_party/catapult/third_party/python_gflags/COPYING, third_party/catapult/third_party/redux/LICENSE.md, third_party/catapult/third_party/requests_toolbelt/LICENSE, third_party/catapult/third_party/six/LICENSE, third_party/catapult/third_party/typ/LICENSE, third_party/catapult/third_party/vinn/third_party/v8/LICENSE, third_party/catapult/third_party/vinn/third_party/v8/LICENSE.strongtalk, third_party/catapult/third_party/vinn/third_party/v8/LICENSE.v8, third_party/catapult/third_party/vinn/third_party/v8/LICENSE.valgrind, third_party/catapult/third_party/webapp2/LICENSE, third_party/catapult/tracing/third_party/jpeg-js/LICENSE, third_party/catapult/tracing/third_party/oboe/LICENCE, third_party/catapult/tracing/third_party/pako/LICENSE, third_party/chromevox/third_party/closure-library/LICENSE, third_party/chromevox/third_party/sre/LICENSE, third_party/crashpad/crashpad/third_party/getopt/LICENSE, third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE, third_party/dawn/third_party/khronos/LICENSE, third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE, third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE, third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data/package/LICENSE.md, third_party/google_input_tools/third_party/closure_library/LICENSE, third_party/openscreen/src/third_party/protobuf/LICENSE, third_party/openscreen/src/third_party/tinycbor/src/LICENSE, third_party/openscreen/src/third_party/zlib/LICENSE, third_party/pdfium/third_party/fp16/LICENSE, third_party/pdfium/third_party/freetype/FTL.TXT, third_party/screen-ai/LICENSE, third_party/selenium-atoms/LICENSE.closure, third_party/selenium-atoms/LICENSE.sizzle, third_party/selenium-atoms/LICENSE.wgxpath, third_party/swiftshader/third_party/SPIRV-Headers/LICENSE, third_party/swiftshader/third_party/SPIRV-Tools/LICENSE, third_party/webrtc/common_audio/third_party/ooura/LICENSE, third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE, third_party/webrtc/modules/third_party/portaudio/LICENSE, third_party/webrtc/rtc_base/third_party/sigslot/LICENSE, - https://chromium-review.googlesource.com/c/chromium/src/+/5061468 Removed licenses: * third_party/gvr-android-sdk/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5128757 * third_party/nasm/LICENSE - Removed due to being marked as not shipped. Updated licenses: * chrome/installer/mac/third_party/xz/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5289735 * third_party/libxml/src/Copyright - https://chromium-review.googlesource.com/c/chromium/src/+/5140988 Test-built (big thanks to @rjanani-p): -------------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64, raspberrypi4-64 - nanbield, clang, MACHINE=qemuarm64, qemux86-64 * chromium-x11: - master, clang, MACHINE=qemuarm, qemuarm64, qemux86-64 - nanbield, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 Signed-off-by: Max Ihlenfeldt <max@igalia.com>
MaxIhlenfeldt · Apr 15, 2024 · d3a5f63 · d3a5f63
1 parent 81d037b
commit d3a5f63
Show file tree

Hide file tree

Showing 25 changed files with 121 additions and 520 deletions.
diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc
@@ -12,13 +12,7 @@ B = "${S}/${OUTPUT_DIR}"
 
 # Backported patches.
 SRC_URI += "\
-    file://backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch \
-    file://backport/IWYU-for-content-browser-generic_sensor-fra.patch \
-    file://backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch \
     file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
-    file://backport/six-Update-vendored-copy-of-six-to-1.16.0.patch \
-    file://backport/ToTLinux-Fix-some-narrowing-errors.patch \
-    file://backport/Update-LegacyStatsCollector-to-conform-with.patch \
 "
 # Non-specific patches.
 SRC_URI += "\
@@ -36,9 +30,8 @@ SRC_URI += "\
 # ARM/AArch64-specific patches.
 SRC_URI:append:arm = "\
     file://arm/0001-BUILD-do-not-specify-march-on-arm.patch \
-    file://arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch \
 "
-SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"
+SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"
 
 # musl-specific patches.
 SRC_URI:append:libc-musl = "\

diff --git a/.../chromium-ozone-wayland_121.0.6167.184.bb → .../chromium-ozone-wayland_122.0.6261.128.bb b/.../chromium-ozone-wayland_121.0.6167.184.bb → .../chromium-ozone-wayland_122.0.6261.128.bb
diff --git a/...r/chromium/chromium-x11_121.0.6167.184.bb → ...r/chromium/chromium-x11_122.0.6261.128.bb b/...r/chromium/chromium-x11_121.0.6167.184.bb → ...r/chromium/chromium-x11_122.0.6261.128.bb
diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc
diff --git a/...es-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch b/...es-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch
@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
  1 file changed, 38 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index de1cd6e..38b8167 100644
+index 89b4755..f7ba313 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1175,11 +1175,6 @@ config("compiler_cpu_abi") {
+@@ -1174,11 +1174,6 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index de1cd6e..38b8167 100644
        if (!is_nacl) {
          cflags += [
            "-march=$arm_arch",
-@@ -1189,12 +1184,6 @@ config("compiler_cpu_abi") {
+@@ -1188,12 +1183,6 @@ config("compiler_cpu_abi") {
        if (arm_tune != "") {
          cflags += [ "-mtune=$arm_tune" ]
        }
@@ -49,7 +49,7 @@ index de1cd6e..38b8167 100644
      } else if (current_cpu == "mipsel" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
-@@ -1202,9 +1191,6 @@ config("compiler_cpu_abi") {
+@@ -1201,9 +1190,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mipsel-linux-android" ]
              ldflags += [ "--target=mipsel-linux-android" ]
@@ -59,7 +59,7 @@ index de1cd6e..38b8167 100644
            }
          } else {
            cflags += [ "-EL" ]
-@@ -1284,8 +1270,6 @@ config("compiler_cpu_abi") {
+@@ -1283,8 +1269,6 @@ config("compiler_cpu_abi") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
          if (is_clang) {
@@ -68,7 +68,7 @@ index de1cd6e..38b8167 100644
          } else {
            cflags += [ "-EB" ]
            ldflags += [ "-EB" ]
-@@ -1333,9 +1317,6 @@ config("compiler_cpu_abi") {
+@@ -1332,9 +1316,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mips64el-linux-android" ]
              ldflags += [ "--target=mips64el-linux-android" ]
@@ -78,7 +78,7 @@ index de1cd6e..38b8167 100644
            }
          } else {
            cflags += [
-@@ -1393,8 +1374,6 @@ config("compiler_cpu_abi") {
+@@ -1392,8 +1373,6 @@ config("compiler_cpu_abi") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
          if (is_clang) {
@@ -87,7 +87,7 @@ index de1cd6e..38b8167 100644
          } else {
            cflags += [
              "-EB",
-@@ -1557,23 +1536,6 @@ config("compiler_deterministic") {
+@@ -1556,23 +1535,6 @@ config("compiler_deterministic") {
        }
      }
    }

diff --git a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch
@@ -29,34 +29,34 @@ index 52504f4..40425d6 100644
                                            "root_out_dir") +
                                 "/v8_context_snapshot_generator",
 diff --git a/v8/BUILD.gn b/v8/BUILD.gn
-index f0976f9..99304bb 100644
+index bc087fd..f5b0f48 100644
 --- a/v8/BUILD.gn
 +++ b/v8/BUILD.gn
-@@ -2162,6 +2162,7 @@ template("run_torque") {
+@@ -2169,6 +2169,7 @@ template("run_torque") {
      }
 
      args = [
 +      "./v8-qemu-wrapper.sh",
        "./" + rebase_path(
                get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
                root_build_dir),
-@@ -2319,6 +2320,7 @@ action("generate_bytecode_builtins_list") {
+@@ -2326,6 +2327,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)",
-@@ -2358,6 +2360,7 @@ template("run_mksnapshot") {
+@@ -2365,6 +2367,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),
-@@ -7097,6 +7100,7 @@ if (v8_enable_i18n_support) {
+@@ -7134,6 +7137,7 @@ if (v8_enable_i18n_support) {
      outputs = [ output_file ]
 
      args = [

diff --git a/...es-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch b/...es-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 38b8167..93c9bfc 100644
+index f7ba313..ce7b6dd 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1819,6 +1819,11 @@ config("default_warnings") {
+@@ -1818,6 +1818,11 @@ config("default_warnings") {
        cflags += [
          "-Wenum-compare-conditional",
 

diff --git a/...ium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch b/...ium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch
@@ -18,10 +18,10 @@ 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 3d538b3..a7f353b 100644
+index c00c41b..7d32eb4 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1098,7 +1098,9 @@ component("base") {
+@@ -1118,7 +1118,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.

diff --git a/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch b/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch
@@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 18 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 93c9bfc..94e40fa 100644
+index ce7b6dd..028ba52 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -616,24 +616,6 @@ config("compiler") {
+@@ -618,24 +618,6 @@ config("compiler") {
        }
      }
 

diff --git a/...es-browser/chromium/files/0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch b/...es-browser/chromium/files/0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch
@@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/components/autofill/core/browser/data_model/autofill_i18n_api.h b/components/autofill/core/browser/data_model/autofill_i18n_api.h
-index fa577620509c8..f2bd0d075b846 100644
+index fa57762..f2bd0d0 100644
 --- a/components/autofill/core/browser/data_model/autofill_i18n_api.h
 +++ b/components/autofill/core/browser/data_model/autofill_i18n_api.h
 @@ -16,8 +16,8 @@ namespace autofill::i18n_model_definition {

diff --git a/.../recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch b/.../recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch
@@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
-index d4de2e0..0dd4d3b 100644
+index d3054d1..bdc13fb 100644
 --- a/build/config/clang/BUILD.gn
 +++ b/build/config/clang/BUILD.gn
-@@ -128,14 +128,15 @@ template("clang_lib") {
+@@ -121,14 +121,15 @@ template("clang_lib") {
        } else if (is_apple) {
          _dir = "darwin"
        } else if (is_linux || is_chromeos) {

diff --git a/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch b/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch
@@ -23,10 +23,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  4 files changed, 54 insertions(+), 17 deletions(-)
 
 diff --git a/build/config/rust.gni b/build/config/rust.gni
-index 814c455..c6b675d 100644
+index e98d913..6213b72 100644
 --- a/build/config/rust.gni
 +++ b/build/config/rust.gni
-@@ -76,6 +76,11 @@ declare_args() {
+@@ -87,6 +87,11 @@ declare_args() {
    # a platform. Mostly applicable to Windows, where new versions can handle ANSI
    # escape sequences but it's not reliable in general.
    force_rustc_color_output = false
@@ -38,7 +38,7 @@ index 814c455..c6b675d 100644
  }
 
  # Use a separate declare_args so these variables' defaults can depend on the
-@@ -185,12 +190,19 @@ if (enable_rust) {
+@@ -196,12 +201,19 @@ if (enable_rust) {
  # other toolchains.
  rust_abi_target = ""
  if (is_linux || is_chromeos) {
@@ -61,7 +61,7 @@ index 814c455..c6b675d 100644
    } else if (current_cpu == "arm") {
      if (arm_float_abi == "hard") {
        float_suffix = "hf"
-@@ -199,13 +211,13 @@ if (is_linux || is_chromeos) {
+@@ -210,13 +222,13 @@ if (is_linux || is_chromeos) {
      }
      if (arm_arch == "armv7-a" || arm_arch == "armv7") {
        # No way to inform Rust about the -a suffix.

diff --git a/meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch b/meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch
@@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
-index 77f4b8c..3078de8 100644
+index 8a25798..2d284e6 100644
 --- a/build/rust/std/BUILD.gn
 +++ b/build/rust/std/BUILD.gn
 @@ -100,7 +100,6 @@ if (toolchain_has_rust) {

diff --git a/...-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch b/...-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch
@@ -19,10 +19,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 94e40fa..72088cf 100644
+index 028ba52..f18ea0a 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1149,16 +1149,6 @@ config("compiler_cpu_abi") {
+@@ -1155,16 +1155,6 @@ config("compiler_cpu_abi") {
            "-msse3",
          ]
        }

diff --git a/...03-Fix-AES-crypto-SIGILL-on-rpi4-64.patch → ...02-Fix-AES-crypto-SIGILL-on-rpi4-64.patch b/...03-Fix-AES-crypto-SIGILL-on-rpi4-64.patch → ...02-Fix-AES-crypto-SIGILL-on-rpi4-64.patch
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index bd39797..2bc84d6 100644
+index e342a39..1410489 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
-@@ -120,7 +120,7 @@ if (enable_rust_boringssl) {
+@@ -113,7 +113,7 @@ if (enable_rust_boringssl) {
    }
  }
 

diff --git a/...-browser/chromium/files/arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch b/...-browser/chromium/files/arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch
diff --git a/...recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch b/...recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch
diff --git a/...recipes-browser/chromium/files/backport/IWYU-for-content-browser-generic_sensor-fra.patch b/...recipes-browser/chromium/files/backport/IWYU-for-content-browser-generic_sensor-fra.patch
diff --git a/...recipes-browser/chromium/files/backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch b/...recipes-browser/chromium/files/backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch