chromium: update to 94.0.4606.61

- Removed 0012-Fix-font-rendering-with-glibc-2.33.patch as the fix
landed to Chromium tree as https://crrev.com/c/3042179

- Renamed crashpad_handler into chrome_crashpad_handler.

- Renamed patches so that they have a numeric order.

License changes
  ---------------
  Added licenses:
  * third_party/maldoca/src/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/2958804

  Updated licenses:
  * third_party/libjxl/LICENSE
  - https://chromium-review.googlesource.com/c/chromium/src/+/3069018

Test-built with:
* chromium-x11
  * dunfell, clang (dunfell branch), MACHINE="intel-core2-32"
  * dunfell, clang (dunfell branch), MACHINE="intel-corei7-64"
  * dunfell, clang (dunfell branch), MACHINE="raspberrypi3"
  * hardknott, clang (hardknott branch), MACHINE="raspberrypi3"

* chromium-ozone-wayland:
  * dunfell, clang  (dunfell branch), MACHINE="intel-corei7-64"
  * dunfell, clang (dunfell branch), MACHINE="qemuarm64"
  * dunfell, clang (dunfell branch), MACHINE="m3ulcb"
  * hardknott, clang (hardknott branch), MACHINE="raspberrypi3

Author: msisov

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

@@ -9,21 +9,20 @@ OUTPUT_DIR = "out/Release"
 B = "${S}/${OUTPUT_DIR}"
 
 SRC_URI += " \
-    file://limit-number-of-LTO-jobs.patch \
-    file://0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch \
-    file://0002-v8-qemu-wrapper.patch \
-    file://0003-wrapper-extra-flags.patch \
-    file://0004-BUILD-do-not-specify-march-on-arm.patch \
-    file://0005-Consider-armv7ve-define.patch \
-    file://0006-Delete-compiler-options-not-available-in-release-ver.patch \
-    file://0010-avoid-link-latomic-failure-on-CentOS-8-host.patch \
-    file://0012-Fix-font-rendering-with-glibc-2.33.patch \
-    file://0001-nomerge-attribute-on-declaration-is-only-available-s.patch \
-    file://fix-ruy-numeric-limits-error.patch \
-    file://0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
-    file://chromium-freetype-2.11.patch \
-    file://0001-Make-Display-and-X11-available-in-the-same-build.patch \
-    file://0001-include-utility.h.patch \
+    file://0001-limit-number-of-LTO-jobs.patch \
+    file://0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch \
+    file://0003-v8-qemu-wrapper.patch \
+    file://0004-wrapper-extra-flags.patch \
+    file://0005-BUILD-do-not-specify-march-on-arm.patch \
+    file://0006-Consider-armv7ve-define.patch \
+    file://0007-Delete-compiler-options-not-available-in-release-ver.patch \
+    file://0008-avoid-link-latomic-failure-on-CentOS-8-host.patch \
+    file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
+    file://0010-fix-ruy-numeric-limits-error.patch \
+    file://0011-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
+    file://0012-chromium-freetype-2.11.patch \
+    file://0013-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
+    file://0014-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
 "
 
 SRC_URI:append:libc-musl = "\
@@ -477,8 +476,8 @@ do_install() {
 	# ChromeDriver.
 	install -m 0755 chromedriver.unstripped ${D}${bindir}/chromedriver
 
-	# Install crashpad_handler, it is renamed in newer versions so be aware when upgrading to M94+
-	install -m 0755 crashpad_handler ${D}${libdir}/chromium/
+	# Install chrome_crashpad_handler.
+	install -m 0755 chrome_crashpad_handler ${D}${libdir}/chromium/
 }
 
 PACKAGES =+ "${PN}-chromedriver"

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_93.0.4577.82.bb renamed to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_94.0.4606.61.bb

@@ -11,7 +11,7 @@ DEPENDS += "\
 "
 
 SRC_URI += "\
-        file://0001-ozone-add-va-api-support-to-wayland.patch \
+        file://chromium-ozone-wayland/0001-ozone-add-va-api-support-to-wayland.patch \
 "
 
 GN_ARGS += "\
@@ -30,11 +30,12 @@ GN_ARGS += "\
         use_gtk=false \
 "
 
-# Since M87, Chromium builds Ozone by default, but continues to use X11.
-# However, the goal of two recipes - Ozone/Wayland and non-Ozone/X11 is
-# to provide either Wayland or X11 and avoid pulling dependencies of each
-# on environments where Wayland or X11 is not actually required.
-# See https://crrev.com/c/2382834
+# Ozone is default via finch since M94 and default via compile time
+# changes since M95. However, use_x11 still must be disable to provide
+# a pure Wayland build. Since M95, use_x11 is controlled via
+# ozone_platform_x11 and won't be needed to be altered here, but rather
+# through the mentioned ozone_platform_x11 arg.
+# TODO(msisov): remove this once recipe is updated to M95.
 GN_ARGS += "use_x11=false"
 
 # The chromium binary must always be started with those arguments.

meta-chromium/recipes-browser/chromium/chromium-x11_93.0.4577.82.bb

