summaryrefslogtreecommitdiff
path: root/www-client/chromium
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/Manifest3
-rw-r--r--www-client/chromium/files/chromium-126-oauth2-client-switches.patch45
-rw-r--r--www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch102
-rw-r--r--www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch35
4 files changed, 0 insertions, 185 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 356e953fbc10..c3e6f53a2d48 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,8 +1,5 @@
AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a3417b3d87ef252d7a475f6be23b16f587ec627c90bac41d743bd9dc07488edccb0946ed465f2244b61adc44cd19761d SHA512 b4e386613eb2a0dd61af40bb29621356085e183b97d830661e5157e4f22c2ada5606d80e56d5a65fb2985cdffb505a878c32bdafb081b1fa24cbe976c7b60b86
AUX chromium-111-InkDropHost-crash.patch 1066 BLAKE2B ee0b42803a59ef4731e4f316849c2062870b92040ff4e339c3f3f2562999b54fa3176b27e432f31ada76559087631fd623d9f57f1961a42acd0684041c322a01 SHA512 dfa3ab6a84b57b6e66053be2597f0d6c7f4caf54b0e45a359774a56dfbe1e65bdea91120134e77b1e7c38c336a4fd8d05a7c26e9d3bf4bdc0fe40ad7cd832a54
-AUX chromium-126-oauth2-client-switches.patch 2214 BLAKE2B 0dfc0dcd585bcd12793033292b1e10f448b84a65ee9354803237aca225a5de8b40a56f78cc806353d5240d41bed2efe82bc1b39ebea8ae4db2f79855f6ce1eaf SHA512 77e4e5609b9191160c73681020defd2d3e6fc3874837611e1febef538d3997fccea267ed87f6bbff6bd140f98d8e909d935ce3e3e0d53bf597882bb2282ab72c
-AUX chromium-127-bindgen-custom-toolchain.patch 3774 BLAKE2B 9d5de33e0f49f46c5fe25a00057b0cb0c172ac916e9f9234b1342440658a010678f05498bf559566de2f2b49db7e427bd0154196771c472f590cd4960634dd15 SHA512 4a543891e5328f692aa90c1c140a30300e38f753e96aef644816f57d8192cdf3d98aeb366c2a4e6057e31d3076e6f8c5b62216c723af35148156dda6cf943c59
-AUX chromium-131-const-atomicstring-conversion.patch 1565 BLAKE2B d21c425f6f8a27c00168de63f1271774e7ab1895294126a7b3adf79ac18121ea07c4e358c19bbdcb6e6a2bb29762539df4e5b74130c987914a96f57017697fab SHA512 67ff55f7005bd0975c2c10e649aea251eb2c5ed501bf1b6197f5fc50d5002f3eb8bb2c89e22f5f1d65fa5d46459557284ce485d6834fc779ceb897f0b89e06ca
AUX chromium-131-oauth2-client-switches.patch 1991 BLAKE2B 846bfe0368e432d1ed15598d939e7ef925611ac56e9dee49d342617d8df061d9d4154fdbefcb9669129770b9c1349a1f3ce25cf6fa86da22fdec206807a47d33 SHA512 654bf8a29709e0cb3adb877d210a9a093ff589b31caef95426d41f79b4f8028be7eaa0b58dc50c174deae3f37a47d2f68f08bcaa0d74da35468566f2dd2dafdd
AUX chromium-131-unbundle-icu-target.patch 504 BLAKE2B 9f29fa863e218bc9e6761795cd86f9e4621ee8d3105ea20e5c7acf2895c89d566e526daebadf6cd9c33ca7e4e228eac2cf8f2e61b0880bdcd1b54237ed1bf9a8 SHA512 6fb097dbc59326b078ed0e19a7d0301c5dd68f6a4a77533732c24396361019c2aa4480776604cacf6670a8ac943557c58fdaab99c9104078935409b430b29de9
AUX chromium-132-bindgen-custom-toolchain.patch 4011 BLAKE2B 928f6bbf9ceedb063744d985b0da69e28dba37a9da33758700cf64d69a4dddfd1bf27753f9b5972ce36a09f3586b7e67448cb5de1871f8b15cccffa90dd483f3 SHA512 cb2e6e11d0d49810064586916166af2cfe7d60eae1363835081937a03708d74c80bdeffa82cd51a848ba31eaf0667abdbeaf3001bc3dbdae29a30e1857d6ee8e
diff --git a/www-client/chromium/files/chromium-126-oauth2-client-switches.patch b/www-client/chromium/files/chromium-126-oauth2-client-switches.patch
deleted file mode 100644
index b7ddf794aa27..000000000000
--- a/www-client/chromium/files/chromium-126-oauth2-client-switches.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b6cda4bc2283a02a5b5209c0f4282a8365f6f33e Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Tue, 21 May 2024 10:04:24 +1000
-Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
- 126 update
-
-126 changed the function proto; patch rebased.
-
-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.
-
-For more info, see:
-
-https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
-https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
-https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
-
-Bug: https://bugs.gentoo.org/791871
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
---- a/google_apis/google_api_keys-inc.cc
-+++ b/google_apis/google_api_keys-inc.cc
-@@ -193,11 +193,11 @@ class APIKeyCache {
- std::string default_client_id = CalculateKeyValue(
- GOOGLE_DEFAULT_CLIENT_ID,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
-- nullptr, std::string(), environment.get(), command_line, gaia_config);
-+ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
- std::string default_client_secret = CalculateKeyValue(
- 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);
-
- // We currently only allow overriding the baked-in values for the
- // default OAuth2 client ID and secret using a command-line
---
-2.45.1
-
diff --git a/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch b/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch
deleted file mode 100644
index aaf4b19a556f..000000000000
--- a/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6df5a080f58ddb6a49a9d33e4a3619a34fffa78c Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Fri, 5 Jul 2024 20:49:01 +1000
-Subject: [PATCH] Make bindgen wrapper work with unbundled toolchain
-
-The `run_bindgen.py` wrapper takes a --libclang-path option
-and uses it to set the appropriate environment variable.
-
-This is currently hardcoded to use libclang shipped alongside
-bindgen (in our rust toolchain), but distributions may want to
-override this and use a system path.
-
-Additionally enable distros to feed in appropriate library paths.
---- a/build/config/rust.gni
-+++ b/build/config/rust.gni
-@@ -60,6 +60,17 @@ declare_args() {
- # the bindgen exectuable).
- rust_bindgen_root = "//third_party/rust-toolchain"
-
-+ # Directory under which to find one of `libclang.{dll,so}` (a `lib[64]` or
-+ # `bin` directory containing the libclang shared library).
-+ # We don't need to worry about multlib, but specify the full path here
-+ # in case a distribution does.
-+ if (host_os == "win") {
-+ bindgen_libclang_path = "//third_party/rust-toolchain/bin"
-+ } else {
-+ bindgen_libclang_path = "//third_party/rust-toolchain/lib"
-+ }
-+
-+
- # If you're using a Rust toolchain as specified by rust_sysroot_absolute,
- # set this to the output of `rustc -V`. Changing this string will cause all
- # Rust targets to be rebuilt, which allows you to update your toolchain and
---- a/build/rust/rust_bindgen.gni
-+++ b/build/rust/rust_bindgen.gni
-@@ -16,13 +16,13 @@ if (host_os == "win") {
- _bindgen_path = "${_bindgen_path}.exe"
- }
-
--# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
--# ../lib.
--_libclang_path = rust_bindgen_root
--if (host_os == "win") {
-- _libclang_path += "/bin"
-+if (clang_base_path != default_clang_base_path && custom_toolchain == "//build/toolchain/linux/unbundle:default") {
-+ # Assume that the user has set this up properly, including handling multilib
-+ _clang_libpath = clang_base_path + "/include"
-+ _clang_ld_libpath = bindgen_libclang_path
- } else {
-- _libclang_path += "/lib"
-+ _clang_libpath = clang_base_path + "/lib/clang/" + clang_version
-+ _clang_ld_libpath = clang_base_path + "/lib"
- }
-
- # Template to build Rust/C bindings with bindgen.
-@@ -100,7 +100,7 @@ template("rust_bindgen") {
- "--output",
- rebase_path(out_gen_rs, root_build_dir),
- "--libclang-path",
-- rebase_path(_libclang_path, root_build_dir),
-+ rebase_path(bindgen_libclang_path, root_build_dir),
- ]
-
- if (wrap_static_fns) {
-@@ -117,7 +117,7 @@ template("rust_bindgen") {
- # point to.
- args += [
- "--ld-library-path",
-- rebase_path(clang_base_path + "/lib", root_build_dir),
-+ rebase_path(_clang_ld_libpath, root_build_dir),
- ]
- }
-
-@@ -145,8 +145,7 @@ template("rust_bindgen") {
- # make it behave consistently with our other command line flags and allows
- # system headers to be found.
- clang_resource_dir =
-- rebase_path(clang_base_path + "/lib/clang/" + clang_version,
-- root_build_dir)
-+ rebase_path(_clang_libpath, root_build_dir)
- args += [
- "-resource-dir",
- clang_resource_dir,
-@@ -167,6 +166,15 @@ template("rust_bindgen") {
- }
- }
-
-+ if (custom_toolchain == "//build/toolchain/linux/unbundle:default") {
-+ # We need to pass the path to the libstdc++ headers to bindgen so that it
-+ # can find them when parsing C++ headers.
-+ args += [
-+ "-I",
-+ rebase_path(clang_base_path + "/include/", root_build_dir),
-+ ]
-+ }
-+
- if (is_win) {
- # On Windows we fall back to using system headers from a sysroot from
- # depot_tools. This is negotiated by python scripts and the result is
---
-2.45.2
-
diff --git a/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch b/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch
deleted file mode 100644
index 52f746669b55..000000000000
--- a/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-