forked from pool/nodejs-electron
Bruno Pitrus
2713ef1712
* Node 20.16.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=169
281 lines
9.2 KiB
Diff
281 lines
9.2 KiB
Diff
From 54ec71011a6ebb873590802a70b2bc07578ba201 Mon Sep 17 00:00:00 2001
|
|
From: Szabolcs David <davidsz@inf.u-szeged.hu>
|
|
Date: Mon, 10 Oct 2022 17:20:43 +0200
|
|
Subject: Make user agent helpers buildable without unwanted dependencies
|
|
|
|
"//components/policy" is enormously large with its resource files and
|
|
we don't want to build it for only one preference name.
|
|
|
|
User agent utils are required to fill
|
|
navigator.userAgentData members in JavaScript.
|
|
|
|
Task-number: QTBUG-107260
|
|
Task-number: QTBUG-107451
|
|
Change-Id: I752df68a8095ddb3f598a71f0419c1a2c9c408bb
|
|
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
---
|
|
chromium/components/embedder_support/user_agent_utils.cc | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/chromium/components/embedder_support/user_agent_utils.cc b/chromium/components/embedder_support/user_agent_utils.cc
|
|
index c957a691efc..408fb837d80 100644
|
|
--- a/components/embedder_support/user_agent_utils.cc
|
|
+++ b/components/embedder_support/user_agent_utils.cc
|
|
@@ -446,12 +446,14 @@ blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service,
|
|
blink::UserAgentMetadata metadata;
|
|
|
|
bool enable_updated_grease_by_policy = true;
|
|
+#if 0
|
|
if (pref_service) {
|
|
if (pref_service->HasPrefPath(
|
|
policy::policy_prefs::kUserAgentClientHintsGREASEUpdateEnabled))
|
|
enable_updated_grease_by_policy = pref_service->GetBoolean(
|
|
policy::policy_prefs::kUserAgentClientHintsGREASEUpdateEnabled);
|
|
}
|
|
+#endif
|
|
|
|
// Low entropy client hints.
|
|
metadata.brand_version_list =
|
|
--
|
|
cgit v1.2.3
|
|
|
|
|
|
|
|
…and now come Electron—specific changes to support the above:
|
|
|
|
--- src/components/browsing_data/core/BUILD.gn.old
|
|
+++ src/components/browsing_data/core/BUILD.gn
|
|
@@ -36,9 +36,7 @@ static_library("core") {
|
|
deps = [
|
|
"//base",
|
|
"//components/autofill/core/browser",
|
|
- "//components/bookmarks/browser",
|
|
"//components/history/core/browser",
|
|
- "//components/password_manager/core/browser",
|
|
"//components/pref_registry",
|
|
"//components/prefs",
|
|
"//components/strings",
|
|
--- src/components/sync/BUILD.gn.old
|
|
+++ src/components/sync/BUILD.gn
|
|
@@ -11,7 +11,6 @@ group("sync") {
|
|
"//components/sync/engine",
|
|
"//components/sync/model",
|
|
"//components/sync/nigori",
|
|
- "//components/sync/service",
|
|
]
|
|
if (is_chromeos) {
|
|
public_deps += [ "//components/sync/chromeos" ]
|
|
--- src/components/permissions/prediction_service/BUILD.gn.old
|
|
+++ src/components/permissions/prediction_service/BUILD.gn
|
|
@@ -31,8 +31,6 @@ source_set("prediction_service") {
|
|
]
|
|
public_deps = [
|
|
":prediction_service_messages_proto",
|
|
- "//components/optimization_guide/core",
|
|
- "//components/optimization_guide/proto:optimization_guide_proto",
|
|
]
|
|
|
|
if (build_with_tflite_lib) {
|
|
--- src/components/embedder_support/BUILD.gn.old
|
|
+++ src/components/embedder_support/BUILD.gn
|
|
@@ -24,11 +24,8 @@ static_library("browser_util") {
|
|
deps = [
|
|
":embedder_support",
|
|
"//build:branding_buildflags",
|
|
- "//components/background_sync",
|
|
- "//components/content_settings/browser",
|
|
"//components/content_settings/core/browser",
|
|
"//components/permissions",
|
|
- "//components/policy/core/common",
|
|
"//components/prefs",
|
|
"//components/version_info",
|
|
"//content/public/browser",
|
|
--- src/components/permissions/BUILD.gn.old
|
|
+++ src/components/permissions/BUILD.gn
|
|
@@ -109,8 +109,6 @@ source_set("permissions") {
|
|
deps = [
|
|
"//base",
|
|
"//build:chromeos_buildflags",
|
|
- "//components/back_forward_cache",
|
|
- "//components/content_settings/browser",
|
|
"//components/content_settings/core/browser",
|
|
"//components/favicon/core:core",
|
|
"//components/keyed_service/content",
|
|
--- src/components/proxy_config/BUILD.gn.old
|
|
+++ src/components/proxy_config/BUILD.gn
|
|
@@ -23,9 +23,6 @@ component("proxy_config") {
|
|
|
|
deps = [
|
|
"//base",
|
|
- "//components/policy:generated",
|
|
- "//components/policy/core/browser",
|
|
- "//components/policy/core/common",
|
|
"//components/prefs",
|
|
"//components/strings",
|
|
"//net",
|
|
@@ -42,7 +39,7 @@ component("proxy_config") {
|
|
deps += [ "//components/pref_registry" ]
|
|
}
|
|
|
|
- if (!is_ios) {
|
|
+ if (false) {
|
|
sources += [
|
|
"proxy_policy_handler.cc",
|
|
"proxy_policy_handler.h",
|
|
--- src/components/content_settings/core/browser/BUILD.gn.old
|
|
+++ src/components/content_settings/core/browser/BUILD.gn
|
|
@@ -70,7 +70,7 @@ static_library("browser") {
|
|
"//url",
|
|
]
|
|
|
|
- if (!is_ios) {
|
|
+ if (false) {
|
|
sources += [
|
|
"cookie_settings_policy_handler.cc",
|
|
"cookie_settings_policy_handler.h",
|
|
@@ -82,8 +82,6 @@ static_library("browser") {
|
|
if (use_blink) {
|
|
deps += [
|
|
"//components/permissions:permissions_common",
|
|
- "//components/policy:generated",
|
|
- "//components/policy/core/browser",
|
|
"//components/privacy_sandbox:privacy_sandbox_prefs",
|
|
]
|
|
}
|
|
--- src/electron/chromium_src/BUILD.gn.orig
|
|
+++ src/electron/chromium_src/BUILD.gn
|
|
@@ -466,7 +466,7 @@ source_set("chrome_spellchecker") {
|
|
"//chrome/browser/spellchecker/spellcheck_service.h",
|
|
]
|
|
|
|
- if (!is_mac) {
|
|
+ if (false) {
|
|
sources += [
|
|
"//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
|
|
"//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
|
|
--- src/chrome/common/BUILD.gn.old
|
|
+++ src/chrome/common/BUILD.gn
|
|
@@ -210,14 +210,11 @@ static_library("common_lib") {
|
|
"//components/nacl/common:switches",
|
|
"//components/net_log",
|
|
"//components/network_session_configurator/common",
|
|
- "//components/ntp_tiles",
|
|
"//components/offline_pages/buildflags",
|
|
"//components/offline_pages/core:switches",
|
|
"//components/omnibox/common",
|
|
"//components/page_load_metrics/common:page_load_metrics_mojom",
|
|
"//components/password_manager/core/common",
|
|
- "//components/policy:generated",
|
|
- "//components/policy/core/common",
|
|
"//components/prefs",
|
|
"//components/safe_browsing:buildflags",
|
|
"//components/safe_search_api",
|
|
@@ -606,8 +603,6 @@ static_library("url_constants") {
|
|
"//components/lens:buildflags",
|
|
"//components/nacl/common:buildflags",
|
|
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
|
|
- "//components/password_manager/content/common",
|
|
- "//components/safe_browsing/core/common",
|
|
"//device/vr/buildflags",
|
|
]
|
|
}
|
|
--- src/components/search_engines/BUILD.gn.old
|
|
+++ src/components/search_engines/BUILD.gn
|
|
@@ -15,45 +15,23 @@ static_library("search_engines") {
|
|
"choice_made_location.h",
|
|
"default_search_manager.cc",
|
|
"default_search_manager.h",
|
|
- "default_search_policy_handler.cc",
|
|
- "default_search_policy_handler.h",
|
|
"eea_countries_ids.h",
|
|
"enterprise_site_search_manager.cc",
|
|
"enterprise_site_search_manager.h",
|
|
- "keyword_table.cc",
|
|
- "keyword_table.h",
|
|
"keyword_web_data_service.cc",
|
|
"keyword_web_data_service.h",
|
|
- "search_engine_choice/search_engine_choice_service.cc",
|
|
- "search_engine_choice/search_engine_choice_service.h",
|
|
- "search_engine_choice_utils.cc",
|
|
- "search_engine_choice_utils.h",
|
|
"search_engines_pref_names.h",
|
|
- "search_host_to_urls_map.cc",
|
|
- "search_host_to_urls_map.h",
|
|
"search_terms_data.cc",
|
|
"search_terms_data.h",
|
|
- "template_url.cc",
|
|
- "template_url.h",
|
|
"template_url_data.cc",
|
|
"template_url_data.h",
|
|
"template_url_data_util.cc",
|
|
"template_url_data_util.h",
|
|
- "template_url_fetcher.cc",
|
|
- "template_url_fetcher.h",
|
|
"template_url_id.h",
|
|
- "template_url_parser.cc",
|
|
- "template_url_parser.h",
|
|
- "template_url_prepopulate_data.cc",
|
|
- "template_url_prepopulate_data.h",
|
|
- "template_url_service.cc",
|
|
- "template_url_service.h",
|
|
"template_url_service_client.h",
|
|
"template_url_service_observer.h",
|
|
"template_url_starter_pack_data.cc",
|
|
"template_url_starter_pack_data.h",
|
|
- "util.cc",
|
|
- "util.h",
|
|
]
|
|
|
|
public_deps = [
|
|
@@ -69,20 +47,14 @@ static_library("search_engines") {
|
|
"//components/sync",
|
|
"//components/webdata/common",
|
|
"//third_party/metrics_proto",
|
|
- "//third_party/omnibox_proto",
|
|
]
|
|
|
|
deps = [
|
|
"//base:i18n",
|
|
"//components/country_codes",
|
|
"//components/database_utils",
|
|
- "//components/infobars/core",
|
|
- "//components/lens:lens",
|
|
"//components/omnibox/common",
|
|
- "//components/policy:generated",
|
|
- "//components/policy/core/browser",
|
|
"//components/pref_registry",
|
|
- "//components/search_provider_logos:switches",
|
|
"//components/signin/public/base",
|
|
"//components/strings",
|
|
"//components/url_formatter",
|
|
@@ -94,7 +66,6 @@ static_library("search_engines") {
|
|
"//services/network/public/mojom",
|
|
"//sql",
|
|
"//third_party/metrics_proto",
|
|
- "//third_party/omnibox_proto",
|
|
"//ui/base",
|
|
"//ui/gfx",
|
|
"//ui/gfx/geometry",
|
|
@@ -120,7 +91,7 @@ static_library("search_engines") {
|
|
]
|
|
}
|
|
|
|
- if (is_linux || is_win || is_mac || is_chromeos) {
|
|
+ if (false) {
|
|
sources += [
|
|
"site_search_policy_handler.cc",
|
|
"site_search_policy_handler.h",
|
|
--- src/components/search/BUILD.gn.old
|
|
+++ src/components/search/BUILD.gn
|
|
@@ -6,10 +6,6 @@ static_library("search") {
|
|
sources = [
|
|
"ntp_features.cc",
|
|
"ntp_features.h",
|
|
- "search.cc",
|
|
- "search.h",
|
|
- "search_provider_observer.cc",
|
|
- "search_provider_observer.h",
|
|
]
|
|
|
|
deps = [
|