@@ -0,0 +1,35 @@
+require chromium-gn.inc
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+DEPENDS += "\
+        libx11 \
+        libxcomposite \
+        libxcursor \
+        libxdamage \
+        libxext \
+        libxfixes \
+        libxi \
+        libxrandr \
+        libxrender \
+        libxscrnsaver \
+        libxtst \
+"
+
+# Ozone/X11 has been set to default via finch since M93. Thus,
+# no longer disable ozone on X11 builds and let Chromium use
+# by default as non-Ozone/X11 path was deprecated. And even
+# though it is still possible to choose non-Ozone/X11 path by
+# passing --disable-features=UseOzonePlatform in M94, it is
+# impossible to disable Ozone since M95 as the non-Ozone path
+# has been completely deprecated
+# TODO(msisov): update the above comment once M95 is released.
+GN_ARGS += "\
+        ozone_auto_platforms=false \
+        ozone_platform_x11=true \
+"
+
+# Compatibility glue while we have both chromium-x11 and
+# chromium-ozone-wayland recipes, and the former used to be called just
+# "chromium".
+PROVIDES = "chromium"

meta-chromium/recipes-browser/chromium/chromium-x11_94.0.4606.61.bb

@@ -4,8 +4,8 @@ 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[md5sum] = "5d59c8619445f74d6c9b9650f16f8430"
-SRC_URI[sha256sum] = "5d66214858fcba11a8f733d7a6fab61ed10e13e7df4ed37e63b66a0370fb2853"
+SRC_URI[md5sum] = "6f2f67339ecb64c94b3f42f41938862f"
+SRC_URI[sha256sum] = "6446db535c02c461c7e5c8d294a0300db03abba791f97f0c70bc52255aedb9bf"
 
 S = "${WORKDIR}/chromium-${PV}"
 
@@ -272,7 +272,7 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/libipp/LICENSE;md5=af9e58383a1b2b17c75c6c9ff561ca9d \
     file://${S}/third_party/libjingle_xmpp/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
     file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=970f17d51650fe54e4f839c6e6121f79 \
-    file://${S}/third_party/libjxl/LICENSE;md5=b1e01b26bacfc2232046c90a330332b3 \
+    file://${S}/third_party/libjxl/LICENSE;md5=6a905a337cc228a1f68f0b5416f52a7f \
     file://${S}/third_party/liblouis/LICENSE;md5=8ab69863de0d3a0e00c4f97a4d78dd4a \
     file://${S}/third_party/libphonenumber/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
     file://${S}/third_party/libpng/LICENSE;md5=b0085051bf265bac2bfc38bc89f50000 \
@@ -295,6 +295,7 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/logilab/logilab/common/LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe \
     file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \
     file://${S}/third_party/lzma_sdk/LICENSE;md5=a8d1f5a28cfd35e6dfea09b82672fae7 \
+    file://${S}/third_party/maldoca/src/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
     file://${S}/third_party/material_design_icons/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
     file://${S}/third_party/material_web_components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/third_party/mesa_headers/LICENSE;md5=072744090020e72ad7387e201873fe43 \

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

@@ -11,15 +11,15 @@ Subject: [PATCH] limit number of LTO jobs.
 branch uses quite old llvm that doesn't support this keyword.
 Thus, use the previously used number of threads.
 ---
- build/config/compiler/BUILD.gn     | 11 +++++------
+ build/config/compiler/BUILD.gn     | 12 ++++++------
  build/config/compiler/compiler.gni |  5 +++++
- 2 files changed, 10 insertions(+), 6 deletions(-)
+ 2 files changed, 11 insertions(+), 6 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 13ed917c81281..c93f1a8b4a14d 100644
+index d7073ad38f0bf..326786bce9b09 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -656,7 +656,7 @@ config("compiler") {
+@@ -663,7 +663,7 @@ config("compiler") {
 
      if (is_win) {
        ldflags += [
@@ -28,7 +28,7 @@ index 13ed917c81281..c93f1a8b4a14d 100644
          "-mllvm:-import-instr-limit=$import_instr_limit",
          "/lldltocache:" +
              rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
-@@ -669,11 +669,10 @@ config("compiler") {
+@@ -676,11 +676,11 @@ config("compiler") {
        # usage in crbug.com/1038040. Note this will increase build time in
        # Chrome OS.
 
@@ -41,11 +41,12 @@ index 13ed917c81281..c93f1a8b4a14d 100644
 +      # linker jobs. This is still suboptimal to a potential dynamic
 +      # resource allocation scheme, but should be good enough.
 +      ldflags += [ "-Wl,--thinlto-jobs=" + max_jobs_per_link ]
- 
-       ldflags += [
-         "-Wl,--thinlto-cache-dir=" +
++
+       if (is_mac) {
+         ldflags +=
+             [ "-Wl,-cache_path_lto," +
 diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index d9997333db2d6..18df66d9f71b3 100644
+index 6f1faaf10fa67..822bfca12efd7 100644
 --- a/build/config/compiler/compiler.gni
 +++ b/build/config/compiler/compiler.gni
 @@ -76,6 +76,11 @@ declare_args() {
@@ -60,6 +61,6 @@ index d9997333db2d6..18df66d9f71b3 100644
    # Whether we're using a sample profile collected on an architecture different
    # than the one we're compiling for.
    #
--- 
+--
 2.25.1