Skip to content

Commit

Permalink
Update patches
Browse files Browse the repository at this point in the history
Signed-off-by: Qian Qian "Cubik"‎ <[email protected]>
  • Loading branch information
Cubik65536 committed Dec 9, 2023
1 parent 5ee7332 commit 9dd6ec1
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1535,7 +1535,7 @@ config("compiler_deterministic") {
@@ -1575,7 +1575,7 @@ config("compiler_deterministic") {
}

config("clang_revision") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
+++ b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
@@ -130,61 +130,7 @@ class HandlerStarter final : public Noti
@@ -131,61 +131,7 @@ class HandlerStarter final : public Noti
const std::map<std::string, std::string>& annotations,
const std::vector<std::string>& arguments,
bool restartable) {
Expand Down Expand Up @@ -65,7 +65,7 @@
}

// NotifyServer::DefaultInterface:
@@ -455,24 +401,7 @@ bool CrashpadClient::StartHandler(
@@ -456,24 +402,7 @@ bool CrashpadClient::StartHandler(
// Attachments are not implemented on MacOS yet.
DCHECK(attachments.empty());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1290,7 +1290,7 @@ if (is_win) {
@@ -1304,7 +1304,7 @@ if (is_win) {

# TOOD(crbug/1163903#c8) - thakis@ look into why profile and coverage
# instrumentation adds these symbols in different orders
Expand Down
34 changes: 17 additions & 17 deletions patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1968,10 +1968,6 @@ static_library("browser") {
@@ -1999,10 +1999,6 @@ static_library("browser") {
"//chrome/browser/ui",
"//chrome/browser/storage_access_api",
"//chrome/browser/top_level_storage_access_api:permissions",
Expand All @@ -13,7 +13,7 @@

# TODO(crbug.com/1030821): Eliminate usages of browser.h from Media Router.
"//chrome/browser/media/router",
@@ -2084,7 +2080,6 @@ static_library("browser") {
@@ -2117,7 +2113,6 @@ static_library("browser") {
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/resources/accessibility:resources",
Expand All @@ -23,7 +23,7 @@
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -760,9 +760,6 @@ static_library("extensions") {
@@ -753,9 +753,6 @@ static_library("extensions") {

# TODO(crbug.com/1065748): Remove this circular dependency.
"//chrome/browser/web_applications/extensions",
Expand All @@ -33,7 +33,7 @@
]

# Since browser and browser_extensions actually depend on each other,
@@ -775,8 +772,6 @@ static_library("extensions") {
@@ -768,8 +765,6 @@ static_library("extensions") {
"//chrome/common",
"//chrome/common/extensions/api",
"//components/omnibox/browser",
Expand All @@ -42,15 +42,15 @@
"//components/safe_browsing/core/common/proto:realtimeapi_proto",
"//components/signin/core/browser",
"//components/translate/content/browser",
@@ -817,7 +812,6 @@ static_library("extensions") {
@@ -809,7 +804,6 @@ static_library("extensions") {
"//chrome/browser/profiles",
"//chrome/browser/profiles:profile",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
- "//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:metrics_collector",
"//chrome/browser/ui/tabs:tab_enums",
"//chrome/browser/web_applications",
@@ -901,12 +895,6 @@ static_library("extensions") {
@@ -893,12 +887,6 @@ static_library("extensions") {
"//components/proxy_config",
"//components/reading_list/core",
"//components/resources",
Expand All @@ -65,23 +65,23 @@
"//components/services/patch/content",
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -384,7 +384,6 @@ static_library("ui") {
@@ -388,7 +388,6 @@ static_library("ui") {
"//components/cross_device/logging",
"//components/dom_distiller/core",
"//components/paint_preview/buildflags",
- "//components/safe_browsing:buildflags",
"//components/sync",
"//components/sync_user_events",
"//components/translate/content/browser",
@@ -428,7 +427,6 @@ static_library("ui") {
@@ -432,7 +431,6 @@ static_library("ui") {
"//chrome/browser/profiling_host",
"//chrome/browser/resources:dev_ui_resources",
"//chrome/browser/resources:resources",
- "//chrome/browser/safe_browsing",
"//chrome/browser/share",
"//chrome/browser/storage_access_api",
"//chrome/browser/ui/side_panel:side_panel_enums",
@@ -567,17 +565,8 @@ static_library("ui") {
@@ -574,17 +572,8 @@ static_library("ui") {
"//components/reading_list/features:flags",
"//components/renderer_context_menu",
"//components/resources",
Expand All @@ -99,15 +99,15 @@
"//components/schema_org/common:improved_mojom",
"//components/search",
"//components/search_engines",
@@ -686,7 +675,6 @@ static_library("ui") {
@@ -693,7 +682,6 @@ static_library("ui") {
# TODO(crbug.com/1158905): Remove this circular dependency.
"//chrome/browser/devtools",
"//chrome/browser/favicon",
- "//chrome/browser/safe_browsing",
"//chrome/browser/profiling_host",
"//chrome/browser/ui/webui:configs",
]
@@ -1930,8 +1918,6 @@ static_library("ui") {

@@ -1970,8 +1958,6 @@ static_library("ui") {
"//chrome/browser/new_tab_page/modules/recipes:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
Expand All @@ -116,7 +116,7 @@
"//chrome/browser/support_tool:support_tool_proto",
"//chrome/browser/ui/color:color_headers",
"//chrome/browser/ui/color:mixers",
@@ -6442,26 +6428,6 @@ static_library("ui") {
@@ -6545,26 +6531,6 @@ static_library("ui") {
}
}

Expand Down Expand Up @@ -145,7 +145,7 @@
}
--- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
@@ -435,8 +435,12 @@ void DownloadProtectionService::ShowDeta
@@ -439,8 +439,12 @@ void DownloadProtectionService::ShowDeta
Profile* profile = Profile::FromBrowserContext(
content::DownloadItemUtils::GetBrowserContext(item));
if (profile &&
Expand All @@ -160,7 +160,7 @@
learn_more_url = GURL(chrome::kAdvancedProtectionDownloadLearnMoreURL);
--- a/chrome/browser/download/notification/download_item_notification.cc
+++ b/chrome/browser/download/notification/download_item_notification.cc
@@ -997,9 +997,13 @@ std::u16string DownloadItemNotification:
@@ -1001,9 +1001,13 @@ std::u16string DownloadItemNotification:
}
case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: {
bool requests_ap_verdicts =
Expand Down Expand Up @@ -240,7 +240,7 @@
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7002,13 +7002,9 @@ test("unit_tests") {
@@ -7135,13 +7135,9 @@ test("unit_tests") {
"//chrome/browser/renderer_host:history_swiper",
"//chrome/browser/updater:browser_updater_client",
"//chrome/common/notifications",
Expand Down

0 comments on commit 9dd6ec1

Please sign in to comment.