www-client/chromium: sync with upstream
This commit is contained in:
parent
01b7cdb674
commit
2b36e5c04a
2 changed files with 0 additions and 63 deletions
|
@ -1,46 +0,0 @@
|
||||||
From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matt Jolly <Matt.Jolly@footclan.ninja>
|
|
||||||
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
|
|
||||||
|
|
|
@ -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
|
|
Loading…
Add table
Reference in a new issue