www-client/chromium: sync with upstream
This commit is contained in:
github-actions[bot]
GitHub
parent
3e065cbfd4
commit
1119ab0e63
4 changed files with 44 additions and 50 deletions
|
|
@ -4,8 +4,8 @@ DIST chromium-133.0.6943.141-linux-testdata.tar.xz 650974680 BLAKE2B 00028e5b942
|
|||
DIST chromium-133.0.6943.141-linux.tar.xz 1454239916 BLAKE2B 28379a87137d8162d1981d3a318da5cad1bfd2dd6461a29a049f20babf3a64fe7518057f7af5f33424d0ae4a655fb4b892ba6a82f0a39440e3487570767ae50d SHA512 04ca888078ab3ce4775d0dff9c9d46b342be5bda2fe41493dcf8695fa9b52ed749455275cfc4bba234a10fbe6df0eeac3d8bb2f8d73ca1250a142c58944ff6d9
|
||||
DIST chromium-134.0.6998.35-linux-testdata.tar.xz 653357556 BLAKE2B 0e34c31210e1bfc6aa2cc6d79d9cf1e9fcdb9d1693be867438cfc639a8461203d96cdf159624d81020611eb9dc3a51958af4d7ab8d30c46f2b98a9eb2a1a303b SHA512 ab36342b045ff796f4b200d25e2a259b2a65e93d6bc32dc30f001e0c5709047bc937023abcfbe748f9a567d0df18bc188c7bbfd24d142d9f6e63c26b350647f6
|
||||
DIST chromium-134.0.6998.35-linux.tar.xz 1463053644 BLAKE2B 28af05a5b650495174b2240a42b5f0073a30da7094170b80a8ea1d000b306d408e0b58772e8928b6dd110f815430a6725fddf7e1e7ee8073c6b343bee189e556 SHA512 f9da9256ef4518e53c139c6c074b6b4fe10f028e37ebee488a95ed84d6ed47acf802a9316eb215d9f2b3ebb8f1bc70ef837334256272e9f13fc3674ec36f1336
|
||||
DIST chromium-135.0.7023.0-linux-testdata.tar.xz 652006392 BLAKE2B 2d86eccec49675124e6a1ac9256ba91f389651e83a199e3c47820ae1ce845e808a09e5e9e43a2b38645f0e50d6df1fdd5ab2871e7199451f18ccf04585132613 SHA512 e153bb2cd783866de8c9630626df574da3a624d00a6d58a89eb90ac043a86de5d8a856b21fcfc179c98324fedac65cb7ec727954af3959e014111080d164cf83
|
||||
DIST chromium-135.0.7023.0-linux.tar.xz 1481618840 BLAKE2B a85cf8df8249b541a35ddb06e0715edc194db9b60e6d070cdbf1f2491827e677cb89834c95ac17978c6168330808d010ac0605bac67ba5074808132416c68163 SHA512 96aa56a4ac36c0eb5417f5080c7edecb19c24a0c83b3fb318c8c0b8ebe850b3236c264e4e6dbe472bbc726f4030d3310defb1dde2c7b304d2b36094fbf54b2fe
|
||||
DIST chromium-135.0.7039.0-linux-testdata.tar.xz 645768244 BLAKE2B e584a0bc22c944f01bdc5158ee4286991bb5d6762cffba0a0d218850b795bd9167c4bea0eb6a320aaf3f71f1d96fcd4db1c28cd45ab9e2d653b258289cfe4c04 SHA512 09b08ebe7e66e16fa03f5191c42429dfbeca0dae84cf34e2c50ef6dc661957b4c5aa13ff55fd6750bea2e1de96f7bc2b46e49b24b7a5639279f35393a3a50e4b
|
||||
DIST chromium-135.0.7039.0-linux.tar.xz 1443336152 BLAKE2B 20b747a4d2cb4e2acea3bb976b82be7f1b47a281ce9082956de64f5620a93897a47ee24750455ee45545aa76cc23b6aeacbe1ae5c2c8e746c02f07e85bde5e64 SHA512 454bd4f41f713ad786e9d6c62f0844e5fac4475c9167f2b9e1a049533909cbace52305b6e3f5c66dc1fa0250c3b4847d8e151cecc93d4a044bed4b2c25522585
|
||||
DIST chromium-clang-llvmorg-20-init-17108-g29ed6000-3.tar.xz 54170388 BLAKE2B 1383726ef2977ddb6ca9cef7eb7f5730e9635c570c1e20c3103922242e012579b87cf7ada668a6dedec375fa821115e5c79c32b12ab486a9e427f2e00344cfdc SHA512 a2aee165ee5581f442af222b23182370349a3b0b5412d05600c2d2258f31449e986bb7e88601b26049b4a926b15938238bfe8abd01ff6eaf2df84a64812007a1
|
||||
DIST chromium-openpower-a85b64f07b.tar.bz2 387899 BLAKE2B b01fda2d64ce73068d1536a10cc0896f07a4b714cdb25698b1df8b3252baa0c21c4209b307cf1cb554854f6d0bfe3cd35e06aaa8d02ac5d409a119335084c324 SHA512 05eee81677e8766808441c939bee68e2e6c58ec91f471d88a40181d2eda78614a0a6d27d92ff8f9dda564d12f3451bace4ff2727594748c5c238a3533038019b
|
||||
DIST chromium-openpower-deefc994ce.tar.bz2 394232 BLAKE2B 421b956493d964543c153ad6fb01798a8fa7331638ce9a2f414be1b77c029634e84a72c069a41b88f176f66611df0deb30a3af4061882d9ebf4ae8dc997a4cb9 SHA512 1f0a9c98dfe7441af14e14d8c2ddc0c7d393a56f392eef0782bec6c80d0742c1761fff3d3f6e3248cd8a3f3da0c10e675a7552ce240399088721f86b275b1d16
|
||||
|
|
|
|||
|
|
@ -408,9 +408,8 @@ src_prepare() {
|
|||
"${FILESDIR}/chromium-109-system-zlib.patch"
|
||||
"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
|
||||
"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
|
||||
"${FILESDIR}/chromium-134-oauth2-client-switches.patch"
|
||||
"${FILESDIR}/chromium-134-bindgen-custom-toolchain.patch"
|
||||
"${FILESDIR}/chromium-135-fix-non-wayland-build.patch"
|
||||
"${FILESDIR}/chromium-135-oauth2-client-switches.patch"
|
||||
"${FILESDIR}/chromium-135-map_droppable-glibc.patch"
|
||||
)
|
||||
|
||||
|
|
@ -619,7 +618,6 @@ src_prepare() {
|
|||
third_party/googletest
|
||||
third_party/highway
|
||||
third_party/hunspell
|
||||
third_party/iccjpeg
|
||||
third_party/ink_stroke_modeler/src/ink_stroke_modeler
|
||||
third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
|
||||
third_party/ink/src/ink/brush
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
From 919cda539b142b51fc2ef2342dbf1803b65f5434 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Jolly <kangie@gentoo.org>
|
||||
Date: Wed, 12 Feb 2025 20:13:09 +1000
|
||||
Subject: [PATCH] remoting: Linux: guard wayland includes
|
||||
|
||||
During the refactor in 53f3429926deb4cb92d9cddcda5fc096a0332db3
|
||||
wayland support became required to build this component.
|
||||
|
||||
Only include wayland components in the `platform_impls` target
|
||||
if `ozone_platform_wayland` is true.
|
||||
|
||||
Bug: 391722217
|
||||
See also: https://bugs.gentoo.org/948384
|
||||
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
||||
--- a/remoting/host/linux/BUILD.gn
|
||||
+++ b/remoting/host/linux/BUILD.gn
|
||||
@@ -192,7 +192,6 @@ source_set("platform_impls") {
|
||||
"wayland_seat.h",
|
||||
]
|
||||
deps = [
|
||||
- ":wayland",
|
||||
":x11",
|
||||
":x11_display_utils",
|
||||
"//base",
|
||||
@@ -214,9 +213,16 @@ source_set("platform_impls") {
|
||||
"//ui/base",
|
||||
"//ui/base/x",
|
||||
"//ui/events:dom_keycode_converter",
|
||||
- "//ui/events/platform/wayland:wayland_event_watcher",
|
||||
"//ui/gfx/x",
|
||||
]
|
||||
+ # ui/events/platform/wayland:wayland_event_watcher asserts that the wayland
|
||||
+ # platform is enabled.
|
||||
+ if (ozone_platform_wayland) {
|
||||
+ deps += [
|
||||
+ ":wayland",
|
||||
+ "//ui/events/platform/wayland:wayland_event_watcher",
|
||||
+ ]
|
||||
+ }
|
||||
}
|
||||
|
||||
source_set("x11_display_utils") {
|
||||
--
|
||||
2.48.0
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From d5ebfd72adff704c046170cf7ab798f5f7415dd5 Mon Sep 17 00:00:00 2001
|
||||
From: FoldCat <akane@maidagency.org>
|
||||
Date: Tue, 4 Mar 2025 13:09:59 +0800
|
||||
Subject: [PATCH] work around dead oauth2 credentials, correcting the previous bad patch
|
||||
|
||||
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.
|
||||
---
|
||||
google_apis/api_key_cache.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/google_apis/api_key_cache.cc b/google_apis/api_key_cache.cc
|
||||
index 55c6028248..12ccf9e358 100644
|
||||
--- a/google_apis/api_key_cache.cc
|
||||
+++ b/google_apis/api_key_cache.cc
|
||||
@@ -191,13 +191,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), 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), 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);
|
||||
--
|
||||
2.45.3
|
||||
|
||||
Loading…
Add table
Reference in a new issue