diff options
Diffstat (limited to 'www-client/chromium/files')
3 files changed, 95 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch b/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch new file mode 100644 index 000000000000..52f746669b55 --- /dev/null +++ b/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch @@ -0,0 +1,35 @@ +From 403ee5b14df12c8ee3b3583177bbd30d930e9aaf Mon Sep 17 00:00:00 2001 +From: Matt Jolly <kangie@gentoo.org> +Date: Sat, 12 Oct 2024 13:45:37 +1000 +Subject: [PATCH] Convert 'Const AtomicString' to 'const char *'. + +I don't know why this is suddenly required? +--- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc ++++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +@@ -323,7 +323,10 @@ void TextCodecICU::CreateICUConverter() const { + DCHECK(!converter_icu_); + + #if defined(USING_SYSTEM_ICU) +- const char* name = encoding_.GetName(); ++ //convert to WTF::String to use existing `const char *` dependent functions ++ WTF::String nameString = encoding_.GetName(); ++ std::string nameUtf8 = nameString.Utf8(); ++ const char* name = nameUtf8.c_str(); + needs_gbk_fallbacks_ = + name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3]; + #endif +@@ -448,7 +451,10 @@ String TextCodecICU::Decode(base::span<const uint8_t> data, + // <http://bugs.webkit.org/show_bug.cgi?id=17014> + // Simplified Chinese pages use the code A3A0 to mean "full-width space", but + // ICU decodes it as U+E5E5. +- if (!strcmp(encoding_.GetName(), "GBK")) { ++ // Convert AtomicString to String ++ WTF::String nameString = encoding_.GetName(); ++ std::string nameUtf8 = nameString.Utf8(); ++ if (!strcmp(nameUtf8.c_str(), "GBK")) { + if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030")) + resultString.Replace(0xE5E5, kIdeographicSpaceCharacter); + // Make GBK compliant to the encoding spec and align with GB18030 +-- +2.46.2 + diff --git a/www-client/chromium/files/chromium-131-oauth2-client-switches.patch b/www-client/chromium/files/chromium-131-oauth2-client-switches.patch new file mode 100644 index 000000000000..350775c93e18 --- /dev/null +++ b/www-client/chromium/files/chromium-131-oauth2-client-switches.patch @@ -0,0 +1,39 @@ +From 54951636d20fa798e148228118863b89a4580479 Mon Sep 17 00:00:00 2001 +From: Matt Jolly <kangie@gentoo.org> +Date: Sat, 12 Oct 2024 12:40:16 +1000 +Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials - + 131 update + +131 moved a ton of things around; this is now in api_key_cache.cc + +Google doesn't let us bake in OAuth2 credentials, and for some time, +Google sign-in has been broken. Arch dealt with this in March, and so +did we to some degree, but in the last few months, our sign-in +credentials have been broken. It appears that we actually did remove API +credentials in March around Chrome 89, but they got added back, perhaps +when rotating newer versions to replace older versions. Work around this +by following Arch's lead: we remove the predefined credentials, as +before, but also we patch Chromium so that people can use their own +easily, using Arch's patch for that. +--- a/google_apis/api_key_cache.cc ++++ b/google_apis/api_key_cache.cc +@@ -214,14 +214,14 @@ 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, + 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, + default_api_keys.allow_override_via_environment, + default_api_keys.allow_unset_values); + +-- +2.46.2 + diff --git a/www-client/chromium/files/chromium-131-unbundle-icu-target.patch b/www-client/chromium/files/chromium-131-unbundle-icu-target.patch new file mode 100644 index 000000000000..618750f13f18 --- /dev/null +++ b/www-client/chromium/files/chromium-131-unbundle-icu-target.patch @@ -0,0 +1,21 @@ +From a665875b4013eed997bd042326a038e24f3296e7 Mon Sep 17 00:00:00 2001 +From: Matt Jolly <kangie@gentoo.org> +Date: Thu, 10 Oct 2024 14:36:51 +1000 +Subject: [PATCH] unbundle: add missing icu target + +--- a/build/linux/unbundle/icu.gn ++++ b/build/linux/unbundle/icu.gn +@@ -65,6 +65,10 @@ group("icuuc_public") { + public_deps = [ ":icuuc" ] + } + ++group("icui18n_hidden_visibility") { ++ public_deps = [ ":icuuc" ] ++} ++ + shim_headers("icui18n_shim") { + root_path = "source/i18n" + headers = [ +-- +2.46.2 + |