PKGBUILD+Patches: Update to extra/chromium and ungoogled-chromium rel…

…ease 134.0.6998.35-1

PKGBUILD

@@ -9,14 +9,14 @@
 # Contributor: Daniel J Griffiths <[email protected]>
 
 pkgname=ungoogled-chromium
-pkgver=133.0.6943.141
+pkgver=134.0.6998.35
 pkgrel=1
 _launcher_ver=8
 _manual_clone=0
 _system_clang=1
 # ungoogled chromium variables
 _uc_usr=ungoogled-software
-_uc_ver=133.0.6943.141-1
+_uc_ver=134.0.6998.35-1
 pkgdesc="A lightweight approach to removing Google web service dependency"
 arch=('x86_64')
 url="https://github.com/ungoogled-software/ungoogled-chromium"
@@ -47,12 +47,12 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         0001-ozone-wayland-implement-text_input_manager_v3.patch
         0001-ozone-wayland-implement-text_input_manager-fixes.patch
         0001-vaapi-flag-ozone-wayland.patch)
-sha256sums=('0b3b15aa03f128a6b3d7ff67a7492bfaa2ffbb4acd80664b9ff320fd470c68be'
-            '6aacc579b5e98eac601f83ee56c918d5f4363980ea1550ce5c9a2ed4a39452a1'
+sha256sums=('d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7'
+            '272b8cf76e4124ea081655b1d11a56e5c8875d05dd2c83af2612db10e3ab6ce9'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
             'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342'
-            '6de648d449159dd579e42db304aca0a36243f2ac1538f8d030473afbbc8ff475'
+            'e6da901e4d0860058dc2f90c6bbcdc38a0cf4b0a69122000f62204f24fa7e374'
             '8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f'
             '2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3'
             'd9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285'
@@ -134,6 +134,10 @@ prepare() {
 
     # To link to rust libraries we need to compile with prebuilt clang
     ./tools/clang/scripts/update.py
+  elif ! find /usr/lib/rustlib | grep -q adler2; then
+    # Rust 1.86 ships adler2 but we need to change it to adler when
+    # using older Rust versions (idea for this borrowed from Gentoo)
+    sed -i 's/adler2/adler/' build/rust/std/BUILD.gn
   fi
 
   # Ungoogled Chromium changes
@@ -202,6 +206,7 @@ build() {
     'use_sysroot=false'
     'use_system_libffi=true'
     'enable_widevine=true'
+    'use_qt5=true'
     'use_qt6=true'
     'moc_qt6_path="/usr/lib/qt6"'
     'use_vaapi=true'

use-oauth2-client-switches-as-default.patch

@@ -1,21 +1,20 @@
 diff --git a/google_apis/api_key_cache.cc b/google_apis/api_key_cache.cc
-index e8bc9bb79704..38e5d2bd005f 100644
+index 9af5930ae639..a37a12dc07ad 100644
 --- a/google_apis/api_key_cache.cc
 +++ b/google_apis/api_key_cache.cc
-@@ -221,14 +221,14 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) {
+@@ -192,13 +192,13 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) {
 
    std::string default_client_id = CalculateKeyValue(
        default_api_keys.google_default_client_id,
--      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), nullptr,
-+      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), ::switches::kOAuth2ClientID,
-       std::string(), environment.get(), command_line, gaia_config,
+-      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, std::string(),
++      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, std::string(),
+       environment.get(), command_line, gaia_config,
        default_api_keys.allow_override_via_environment,
        default_api_keys.allow_unset_values);
    std::string default_client_secret = CalculateKeyValue(
        default_api_keys.google_default_client_secret,
-       STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
--      nullptr, std::string(), environment.get(), command_line, gaia_config,
-+      ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config,
+-      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
++      STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
+       std::string(), environment.get(), command_line, gaia_config,
        default_api_keys.allow_override_via_environment,
        default_api_keys.allow_unset_values);
-