gentoo auto-resync : 05:03:2025 - 01:46:50

4 files changed, 46 insertions, 52 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 13ffc5079097..a400d424f735 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,8 +7,8 @@ AUX chromium-134-bindgen-custom-toolchain.patch 4838 BLAKE2B 196c183b5d23243310b
 AUX chromium-134-map_droppable-glibc.patch 1554 BLAKE2B 4f9ee69b74e5689abfd493287a0e4b7e3d38092ad9925344dd23cb8efd2873f43366bd2a59f49954dd1c604400f40d0fe3a8a1378b58d7d705d52128a47cc944 SHA512 1dff0c72cc1fed1dc553c304274209b3bac14b23e18649d800319c2beeae7360cf6f56b3c1d06c74129a25869edf09fc9fe3bbcba54e31747fb2b6a9cd7b1f88
 AUX chromium-134-oauth2-client-switches.patch 1867 BLAKE2B e5266308b7c1506f82b811e865b482886530c4c26d062d6e15155e5ef4031d7c8d680730e5fc8ab1df899d9ffacd8be01db3b43c2817a756a1cfc5d54296a9c7 SHA512 a8d95d5c10b2561fa30bf593aaf177507666cc46dd966ea048e6ee99db6dfd3a7b11962203374770ec2d508198ba14fceeb93dd5795276794a2e7adb58a363fe
 AUX chromium-134-qt5-optional.patch 4140 BLAKE2B 2a5879384a95fa0a9edf2e6506b2f374f6366ef0bd5f248b14333cbe721c5ad85d04101cf7a15a207c476525a8ba22645d8446c684363b3fa8b9c642c89b8fbf SHA512 b9fba4b3d33430a9565a6605f8d525618e6691622095bfe17f781e030e4395cb5ed25242625761ca16b19da8014e4afa1335fc6719cae78c8b3594c9e9092978
-AUX chromium-135-fix-non-wayland-build.patch 1274 BLAKE2B 9171ae97a91844bf4777dc8106ff2bbe75af1bfadba03ea4902d5884b0d09bb739c00250f6cf373e4c006a54031f4b5104360a83ab2a7edec7730d492dc82a49 SHA512 b11778f41371d19d8dd40f0eb9c0a023a7b9bb2e8d177ddee0345ae7c9d99dc99c05e017f5625d0edf34a2e1ccf524ea4c810e47977bd70f240f7016fd31d769
 AUX chromium-135-map_droppable-glibc.patch 1395 BLAKE2B a099ecaccd2cdefc3f4f7f4dbd8f0d1cf2bcc0d97230aabeb0a89d7f45a34b05926b39515965356fbb6e6fb97f8d3171c587e455abb7ffe534cce996c4bc35bc SHA512 fa741270a22a87cee56baef38fa44276543de3bcac495695550dbeada38dec655076f758c8dc0a3a1e290b49fa4c5c8dc4f2541f1574adf441d8d3fd6a5c902e
+AUX chromium-135-oauth2-client-switches.patch 2086 BLAKE2B 630dd4d14264b5ef204afed9fe1548e559b2d9319f49e1eae0ccdfb254035212f58f507b68a0365dfcc6972856652a44f29a64be22b5930180ae4e314d7ea448 SHA512 23735898a5ebbb952f775b50251e1bcef6ca865fcdbb5559bd5f79d1ce7d394b52382ed0a0125b8e0db1c3ad6eb3aba50616dbdac6d79786dea91ea1f663d58b
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
@@ -19,8 +19,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
@@ -33,5 +33,5 @@ DIST chromium-testfonts-f26f29c9d3.tar.gz 32750602 BLAKE2B 498f8b2e0811c98dc3d4a
 EBUILD chromium-133.0.6943.126.ebuild 49290 BLAKE2B 6dfe1bdba4736032cce2d183ffe1193ef9de8cf3246608b74d0e003f9aa34243748e5b3a3ef283af7aed2241b93623375fc3741ad3109637fceda0363a72dce8 SHA512 2185d8d910a294cb5a1f6cdadb1eafb6ec35ff1b648f3431bf34966100fd6df72782162d263c0d6b20b73098ed95b0afc19390db1a3eddb1b3e18b9deda443d3
 EBUILD chromium-133.0.6943.141.ebuild 49648 BLAKE2B c7bcccd4c8f71dcb8c34ba7ea00081ab3d7b304eea03db9fda5cb0fd6bb4df538f42c4d8fc71659a3c519b30ac764dd1383baca6ea41e556625d1eb9751f5a16 SHA512 6e7fc054060753d6aa1fd4ab01e946af73edee86f53368e923753eea862bea9a43f92a617fa3519c819ad7e74a1fb85e2aa8c30e7abbb258ac6021d427ca3497
 EBUILD chromium-134.0.6998.35.ebuild 54441 BLAKE2B b26231892ab28c51bf37523e60863947225dba2a95320df31ee121cf96cd845f83675ebaa178308aa2d89ce4569e9cb775849cfef09e590727e8165f67ab1003 SHA512 3a983b3e6f40a420827d61aecc3641b4043794e05414212af463eea45675180d951d244c6d2ec49b7a6ef4352077010d943c77f1115b2085a60a396720652b9a
-EBUILD chromium-135.0.7023.0.ebuild 54482 BLAKE2B b2e6ec357e86ac6728d8b10c3fb21a4d7f7389b7321f6e4778d6f2f01fd7771924522c892806168b714fe1e76e0f4067cde7c03abf685903efa6c30d7c0ffe16 SHA512 7e84ee58435bcde4bd55898d2c6c848d86d867d706d158e24c3a7c09d7da58361834fd64fba4506858e5d4462f0cb4c22206afa24b0ca34054ca9866487c7c40
+EBUILD chromium-135.0.7039.0.ebuild 54403 BLAKE2B 26b6e5d3c6d4b92b9bf48348ae89e3d3584ca8c6247e5d3a57b51ead0ef65a1cee8e5abad2d66a78ab7f25de1a004ebb180ab083d5814b96ce96ccc7df1354ac SHA512 ab3b714cbe0d5c11c2035145d38b53fe5d318b42445296d6c4eeff645c6edb0654f2a5af2e464279413594878bf5966ea41e2667e7befc865ab2ed74991b5393
 MISC metadata.xml 2090 BLAKE2B 1dc2cb3c8aad13022f4ec8ccae5f87635a5a7846f5a06c797e816322ab33d9ef2629a3409612020e42f981391d41bb501297360d9f777afc81c9fe65078ef059 SHA512 d543d25b779ea63edc5f94e564c2e2c40760b76b933e6e090a6c8c70f71720cf2f764a1fdba3c75efabff8cb0119348665c06657fc38fae615bd20882a06e2e9
diff --git a/www-client/chromium/chromium-135.0.7023.0.ebuild b/www-client/chromium/chromium-135.0.7039.0.ebuild
index d53305f0080c..5c429e58d034 100644
--- a/www-client/chromium/chromium-135.0.7023.0.ebuild
+++ b/www-client/chromium/chromium-135.0.7039.0.ebuild
@@ -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"
 	)
 
@@ -614,7 +613,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
diff --git a/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch b/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch
deleted file mode 100644
index a31462ac0f29..000000000000
--- a/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch
+++ /dev/null
@@ -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
-
diff --git a/www-client/chromium/files/chromium-135-oauth2-client-switches.patch b/www-client/chromium/files/chromium-135-oauth2-client-switches.patch
new file mode 100644
index 000000000000..4540d882d174
--- /dev/null
+++ b/www-client/chromium/files/chromium-135-oauth2-client-switches.patch
@@ -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
+