commit: b6fcfdd3162929e0ffa848fb86d2fdf197f09ab8 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Jun 24 17:21:05 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Thu Jun 27 15:40:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6fcfdd3
www-client/chromium: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/chromium-124-libwebp-shim-sharpyuv.patch | 36 ----------------- .../chromium/files/chromium-125-ninja-1-12.patch | 17 -------- .../chromium-125-oauth2-client-switches.patch | 45 ---------------------- 3 files changed, 98 deletions(-) diff --git a/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch b/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch deleted file mode 100644 index fa038731cd4a..000000000000 --- a/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 40c466949bd8ccb61cb55655848d23684a9f8a94 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Mon, 25 Mar 2024 21:38:35 +1000 -Subject: [PATCH] libwebp shim: add libwebp_sharpyuv target - -Signed-off-by: Matt Jolly <[email protected]> ---- a/build/linux/unbundle/libwebp.gn -+++ b/build/linux/unbundle/libwebp.gn -@@ -22,14 +22,24 @@ shim_headers("libwebp_shim") { - "webp/mux.h", - "webp/mux_types.h", - "webp/types.h", -+ "webp/sharpyuv/sharpyuv.h", -+ "webp/sharpyuv/sharpyuv_csp.h", - ] - } - -+source_set("libwebp_sharpyuv") { -+ deps = [ ":libwebp_shim" ] -+ public_configs = [ ":system_libwebp" ] -+} -+ - source_set("libwebp_webp") { - deps = [ ":libwebp_shim" ] - public_configs = [ ":system_libwebp" ] - } - - group("libwebp") { -- deps = [ ":libwebp_webp" ] -+ deps = [ -+ ":libwebp_webp", -+ ":libwebp_sharpyuv" -+ ] - } --- -2.44.0 diff --git a/www-client/chromium/files/chromium-125-ninja-1-12.patch b/www-client/chromium/files/chromium-125-ninja-1-12.patch deleted file mode 100644 index 55d0887cd94f..000000000000 --- a/www-client/chromium/files/chromium-125-ninja-1-12.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/5487538 -commit a976cb05b4024b7a6452d1541378d718cdfe33e6 -Author: Takuto Ikuta <[email protected]> -Date: Thu Apr 25 07:25:32 2024 - - [devtools] fix a missing build dependency to a generated file - ---- a/chrome/browser/devtools/BUILD.gn -+++ b/chrome/browser/devtools/BUILD.gn -@@ -117,6 +117,7 @@ - "//chrome/browser/autofill:autofill", - "//components/autofill/content/browser:browser", - "//components/autofill/core/browser:browser", -+ "//components/enterprise/buildflags", - "//components/paint_preview/buildflags:buildflags", - "//components/variations/service:service", - "//components/webapps/common:common", diff --git a/www-client/chromium/files/chromium-125-oauth2-client-switches.patch b/www-client/chromium/files/chromium-125-oauth2-client-switches.patch deleted file mode 100644 index 6c7f56b56d96..000000000000 --- a/www-client/chromium/files/chromium-125-oauth2-client-switches.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6a84205d0399a94e8b526176a7dcafd6c2051a95 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Thu, 18 Apr 2024 21:15:20 +1000 -Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials - - 125 update - -125 moved the content to a new file. - -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 <[email protected]> ---- a/google_apis/google_api_keys-inc.cc -+++ b/google_apis/google_api_keys-inc.cc -@@ -182,11 +182,11 @@ class APIKeyCache { - - std::string default_client_id = CalculateKeyValue( - GOOGLE_DEFAULT_CLIENT_ID, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::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), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret, - std::string(), environment.get(), command_line, gaia_config); - - // We currently only allow overriding the baked-in values for the --- -2.44.0 -
