diff --git a/flags.macos.gn b/flags.macos.gn index c5208355..bd294da6 100644 --- a/flags.macos.gn +++ b/flags.macos.gn @@ -1,5 +1,4 @@ blink_symbol_level=0 -chrome_pgo_phase=0 enable_iterator_debugging=false enable_swiftshader=true fatal_linker_warnings=false diff --git a/patches/debian_buster/fixes/as-needed.patch b/patches/debian_buster/fixes/as-needed.patch index 791090de..b8d6a99c 100644 --- a/patches/debian_buster/fixes/as-needed.patch +++ b/patches/debian_buster/fixes/as-needed.patch @@ -3,7 +3,7 @@ author: Michael Gilbert --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -396,7 +396,7 @@ config("compiler") { +@@ -392,7 +392,7 @@ config("compiler") { if (!using_sanitizer) { ldflags += [ "-Wl,-z,defs", diff --git a/patches/debian_buster/fixes/mojo.patch b/patches/debian_buster/fixes/mojo.patch index d6db15ec..778238c7 100644 --- a/patches/debian_buster/fixes/mojo.patch +++ b/patches/debian_buster/fixes/mojo.patch @@ -3,15 +3,7 @@ author: Michael Gilbert --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -185,7 +185,6 @@ if (support_web_tests) { - "//content/browser:for_content_tests", # For non-component builds. - "//content/public/browser", # For component builds. - "//content/test:blink_test_browser_support", -- "//content/test:mojo_web_test_bindings", - "//content/test:test_support", - "//device/bluetooth:fake_bluetooth", - "//device/bluetooth:mocks", -@@ -505,7 +504,6 @@ static_library("content_shell_lib") { +@@ -226,7 +226,6 @@ static_library("content_shell_lib") { "//content/app/resources", "//content/public/common", "//content/public/common:service_names", diff --git a/patches/debian_buster/warnings/int-in-bool-context.patch b/patches/debian_buster/warnings/int-in-bool-context.patch index 1f3a684a..10190bc2 100644 --- a/patches/debian_buster/warnings/int-in-bool-context.patch +++ b/patches/debian_buster/warnings/int-in-bool-context.patch @@ -14,7 +14,7 @@ author: Michael Gilbert filter_->CopyMem16x16(mb_src, stride_src, mb_dst, stride_dst); --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -16520,7 +16520,8 @@ bool GLES2DecoderImpl::GetUniformSetup(G +@@ -16519,7 +16519,8 @@ bool GLES2DecoderImpl::GetUniformSetup(G } uint32_t checked_size = 0; if (!SizedResult::ComputeSize(num_elements).AssignIfValid(&checked_size)) { @@ -26,7 +26,7 @@ author: Michael Gilbert if (!result) { --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc -@@ -318,15 +318,16 @@ void RenderWidgetHostViewBase::SetBackgr +@@ -294,15 +294,16 @@ void RenderWidgetHostViewBase::SetBackgr if (default_background_color_ == color) return; diff --git a/patches/series b/patches/series index 26d823bf..faa1d71d 100644 --- a/patches/series +++ b/patches/series @@ -13,7 +13,6 @@ ungoogled-chromium/macos/disable-symbol-order-verification.patch ungoogled-chromium/macos/disable-crashpad-handler.patch ungoogled-chromium/macos/fix-disabling-safebrowsing.patch ungoogled-chromium/macos/fix-visibility.patch -ungoogled-chromium/macos/suppress-newer-clang-warning-flags.patch ungoogled-chromium/macos/fix-dsymutil.patch ungoogled-chromium/macos/fix-clang-format-path.patch ungoogled-chromium/fix-node-path.patch diff --git a/patches/ungoogled-chromium/macos/disable-crashpad-handler.patch b/patches/ungoogled-chromium/macos/disable-crashpad-handler.patch index e83b468e..dd18ef47 100644 --- a/patches/ungoogled-chromium/macos/disable-crashpad-handler.patch +++ b/patches/ungoogled-chromium/macos/disable-crashpad-handler.patch @@ -2,7 +2,7 @@ --- a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc +++ b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc -@@ -124,61 +124,7 @@ class HandlerStarter final : public Noti +@@ -125,61 +125,7 @@ class HandlerStarter final : public Noti const std::map& annotations, const std::vector& arguments, bool restartable) { @@ -65,21 +65,22 @@ } // NotifyServer::DefaultInterface: -@@ -451,23 +397,7 @@ bool CrashpadClient::StartHandler( +@@ -452,24 +398,7 @@ bool CrashpadClient::StartHandler( // Attachments are not implemented on MacOS yet. DCHECK(attachments.empty()); - // The “restartable” behavior can only be selected on OS X 10.10 and later. In - // previous OS versions, if the initial client were to crash while attempting - // to restart the handler, it would become an unkillable process. -- base::mac::ScopedMachSendRight exception_port( -- HandlerStarter::InitialStart(handler, -- database, -- metrics_dir, -- url, -- annotations, -- arguments, -- restartable && MacOSXMinorVersion() >= 10)); +- base::mac::ScopedMachSendRight exception_port(HandlerStarter::InitialStart( +- handler, +- database, +- metrics_dir, +- url, +- annotations, +- arguments, +- restartable && (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10 || +- MacOSVersionNumber() >= 10'10'00))); - if (!exception_port.is_valid()) { - return false; - } diff --git a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch index d5ddcdd7..7b64fdcb 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 -@@ -1031,7 +1031,7 @@ if (is_win) { +@@ -1044,7 +1044,7 @@ if (is_win) { assert(_framework_binary_path != "", "Ignore configuration-dependent unused variable warning") diff --git a/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch b/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch index 7847ac9f..462a366b 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 -@@ -1827,7 +1827,6 @@ static_library("browser") { +@@ -1838,7 +1838,6 @@ static_library("browser") { allow_circular_includes_from = [ "//chrome/browser/ui", "//chrome/browser/ui/webui/bluetooth_internals", @@ -10,15 +10,15 @@ ] public_deps = [ -@@ -1892,7 +1891,6 @@ static_library("browser") { +@@ -1913,7 +1912,6 @@ static_library("browser") { "//chrome/browser/reputation:proto", "//chrome/browser/resource_coordinator:mojo_bindings", "//chrome/browser/resource_coordinator:tab_manager_features", - "//chrome/browser/safe_browsing", - "//chrome/browser/sharing:buildflags", - "//chrome/browser/sharing/proto", - "//chrome/browser/storage_access_api:permissions", -@@ -4709,13 +4707,6 @@ static_library("browser") { + "//chrome/browser/safe_browsing:advanced_protection", + "//chrome/browser/safe_browsing:url_lookup_service_factory", + "//chrome/browser/search/shopping_tasks:mojo_bindings", +@@ -5012,13 +5010,6 @@ static_library("browser") { ] } @@ -34,7 +34,7 @@ "crash_upload_list/crash_upload_list_crashpad.cc", --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -733,9 +733,6 @@ static_library("extensions") { +@@ -728,9 +728,6 @@ static_library("extensions") { # TODO(crbug.com/1065748): Remove this circular dependency. "//chrome/browser/web_applications/extensions", @@ -44,25 +44,25 @@ ] # Since browser and browser_extensions actually depend on each other, -@@ -747,9 +744,7 @@ static_library("extensions") { - "//chrome/browser/extensions/api:api_registration", +@@ -743,9 +740,7 @@ static_library("extensions") { "//chrome/common", "//chrome/common/extensions/api", + "//components/omnibox/browser", - "//components/safe_browsing/core:csd_proto", "//components/safe_browsing/core:webprotect_proto", - "//components/safe_browsing/core/db:util", "//components/signin/core/browser", + "//components/translate/content/browser", "//content/public/browser", - "//mojo/public/cpp/bindings", -@@ -777,7 +772,6 @@ static_library("extensions") { - "//chrome/browser/nearby_sharing/common", +@@ -773,7 +768,6 @@ static_library("extensions") { + "//chrome/browser/media/router/discovery", "//chrome/browser/resource_coordinator:intervention_policy_database_proto", "//chrome/browser/resource_coordinator:mojo_bindings", - "//chrome/browser/safe_browsing", "//chrome/browser/web_applications", "//chrome/browser/web_applications/components", -@@ -832,12 +826,6 @@ static_library("extensions") { +@@ -827,12 +821,6 @@ static_library("extensions") { "//components/proxy_config", "//components/rappor", "//components/resources", @@ -77,7 +77,7 @@ "//components/services/patch/content", --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -317,15 +317,9 @@ static_library("ui") { +@@ -313,15 +313,9 @@ static_library("ui") { ] } @@ -94,7 +94,7 @@ defines = [] libs = [] -@@ -342,7 +336,6 @@ static_library("ui") { +@@ -338,7 +332,6 @@ static_library("ui") { public_deps = [ "//chrome/services/machine_learning:machine_learning_tflite_buildflags", "//components/dom_distiller/core", @@ -102,7 +102,7 @@ "//components/sync", "//components/sync_user_events", "//components/translate/content/browser", -@@ -380,7 +373,6 @@ static_library("ui") { +@@ -375,7 +368,6 @@ static_library("ui") { "//chrome/browser/resources/omnibox:resources", "//chrome/browser/resources/quota_internals:quota_internals_resources", "//chrome/browser/resources/usb_internals:resources", @@ -110,7 +110,7 @@ "//chrome/browser/ui/webui/bluetooth_internals", "//chrome/browser/ui/webui/downloads:mojo_bindings", "//chrome/browser/ui/webui/interventions_internals:mojo_bindings", -@@ -482,17 +474,7 @@ static_library("ui") { +@@ -477,17 +469,7 @@ static_library("ui") { "//components/reading_list/core", "//components/renderer_context_menu", "//components/resources", @@ -128,15 +128,15 @@ "//components/schema_org/common:improved_mojom", "//components/search", "//components/search_engines", -@@ -1515,7 +1497,6 @@ static_library("ui") { +@@ -1510,7 +1492,6 @@ static_library("ui") { "//chrome/browser/promo_browser_command:mojo_bindings", "//chrome/browser/resource_coordinator:tab_metrics_event_proto", "//chrome/browser/resource_coordinator/tab_ranker", - "//chrome/browser/safe_browsing:advanced_protection", + "//chrome/browser/search/shopping_tasks:mojo_bindings", "//chrome/browser/ui/color:color_headers", "//chrome/browser/ui/color:mixers", - "//chrome/browser/ui/webui/app_management:mojo_bindings", -@@ -3067,7 +3048,6 @@ static_library("ui") { +@@ -3142,7 +3123,6 @@ static_library("ui") { "//ui/views/controls/webview", ] deps += [ @@ -144,7 +144,7 @@ "//chrome/browser/ui/startup:buildflags", "//chrome/browser/win/conflicts:module_info", "//chrome/credential_provider/common:common_constants", -@@ -4392,15 +4372,6 @@ static_library("ui") { +@@ -4462,15 +4442,6 @@ static_library("ui") { } } @@ -162,7 +162,7 @@ } --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -1467,10 +1467,10 @@ void Browser::OnDidBlockNavigation( +@@ -1475,10 +1475,10 @@ void Browser::OnDidBlockNavigation( framebust_helper->AddBlockedUrl(blocked_url, base::BindOnce(on_click)); } } @@ -273,7 +273,7 @@ return l10n_util::GetStringFUTF16( --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc -@@ -998,11 +998,13 @@ ui::ImageModel DownloadItemView::GetIcon +@@ -975,11 +975,13 @@ ui::ImageModel DownloadItemView::GetIcon const auto danger_type = model_->GetDangerType(); switch (danger_type) { case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: @@ -289,7 +289,7 @@ case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -5177,10 +5177,12 @@ ChromeContentBrowserClient::GetUrlLookup +@@ -5197,10 +5197,12 @@ ChromeContentBrowserClient::GetUrlLookup } #endif diff --git a/patches/ungoogled-chromium/macos/fix-dsymutil.patch b/patches/ungoogled-chromium/macos/fix-dsymutil.patch index 33d1a1df..0f4b5ea9 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/mac/BUILD.gn +++ b/build/toolchain/mac/BUILD.gn -@@ -185,8 +185,7 @@ template("mac_toolchain") { +@@ -198,8 +198,7 @@ template("mac_toolchain") { if (_enable_dsyms) { dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " dsym_switch += "-Wcrl,dsymutilpath," + diff --git a/patches/ungoogled-chromium/macos/suppress-newer-clang-warning-flags.patch b/patches/ungoogled-chromium/macos/suppress-newer-clang-warning-flags.patch deleted file mode 100644 index 695335e1..00000000 --- a/patches/ungoogled-chromium/macos/suppress-newer-clang-warning-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Suppresses flags not supported by the version of clang we are using - ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -1533,9 +1533,6 @@ config("default_warnings") { - - # TODO(https://crbug.com/1050281): Clean up, enable. - "-Wno-non-c-typedef-for-linkage", -- -- # TODO(https://crbug.com/1114873): Clean up, enable. -- "-Wno-string-concatenation", - ] - - cflags_c += [ diff --git a/ungoogled-chromium b/ungoogled-chromium index 091fa30d..1f7cdef6 160000 --- a/ungoogled-chromium +++ b/ungoogled-chromium @@ -1 +1 @@ -Subproject commit 091fa30d2c02f6c6895a2b5e5b312aee262cca67 +Subproject commit 1f7cdef6dfa8f612afde8f988131f210612333e0