Skip to content

Commit decbfdf

Browse files
PKGBUILD+Patches: Update to extra/chromium and ungoogled-chromium release 134.0.6998.35-1
1 parent 7d301d6 commit decbfdf

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

PKGBUILD

+10-5
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
1010

1111
pkgname=ungoogled-chromium
12-
pkgver=133.0.6943.141
12+
pkgver=134.0.6998.35
1313
pkgrel=1
1414
_launcher_ver=8
1515
_manual_clone=0
1616
_system_clang=1
1717
# ungoogled chromium variables
1818
_uc_usr=ungoogled-software
19-
_uc_ver=133.0.6943.141-1
19+
_uc_ver=134.0.6998.35-1
2020
pkgdesc="A lightweight approach to removing Google web service dependency"
2121
arch=('x86_64')
2222
url="https://github.com/ungoogled-software/ungoogled-chromium"
@@ -47,12 +47,12 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
4747
0001-ozone-wayland-implement-text_input_manager_v3.patch
4848
0001-ozone-wayland-implement-text_input_manager-fixes.patch
4949
0001-vaapi-flag-ozone-wayland.patch)
50-
sha256sums=('0b3b15aa03f128a6b3d7ff67a7492bfaa2ffbb4acd80664b9ff320fd470c68be'
51-
'6aacc579b5e98eac601f83ee56c918d5f4363980ea1550ce5c9a2ed4a39452a1'
50+
sha256sums=('d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7'
51+
'272b8cf76e4124ea081655b1d11a56e5c8875d05dd2c83af2612db10e3ab6ce9'
5252
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
5353
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
5454
'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342'
55-
'6de648d449159dd579e42db304aca0a36243f2ac1538f8d030473afbbc8ff475'
55+
'e6da901e4d0860058dc2f90c6bbcdc38a0cf4b0a69122000f62204f24fa7e374'
5656
'8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f'
5757
'2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3'
5858
'd9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285'
@@ -134,6 +134,10 @@ prepare() {
134134

135135
# To link to rust libraries we need to compile with prebuilt clang
136136
./tools/clang/scripts/update.py
137+
elif ! find /usr/lib/rustlib | grep -q adler2; then
138+
# Rust 1.86 ships adler2 but we need to change it to adler when
139+
# using older Rust versions (idea for this borrowed from Gentoo)
140+
sed -i 's/adler2/adler/' build/rust/std/BUILD.gn
137141
fi
138142

139143
# Ungoogled Chromium changes
@@ -202,6 +206,7 @@ build() {
202206
'use_sysroot=false'
203207
'use_system_libffi=true'
204208
'enable_widevine=true'
209+
'use_qt5=true'
205210
'use_qt6=true'
206211
'moc_qt6_path="/usr/lib/qt6"'
207212
'use_vaapi=true'
+8-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
diff --git a/google_apis/api_key_cache.cc b/google_apis/api_key_cache.cc
2-
index e8bc9bb79704..38e5d2bd005f 100644
2+
index 9af5930ae639..a37a12dc07ad 100644
33
--- a/google_apis/api_key_cache.cc
44
+++ b/google_apis/api_key_cache.cc
5-
@@ -221,14 +221,14 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) {
5+
@@ -192,13 +192,13 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) {
66

77
std::string default_client_id = CalculateKeyValue(
88
default_api_keys.google_default_client_id,
9-
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), nullptr,
10-
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), ::switches::kOAuth2ClientID,
11-
std::string(), environment.get(), command_line, gaia_config,
9+
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, std::string(),
10+
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, std::string(),
11+
environment.get(), command_line, gaia_config,
1212
default_api_keys.allow_override_via_environment,
1313
default_api_keys.allow_unset_values);
1414
std::string default_client_secret = CalculateKeyValue(
1515
default_api_keys.google_default_client_secret,
16-
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
17-
- nullptr, std::string(), environment.get(), command_line, gaia_config,
18-
+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config,
16+
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
17+
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
18+
std::string(), environment.get(), command_line, gaia_config,
1919
default_api_keys.allow_override_via_environment,
2020
default_api_keys.allow_unset_values);
21-

0 commit comments

Comments
 (0)