From 873bcbab0feacca0148d8d00b282d020b0144bb8 Mon Sep 17 00:00:00 2001 From: hlgsdx <20733681+hlgsdx@users.noreply.github.com> Date: Wed, 13 Sep 2023 15:08:22 +0800 Subject: [PATCH] Update to ungoogled-chromium 117.0.5938.62 --- downloads.ini | 10 +- patches/series | 3 - .../fix-llvm-15-build.patch | 222 ------------------ .../fix-missing-iterator-subtypes.patch | 32 --- .../macos/disable-clang-version-check.patch | 6 +- .../disable-symbol-order-verification.patch | 2 +- .../macos/fix-disabling-safebrowsing.patch | 44 ++-- .../macos/fix-dsymutil.patch | 2 +- .../macos/fix-visibility.patch | 32 --- ungoogled-chromium | 2 +- 10 files changed, 33 insertions(+), 322 deletions(-) delete mode 100644 patches/ungoogled-chromium/fix-llvm-15-build.patch delete mode 100644 patches/ungoogled-chromium/fix-missing-iterator-subtypes.patch delete mode 100644 patches/ungoogled-chromium/macos/fix-visibility.patch diff --git a/downloads.ini b/downloads.ini index 3ddfdc36..e48a2d41 100644 --- a/downloads.ini +++ b/downloads.ini @@ -14,9 +14,9 @@ output_path = third_party/google_toolbox_for_mac/src # Pre-built LLVM toolchain for convenience [llvm] -version = 15.0.7 -url = https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s/clang+llvm-%(version)s-x86_64-apple-darwin21.0.tar.xz -download_filename = clang+llvm-%(version)s-x86_64-apple-darwin21.0.tar.xz -strip_leading_dirs = clang+llvm-%(version)s-x86_64-apple-darwin21.0 -sha512 = dc8936b951089f6bf54edcb390a1fce21d34b7bbd49179eab19105a0c699e490b8a85adc4c3edb067aaec619bb5ef6d9059020f9d75af7e055a004876903bdea +version = 17.0.0 +url = https://github.com/hlgsdx/llvm-macos-buildbot/releases/download/%(version)s-rc4/clang+llvm-%(version)s-x86-64-apple-darwin22.0.tar.gz +download_filename = clang+llvm-%(version)s-x86-64-apple-darwin22.0.tar.gz +strip_leading_dirs = clang+llvm-%(version)s-x86-64-apple-darwin22.0 +sha512 = 238a3a6f8e38950251d674e11c5b88bf4b6a21c2a8eab30b8fccea4130b9238157279fb4fb7d8bc2ca356559589178aad28f579d2f96d0b2c62419d1ebf9b175 output_path = third_party/llvm-build/Release+Asserts diff --git a/patches/series b/patches/series index 08014901..7cb95fcb 100644 --- a/patches/series +++ b/patches/series @@ -2,10 +2,7 @@ ungoogled-chromium/macos/disable-symbol-order-verification.patch ungoogled-chromium/macos/disable-clang-version-check.patch ungoogled-chromium/macos/disable-crashpad-handler.patch ungoogled-chromium/macos/fix-disabling-safebrowsing.patch -ungoogled-chromium/macos/fix-visibility.patch ungoogled-chromium/macos/fix-dsymutil.patch ungoogled-chromium/macos/fix-clang-format-path.patch ungoogled-chromium/macos/fix-runTsc-log-info.patch -ungoogled-chromium/fix-llvm-15-build.patch -ungoogled-chromium/fix-missing-iterator-subtypes.patch ungoogled-chromium/fix-node-path.patch diff --git a/patches/ungoogled-chromium/fix-llvm-15-build.patch b/patches/ungoogled-chromium/fix-llvm-15-build.patch deleted file mode 100644 index 7f2a13ca..00000000 --- a/patches/ungoogled-chromium/fix-llvm-15-build.patch +++ /dev/null @@ -1,222 +0,0 @@ ---- a/chrome/browser/apps/app_shim/app_shim_manager_mac.cc -+++ b/chrome/browser/apps/app_shim/app_shim_manager_mac.cc -@@ -1557,24 +1557,24 @@ std::map AppShimMan - // URLs those profiles can handle. - std::map handlers = - AppShimRegistry::Get()->GetHandlersForApp(params.app_id); -- for (const auto& [profile, handler_info] : handlers) { -+ for (const auto& handler : handlers) { - int count = base::ranges::count_if( -- files, [&handler_info](const base::FilePath& file_path) { -+ files, [&handler](const base::FilePath& file_path) { - std::string file_extension = - base::FilePath(file_path.Extension()).AsUTF8Unsafe(); - return file_extension.length() > 1 && -- base::Contains(handler_info.file_handler_extensions, -+ base::Contains(handler.second.file_handler_extensions, - file_extension); - }); - - if (protocol_handler_url.is_valid() && -- base::Contains(handler_info.protocol_handlers, -+ base::Contains(handler.second.protocol_handlers, - protocol_handler_url.scheme())) { - count++; - } - - if (count > 0) -- result[profile] = count; -+ result[handler.first] = count; - } - return result; - } ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -760,13 +760,6 @@ config("compiler") { - - ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] - -- if (!is_chromeos) { -- # TODO(https://crbug.com/972449): turn on for ChromeOS when that -- # toolchain has this flag. -- # We only use one version of LLVM within a build so there's no need to -- # upgrade debug info, which can be expensive since it runs the verifier. -- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ] -- } - } - - # TODO(https://crbug.com/1211155): investigate why this isn't effective on -@@ -821,10 +814,6 @@ config("compiler") { - ldflags += [ "-Wl,--undefined-version" ] - } - -- if (use_lld && is_apple) { -- ldflags += [ "-Wl,--strict-auto-link" ] -- } -- - # LLD does call-graph-sorted binary layout by default when profile data is - # present. On Android this increases binary size due to more thinks for long - # jumps. Turn it off by default and enable selectively for targets where it's ---- a/ui/native_theme/native_theme_aura.cc -+++ b/ui/native_theme/native_theme_aura.cc -@@ -116,7 +116,7 @@ SkColor4f NativeThemeAura::FocusRingColo - #if BUILDFLAG(IS_APPLE) - // On Mac OSX, the system Accent Color setting is darkened a bit - // for better contrast. -- return SkColor4f(base_color.fR, base_color.fG, base_color.fB, 166 / 255.0f); -+ return SkColor4f{base_color.fR, base_color.fG, base_color.fB, 166 / 255.0f}; - #else - return base_color; - #endif // BUILDFLAG(IS_APPLE) ---- a/chrome/test/chromedriver/capabilities.cc -+++ b/chrome/test/chromedriver/capabilities.cc -@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base:: - "'version' field of type string"); - } - -- brands.emplace_back(*brand, *version); -+ brands.emplace_back(BrandVersion{*brand, *version}); - } - - client_hints.brands = std::move(brands); -@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base:: - "a 'version' field of type string"); - } - -- full_version_list.emplace_back(*brand, *version); -+ full_version_list.emplace_back(BrandVersion{*brand, *version}); - } - - client_hints.full_version_list = std::move(full_version_list); ---- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc -+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc -@@ -83,12 +83,12 @@ void CanvasStyle::ApplyToFlags(cc::Paint - case kGradient: - GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(), - ImageDrawOptions()); -- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); -+ flags.setColor(SkColor4f({0.0f, 0.0f, 0.0f, global_alpha})); - break; - case kImagePattern: - GetCanvasPattern()->GetPattern()->ApplyToFlags( - flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform())); -- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); -+ flags.setColor(SkColor4f({0.0f, 0.0f, 0.0f, global_alpha})); - break; - default: - NOTREACHED(); ---- a/chrome/common/printing/printer_capabilities_mac.mm -+++ b/chrome/common/printing/printer_capabilities_mac.mm -@@ -131,9 +131,9 @@ PrinterSemanticCapsAndDefaults::Papers G - ConvertUnit(printable_area_width, kPointsPerInch, kMicronsPerInch), - ConvertUnit(printable_area_height, kPointsPerInch, kMicronsPerInch)); - -- custom_paper_sizes.emplace_back(base::SysNSStringToUTF8(name), -+ custom_paper_sizes.emplace_back(PrinterSemanticCapsAndDefaults::Paper{base::SysNSStringToUTF8(name), - /*vendor_id=*/"", size_microns, -- printable_area_microns); -+ printable_area_microns}); - } - std::sort(custom_paper_sizes.begin(), custom_paper_sizes.end(), - [](const PrinterSemanticCapsAndDefaults::Paper& a, ---- a/net/dns/host_resolver_cache.cc -+++ b/net/dns/host_resolver_cache.cc -@@ -159,7 +159,7 @@ void HostResolverCache::Set( - - std::string domain_name = result->domain_name(); - entries_.emplace( -- Key(std::move(domain_name), network_anonymization_key), -+ Key({std::move(domain_name), network_anonymization_key}), - Entry(std::move(result), source, secure, staleness_generation_)); - - if (entries_.size() > max_entries_) { ---- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc -+++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc -@@ -1496,7 +1496,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOut - - // Issue readbacks from the surfaces: - for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) { -- SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height()); -+ SkISize size({plane_surfaces[i]->width(), plane_surfaces[i]->height()}); - SkImageInfo dst_info = SkImageInfo::Make( - size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType, - kUnpremul_SkAlphaType); ---- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc -+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc -@@ -470,10 +470,10 @@ void ChromeOmniboxClient::OnAutocomplete - alternative_nav_match); - - // Store the details necessary to open the omnibox match via browser commands. -- location_bar_->set_navigation_params(LocationBar::NavigationParams( -+ location_bar_->set_navigation_params(LocationBar::NavigationParams({ - destination_url, disposition, transition, match_selection_timestamp, - destination_url_entered_without_scheme, -- destination_url_entered_with_http_scheme)); -+ destination_url_entered_with_http_scheme})); - - if (browser_) { - auto navigation = chrome::OpenCurrentURL(browser_); ---- a/content/public/browser/web_ui_browser_interface_broker_registry.h -+++ b/content/public/browser/web_ui_browser_interface_broker_registry.h -@@ -127,10 +127,11 @@ class CONTENT_EXPORT WebUIBrowserInterfa - // - // TODO(crbug.com/1407936): Point to WebUIJsBridge documentation. - template -+ typename - JsBridgeTraits::BinderInitializer& ForWebUIWithJsBridge() { - using Traits = JsBridgeTraits; -- using Interface = Traits::Interface; -- using JsBridgeBinderInitializer = Traits::BinderInitializer; -+ using Interface = typename Traits::Interface; -+ using JsBridgeBinderInitializer = typename Traits::BinderInitializer; - - // WebUIController::GetType() requires an instantiated WebUIController - // (because it's a virtual method and can't be static). Here we only have ---- a/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h -+++ b/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h -@@ -269,8 +269,8 @@ class CORE_EXPORT ObjectPaintPropertiesS - NodeList& nodes, - NodeId node_id, - const ParentType& parent, -- NodeType::State&& state, -- const NodeType::AnimationState& animation_state = -+ typename NodeType::State&& state, -+ const typename NodeType::AnimationState& animation_state = - NodeType::AnimationState()) { - // First, check if we need to add a new node. - if (!nodes.HasField(node_id)) { ---- a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc -+++ b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc -@@ -31,7 +31,7 @@ Vector - color_interpolation_space, hue_interpolation_method, start_color, - end_color, percentage, alpha_multiplier); - -- FontPalette::FontPaletteOverride result_color_record(i, result_color); -+ FontPalette::FontPaletteOverride result_color_record({static_cast(i), result_color}); - result_color_records.push_back(result_color_record); - } - return result_color_records; ---- a/chrome/browser/content_settings/one_time_permission_provider.cc -+++ b/chrome/browser/content_settings/one_time_permission_provider.cc -@@ -207,8 +207,8 @@ void OneTimePermissionProvider::OnSuspen - - while (rule_iterator && rule_iterator->HasNext()) { - auto rule = rule_iterator->Next(); -- patterns_to_delete.emplace_back(setting_type, rule->primary_pattern, -- rule->secondary_pattern); -+ patterns_to_delete.emplace_back(ContentSettingEntry{setting_type, rule->primary_pattern, -+ rule->secondary_pattern}); - permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( - setting_type, - permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND); -@@ -302,8 +302,8 @@ void OneTimePermissionProvider::DeleteEn - auto rule = rule_iterator->Next(); - if (rule->primary_pattern.Matches(origin_gurl) && - rule->secondary_pattern.Matches(origin_gurl)) { -- patterns_to_delete.emplace_back( -- content_setting_type, rule->primary_pattern, rule->secondary_pattern); -+ patterns_to_delete.emplace_back(ContentSettingEntry{ -+ content_setting_type, rule->primary_pattern, rule->secondary_pattern}); - permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( - content_setting_type, trigger_event); - } diff --git a/patches/ungoogled-chromium/fix-missing-iterator-subtypes.patch b/patches/ungoogled-chromium/fix-missing-iterator-subtypes.patch deleted file mode 100644 index 8e31dea1..00000000 --- a/patches/ungoogled-chromium/fix-missing-iterator-subtypes.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/chrome/browser/download/bubble/download_bubble_update_service.cc -+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc -@@ -91,6 +91,7 @@ ItemSortKey GetSortKey(const Item& item) - // Helper to get an iterator to the last element in the cache. The cache - // must not be empty. - template -+typename - SortedItems::const_iterator GetLastIter(const SortedItems& cache) { - CHECK(!cache.empty()); - auto it = cache.end(); -@@ -967,8 +968,10 @@ bool DownloadBubbleUpdateService::CacheM - } - - template -+typename - SortedItems::iterator - DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter( -+ typename - SortedItems::iterator iter, - SortedItems& cache, - IterMap& iter_map) { ---- a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc -+++ b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc -@@ -169,7 +169,7 @@ class HTMLFastPathParser { - using Span = base::span; - using USpan = base::span; - // 32 matches that used by HTMLToken::Attribute. -- typedef std::conditional, -+ typedef typename std::conditional, - UCharLiteralBuffer<32>, - LCharLiteralBuffer<32>>::type LiteralBufferType; - typedef UCharLiteralBuffer<32> UCharLiteralBufferType; diff --git a/patches/ungoogled-chromium/macos/disable-clang-version-check.patch b/patches/ungoogled-chromium/macos/disable-clang-version-check.patch index a0d7a793..50d0d346 100644 --- a/patches/ungoogled-chromium/macos/disable-clang-version-check.patch +++ b/patches/ungoogled-chromium/macos/disable-clang-version-check.patch @@ -1,6 +1,6 @@ --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1511,7 +1511,7 @@ config("compiler_deterministic") { +@@ -1510,7 +1510,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -15,8 +15,8 @@ } declare_args() { -- clang_version = "17" -+ clang_version = "15" +- clang_version = "18" ++ clang_version = "17" } # Extension for shared library files (including leading dot). diff --git a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch index 5c7ef37a..0e6943dd 100644 --- a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch +++ b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch @@ -2,7 +2,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1281,7 +1281,7 @@ if (is_win) { +@@ -1298,7 +1298,7 @@ if (is_win) { # TOOD(crbug/1163903#c8) - thakis@ look into why profile and coverage # instrumentation adds these symbols in different orders diff --git a/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch b/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch index 446f5b50..ac09d0d8 100644 --- a/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch +++ b/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1900,10 +1900,6 @@ static_library("browser") { +@@ -1907,10 +1907,6 @@ static_library("browser") { "//chrome/browser/ui", "//chrome/browser/storage_access_api", "//chrome/browser/top_level_storage_access_api:permissions", @@ -13,7 +13,7 @@ # TODO(crbug.com/1030821): Eliminate usages of browser.h from Media Router. "//chrome/browser/media/router", -@@ -2013,7 +2009,6 @@ static_library("browser") { +@@ -2022,7 +2018,6 @@ static_library("browser") { "//chrome/browser/resource_coordinator:mojo_bindings", "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/resources/accessibility:resources", @@ -23,7 +23,7 @@ "//chrome/browser/safe_browsing:verdict_cache_manager_factory", --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -744,9 +744,6 @@ static_library("extensions") { +@@ -746,9 +746,6 @@ static_library("extensions") { # TODO(crbug.com/1065748): Remove this circular dependency. "//chrome/browser/web_applications/extensions", @@ -33,7 +33,7 @@ ] # Since browser and browser_extensions actually depend on each other, -@@ -759,8 +756,6 @@ static_library("extensions") { +@@ -761,8 +758,6 @@ static_library("extensions") { "//chrome/common", "//chrome/common/extensions/api", "//components/omnibox/browser", @@ -42,7 +42,7 @@ "//components/safe_browsing/core/common/proto:realtimeapi_proto", "//components/signin/core/browser", "//components/translate/content/browser", -@@ -801,7 +796,6 @@ static_library("extensions") { +@@ -803,7 +798,6 @@ static_library("extensions") { "//chrome/browser/profiles:profile", "//chrome/browser/resource_coordinator:intervention_policy_database_proto", "//chrome/browser/resource_coordinator:mojo_bindings", @@ -50,9 +50,9 @@ "//chrome/browser/safe_browsing:metrics_collector", "//chrome/browser/ui/tabs:tab_enums", "//chrome/browser/web_applications", -@@ -879,12 +873,6 @@ static_library("extensions") { - "//components/privacy_sandbox:privacy_sandbox_prefs", +@@ -884,12 +878,6 @@ static_library("extensions") { "//components/proxy_config", + "//components/reading_list/core", "//components/resources", - "//components/safe_browsing:buildflags", - "//components/safe_browsing/content/browser/web_ui:web_ui", @@ -61,11 +61,11 @@ - "//components/safe_browsing/core/common:safe_browsing_prefs", - "//components/safe_browsing/core/common/proto:csd_proto", "//components/search_engines", - "//components/services/app_service/public/cpp:app_types", + "//components/services/app_service", "//components/services/patch/content", --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -487,7 +487,6 @@ static_library("ui") { +@@ -389,7 +389,6 @@ static_library("ui") { "//chrome/browser/headless", "//components/dom_distiller/core", "//components/paint_preview/buildflags", @@ -73,7 +73,7 @@ "//components/sync", "//components/sync_user_events", "//components/translate/content/browser", -@@ -532,7 +531,6 @@ static_library("ui") { +@@ -434,7 +433,6 @@ static_library("ui") { "//chrome/browser/profiling_host", "//chrome/browser/resources:dev_ui_resources", "//chrome/browser/resources:resources", @@ -81,7 +81,7 @@ "//chrome/browser/share", "//chrome/browser/storage_access_api", "//chrome/browser/ui/side_panel:side_panel_enums", -@@ -664,16 +662,7 @@ static_library("ui") { +@@ -571,16 +569,7 @@ static_library("ui") { "//components/reading_list/features:flags", "//components/renderer_context_menu", "//components/resources", @@ -98,7 +98,7 @@ "//components/schema_org/common:improved_mojom", "//components/search", "//components/search_engines", -@@ -782,7 +771,6 @@ static_library("ui") { +@@ -689,7 +678,6 @@ static_library("ui") { # TODO(crbug.com/1158905): Remove this circular dependency. "//chrome/browser/devtools", "//chrome/browser/favicon", @@ -106,16 +106,16 @@ "//chrome/browser/profiling_host", "//chrome/browser/ui/webui:configs", ] -@@ -1945,8 +1933,6 @@ static_library("ui") { - "//chrome/browser/new_tab_page/modules/photos:mojo_bindings", +@@ -1882,8 +1870,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", - "//chrome/browser/safe_browsing", - "//chrome/browser/safe_browsing:advanced_protection", "//chrome/browser/support_tool:support_tool_proto", "//chrome/browser/ui/color:color_headers", "//chrome/browser/ui/color:mixers", -@@ -4227,7 +4213,6 @@ static_library("ui") { +@@ -4268,7 +4254,6 @@ static_library("ui") { ] deps += [ "//chrome/browser:titlebar_config", @@ -123,7 +123,7 @@ "//chrome/browser/ui/startup:buildflags", "//chrome/browser/win/conflicts:module_info", "//chrome/credential_provider/common:common_constants", -@@ -6190,26 +6175,6 @@ static_library("ui") { +@@ -6277,26 +6262,6 @@ static_library("ui") { } } @@ -152,7 +152,7 @@ } --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc -@@ -427,8 +427,12 @@ void DownloadProtectionService::ShowDeta +@@ -428,8 +428,12 @@ void DownloadProtectionService::ShowDeta Profile* profile = Profile::FromBrowserContext( content::DownloadItemUtils::GetBrowserContext(item)); if (profile && @@ -167,7 +167,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 -@@ -1036,9 +1036,13 @@ std::u16string DownloadItemNotification: +@@ -983,9 +983,13 @@ std::u16string DownloadItemNotification: } case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: { bool requests_ap_verdicts = @@ -188,10 +188,10 @@ #include "components/prefs/pref_service.h" #include "components/profile_metrics/browser_profile_type.h" +#include "components/safe_browsing/buildflags.h" + #include "components/safe_browsing/core/common/features.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/url_data_source.h" - #include "content/public/browser/web_contents.h" -@@ -63,10 +64,12 @@ content::WebUIDataSource* CreateAndAddDo +@@ -64,10 +65,12 @@ content::WebUIDataSource* CreateAndAddDo source, base::make_span(kDownloadsResources, kDownloadsResourcesSize), IDR_DOWNLOADS_DOWNLOADS_HTML); @@ -247,7 +247,7 @@ case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -6696,13 +6696,9 @@ test("unit_tests") { +@@ -6873,13 +6873,9 @@ test("unit_tests") { "//chrome/browser/renderer_host:history_swiper", "//chrome/browser/updater:browser_updater_client", "//chrome/common/notifications", @@ -263,7 +263,7 @@ # The test fetches resources which means Mac need the app bundle to exist --- a/chrome/services/file_util/BUILD.gn +++ b/chrome/services/file_util/BUILD.gn -@@ -39,10 +39,6 @@ source_set("file_util") { +@@ -40,10 +40,6 @@ source_set("file_util") { deps += [ "//components/services/filesystem/public/mojom" ] } diff --git a/patches/ungoogled-chromium/macos/fix-dsymutil.patch b/patches/ungoogled-chromium/macos/fix-dsymutil.patch index f7903dbc..ee116141 100644 --- a/patches/ungoogled-chromium/macos/fix-dsymutil.patch +++ b/patches/ungoogled-chromium/macos/fix-dsymutil.patch @@ -11,7 +11,7 @@ file_match = dsymutil_file_re.search(line) --- a/build/toolchain/apple/toolchain.gni +++ b/build/toolchain/apple/toolchain.gni -@@ -238,8 +238,9 @@ template("single_apple_toolchain") { +@@ -239,8 +239,9 @@ template("single_apple_toolchain") { if (_enable_dsyms) { dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " dsym_switch += "-Wcrl,dsymutilpath," + diff --git a/patches/ungoogled-chromium/macos/fix-visibility.patch b/patches/ungoogled-chromium/macos/fix-visibility.patch deleted file mode 100644 index 25bf00a7..00000000 --- a/patches/ungoogled-chromium/macos/fix-visibility.patch +++ /dev/null @@ -1,32 +0,0 @@ -# Fix compiling on macOS - ---- a/tools/gn/src/gn/visibility.cc -+++ b/tools/gn/src/gn/visibility.cc -@@ -80,7 +80,7 @@ std::string Visibility::Describe(int ind - return result; - } - --std::unique_ptr Visibility::AsValue() const { -+std::unique_ptr Visibility::AsValue() const { - auto res = std::make_unique(); - for (const auto& pattern : patterns_) - res->AppendString(pattern.Describe()); ---- a/tools/gn/src/gn/visibility.h -+++ b/tools/gn/src/gn/visibility.h -@@ -9,6 +9,7 @@ - #include - #include - -+#include "base/values.h" - #include "gn/label_pattern.h" - #include "gn/source_dir.h" - -@@ -52,7 +53,7 @@ class Visibility { - std::string Describe(int indent, bool include_brackets) const; - - // Returns value representation of this visibility -- std::unique_ptr AsValue() const; -+ std::unique_ptr AsValue() const; - - // Helper function to check visibility between the given two items. If - // to is invisible to from, returns false and sets the error. diff --git a/ungoogled-chromium b/ungoogled-chromium index ead4b9c5..c97db8a1 160000 --- a/ungoogled-chromium +++ b/ungoogled-chromium @@ -1 +1 @@ -Subproject commit ead4b9c5d1693d56abff6b6edf3d06602fb2e773 +Subproject commit c97db8a19733d35526485708cdd48967f904a2a7