From 2b36e5c04af423d771a21dd0638d239a8ab95916 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2024 00:02:54 +0000 Subject: [PATCH] www-client/chromium: sync with upstream --- .../files/chromium-117-system-zstd.patch | 46 ------------------- ...se-oauth2-client-switches-as-default.patch | 17 ------- 2 files changed, 63 deletions(-) delete mode 100644 www-client/chromium/files/chromium-117-system-zstd.patch delete mode 100644 www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch diff --git a/www-client/chromium/files/chromium-117-system-zstd.patch b/www-client/chromium/files/chromium-117-system-zstd.patch deleted file mode 100644 index 0fcd3ef..0000000 --- a/www-client/chromium/files/chromium-117-system-zstd.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001 -From: Matt Jolly -Date: Sun, 17 Sep 2023 16:51:42 +1000 -Subject: [PATCH] Add system-zstd - ---- a/build/linux/unbundle/replace_gn_files.py -+++ b/build/linux/unbundle/replace_gn_files.py -@@ -74,6 +74,7 @@ REPLACEMENTS = { - # - 'woff2': 'third_party/woff2/BUILD.gn', - 'zlib': 'third_party/zlib/BUILD.gn', -+ 'zstd': 'third_party/zstd/BUILD.gn', - } - - ---- /dev/null -+++ b/build/linux/unbundle/zstd.gn -@@ -0,0 +1,25 @@ -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_zstd") { -+ packages = [ "libzstd" ] -+} -+ -+shim_headers("zstd_shim") { -+ root_path = "src/lib" -+ headers = [ -+ "zdict.h", -+ "zstd.h", -+ "zstd_errors.h", -+ ] -+} -+ -+source_set("zstd") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} -+ -+source_set("decompress") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} --- -2.42.0 - diff --git a/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch b/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch deleted file mode 100644 index 9d9c57b..0000000 --- a/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -upr chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc chromium-89.0.4389.58/google_apis/google_api_keys.cc ---- chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc 2021-02-24 22:37:18.494007649 +0000 -+++ chromium-89.0.4389.58/google_apis/google_api_keys.cc 2021-02-24 22:35:00.865777600 +0000 -@@ -154,11 +154,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