Skip to content

Commit 2d693f7

Browse files
networkExceptionnetworkException
committed
PKGBUILD+Patches: Upgrade to extra/chromium and ungoogled-chromium release 131.0.6778.69-1
1 parent 44fe9f7 commit 2d693f7

5 files changed

+126
-24
lines changed

‎PKGBUILD‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
# Contributor: Daniel J Griffiths <[email protected]>
1010

1111
pkgname=ungoogled-chromium
12-
pkgver=130.0.6723.116
13-
pkgrel=3
12+
pkgver=131.0.6778.69
13+
pkgrel=1
1414
_launcher_ver=8
1515
_manual_clone=1
1616
_system_clang=1
1717
# ungoogled chromium variables
1818
_uc_usr=ungoogled-software
19-
_uc_ver=130.0.6723.116-1
19+
_uc_ver=131.0.6778.69-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"
@@ -46,18 +46,24 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
4646
0001-enable-linux-unstable-deb-target.patch
4747
0001-ozone-wayland-implement-text_input_manager_v3.patch
4848
0001-ozone-wayland-implement-text_input_manager-fixes.patch
49-
0001-vaapi-flag-ozone-wayland.patch)
49+
0001-vaapi-flag-ozone-wayland.patch
50+
unbundle-add-enable_freetype.patch
51+
unbundle-icu-target.patch
52+
const-atomicstring-conversion.patch)
5053
sha256sums=('720a1196410080056cd97a1f5ec34d68ba216a281d9b5157b7ea81ea018ec661'
51-
'bba566d563e3fb75f313b1f49a81f62f75908f05d9d32e99742a8844e8790965'
54+
'68f51cd5666e16f578506c072ae595740237426a2447221e8bb1ef758404b578'
5255
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
5356
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
5457
'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342'
55-
'a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6'
58+
'6de648d449159dd579e42db304aca0a36243f2ac1538f8d030473afbbc8ff475'
5659
'8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f'
5760
'2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3'
5861
'd9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285'
5962
'a2da75d0c20529f2d635050e0662941c0820264ea9371eb900b9d90b5968fa6a'
60-
'9a5594293616e1390462af1f50276ee29fd6075ffab0e3f944f6346cb2eb8aec')
63+
'9a5594293616e1390462af1f50276ee29fd6075ffab0e3f944f6346cb2eb8aec'
64+
'f6e05adc80bd2f22b766d41a91739276c62201e47272c561f18a099c4a809e37'
65+
'67de7744b92cbfa6fcbf43a71ba531eb5a7b00381d96703d8dc3dfdadaebf67d'
66+
'ac0c9e366ca6afe0839f9ecb6bc42614747349da0c3dc46408e5053dcb7ada76')
6167

6268
if (( _manual_clone )); then
6369
source[0]=fetch-chromium-release
@@ -119,6 +125,11 @@ prepare() {
119125
patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
120126

121127
# Upstream fixes
128+
patch -Np1 -i ../unbundle-add-enable_freetype.patch
129+
130+
# Fixes from Gentoo
131+
patch -Np1 -i ../unbundle-icu-target.patch
132+
patch -Np1 -i ../const-atomicstring-conversion.patch
122133

123134
# Allow libclang_rt.builtins from compiler-rt >= 16 to be used
124135
patch -Np1 -i ../compiler-rt-adjust-paths.patch

‎const-atomicstring-conversion.patch‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 403ee5b14df12c8ee3b3583177bbd30d930e9aaf Mon Sep 17 00:00:00 2001
2+
From: Matt Jolly <[email protected]>
3+
Date: Sat, 12 Oct 2024 13:45:37 +1000
4+
Subject: [PATCH] Convert 'Const AtomicString' to 'const char *'.
5+
6+
I don't know why this is suddenly required?
7+
--- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
8+
+++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
9+
@@ -323,7 +323,10 @@ void TextCodecICU::CreateICUConverter() const {
10+
DCHECK(!converter_icu_);
11+
12+
#if defined(USING_SYSTEM_ICU)
13+
- const char* name = encoding_.GetName();
14+
+ //convert to WTF::String to use existing `const char *` dependent functions
15+
+ WTF::String nameString = encoding_.GetName();
16+
+ std::string nameUtf8 = nameString.Utf8();
17+
+ const char* name = nameUtf8.c_str();
18+
needs_gbk_fallbacks_ =
19+
name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
20+
#endif
21+
@@ -448,7 +451,10 @@ String TextCodecICU::Decode(base::span<const uint8_t> data,
22+
// <http://bugs.webkit.org/show_bug.cgi?id=17014>
23+
// Simplified Chinese pages use the code A3A0 to mean "full-width space", but
24+
// ICU decodes it as U+E5E5.
25+
- if (!strcmp(encoding_.GetName(), "GBK")) {
26+
+ // Convert AtomicString to String
27+
+ WTF::String nameString = encoding_.GetName();
28+
+ std::string nameUtf8 = nameString.Utf8();
29+
+ if (!strcmp(nameUtf8.c_str(), "GBK")) {
30+
if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
31+
resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
32+
// Make GBK compliant to the encoding spec and align with GB18030
33+
--
34+
2.46.2
35+

‎unbundle-add-enable_freetype.patch‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 88676c640928fd2dce56a46c1c3adb62ac349697 Mon Sep 17 00:00:00 2001
2+
From: "lauren n. liberda" <[email protected]>
3+
Date: Thu, 24 Oct 2024 17:54:35 +0000
4+
Subject: [PATCH] [unbundle] add enable_freetype
5+
6+
fixes freetype unbundle after https://crrev.com/c/5832411
7+
8+
Bug: none
9+
Change-Id: If5573d2c0e833ef3c18b505c004b3fa997f903a0
10+
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5952222
11+
Reviewed-by: Lei Zhang <[email protected]>
12+
Commit-Queue: Lei Zhang <[email protected]>
13+
Reviewed-by: Thomas Anderson <[email protected]>
14+
Cr-Commit-Position: refs/heads/main@{#1373430}
15+
---
16+
build/linux/unbundle/freetype.gn | 5 +++++
17+
1 file changed, 5 insertions(+)
18+
19+
diff --git a/build/linux/unbundle/freetype.gn b/build/linux/unbundle/freetype.gn
20+
index 73f9666833e5..c780c630d55b 100644
21+
--- a/build/linux/unbundle/freetype.gn
22+
+++ b/build/linux/unbundle/freetype.gn
23+
@@ -11,4 +11,9 @@ declare_args() {
24+
# System FreeType configurations other than as described WILL INTRODUCE TEXT
25+
# RENDERING AND SECURITY REGRESSIONS.
26+
use_system_freetype = true
27+
+
28+
+ # Use FreeType for font rendering. If this is set to false, FreeType is
29+
+ # replaced with the Rust-based Fontations set of libraries plus Skia
30+
+ # path rendering.
31+
+ enable_freetype = true
32+
}

‎unbundle-icu-target.patch‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From a665875b4013eed997bd042326a038e24f3296e7 Mon Sep 17 00:00:00 2001
2+
From: Matt Jolly <[email protected]>
3+
Date: Thu, 10 Oct 2024 14:36:51 +1000
4+
Subject: [PATCH] unbundle: add missing icu target
5+
6+
--- a/build/linux/unbundle/icu.gn
7+
+++ b/build/linux/unbundle/icu.gn
8+
@@ -65,6 +65,10 @@ group("icuuc_public") {
9+
public_deps = [ ":icuuc" ]
10+
}
11+
12+
+group("icui18n_hidden_visibility") {
13+
+ public_deps = [ ":icuuc" ]
14+
+}
15+
+
16+
shim_headers("icui18n_shim") {
17+
root_path = "source/i18n"
18+
headers = [
19+
--
20+
2.46.2
21+

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
diff --git a/google_apis/google_api_keys-inc.cc b/google_apis/google_api_keys-inc.cc
2-
index 4d13e697a54d..61aac7b48662 100644
3-
--- a/google_apis/google_api_keys-inc.cc
4-
+++ b/google_apis/google_api_keys-inc.cc
5-
@@ -193,11 +193,11 @@ class APIKeyCache {
6-
std::string default_client_id = CalculateKeyValue(
7-
GOOGLE_DEFAULT_CLIENT_ID,
8-
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
9-
- nullptr, std::string(), environment.get(), command_line, gaia_config);
10-
+ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
11-
std::string default_client_secret = CalculateKeyValue(
12-
GOOGLE_DEFAULT_CLIENT_SECRET,
13-
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
14-
- nullptr, std::string(), environment.get(), command_line, gaia_config);
15-
+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config);
1+
diff --git a/google_apis/api_key_cache.cc b/google_apis/api_key_cache.cc
2+
index e8bc9bb79704..38e5d2bd005f 100644
3+
--- a/google_apis/api_key_cache.cc
4+
+++ b/google_apis/api_key_cache.cc
5+
@@ -221,14 +221,14 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) {
6+
7+
std::string default_client_id = CalculateKeyValue(
8+
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,
12+
default_api_keys.allow_override_via_environment,
13+
default_api_keys.allow_unset_values);
14+
std::string default_client_secret = CalculateKeyValue(
15+
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,
19+
default_api_keys.allow_override_via_environment,
20+
default_api_keys.allow_unset_values);
1621

17-
// We currently only allow overriding the baked-in values for the
18-
// default OAuth2 client ID and secret using a command-line

0 commit comments

Comments
 (0)