From 908a7e51d3016cc10ef53286040f898ac259aa98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Qian=20Qian=20=22Cubik=22=E2=80=8E?= Date: Sat, 24 Feb 2024 11:36:58 -0500 Subject: [PATCH] Update to ungoogled-chromium 122.0.6261.69 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Qian Qian "Cubik"‎ --- .../macos/disable-clang-version-check.patch | 2 +- .../macos/disable-missing-clang-flags.patch | 2 +- .../disable-rust-qr-code-generator.patch | 16 ++--- .../disable-symbol-order-verification.patch | 2 +- .../macos/fix-disabling-safebrowsing.patch | 59 ++++++++----------- .../macos/no-unknown-warnings.patch | 2 +- ungoogled-chromium | 2 +- 7 files changed, 38 insertions(+), 47 deletions(-) diff --git a/patches/ungoogled-chromium/macos/disable-clang-version-check.patch b/patches/ungoogled-chromium/macos/disable-clang-version-check.patch index 6448e589..89765bf7 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 -@@ -1577,7 +1577,7 @@ config("compiler_deterministic") { +@@ -1576,7 +1576,7 @@ config("compiler_deterministic") { } config("clang_revision") { diff --git a/patches/ungoogled-chromium/macos/disable-missing-clang-flags.patch b/patches/ungoogled-chromium/macos/disable-missing-clang-flags.patch index f81487ae..cb9e54c3 100644 --- a/patches/ungoogled-chromium/macos/disable-missing-clang-flags.patch +++ b/patches/ungoogled-chromium/macos/disable-missing-clang-flags.patch @@ -1,6 +1,6 @@ --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -616,24 +616,6 @@ config("compiler") { +@@ -618,24 +618,6 @@ config("compiler") { } } diff --git a/patches/ungoogled-chromium/macos/disable-rust-qr-code-generator.patch b/patches/ungoogled-chromium/macos/disable-rust-qr-code-generator.patch index eee382e9..2cbd1f01 100644 --- a/patches/ungoogled-chromium/macos/disable-rust-qr-code-generator.patch +++ b/patches/ungoogled-chromium/macos/disable-rust-qr-code-generator.patch @@ -1,6 +1,6 @@ --- a/components/qr_code_generator/BUILD.gn +++ b/components/qr_code_generator/BUILD.gn -@@ -39,21 +39,11 @@ source_set("qr_code_generator") { +@@ -40,21 +40,11 @@ source_set("qr_code_generator") { ] deps = [ ":qr_code_generator_features", @@ -69,14 +69,14 @@ } // namespace QRCodeGenerator::QRCodeGenerator() = default; -@@ -617,10 +590,6 @@ absl::optional QRCodeGenerator::Generate( + base::span in, + absl::optional min_version) { - if (IsRustyQrCodeGeneratorFeatureEnabled()) { - return GenerateQrCodeUsingRust(in, min_version); - } - - std::vector segments; - const QRVersionInfo* version_info = nullptr; - + if (in.size() > kMaxInputSize) { + return absl::nullopt; + } diff --git a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch index b5bf8252..61674de2 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 -@@ -1289,7 +1289,7 @@ if (is_win) { +@@ -1262,7 +1262,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 818a5b5b..94333366 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 -@@ -1967,10 +1967,6 @@ static_library("browser") { +@@ -1951,10 +1951,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", -@@ -2086,7 +2082,6 @@ static_library("browser") { +@@ -2076,7 +2072,6 @@ static_library("browser") { "//chrome/browser/resource_coordinator:mojo_bindings", "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/resources/accessibility:resources", @@ -65,7 +65,7 @@ "//components/services/patch/content", --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -392,7 +392,6 @@ static_library("ui") { +@@ -405,7 +405,6 @@ static_library("ui") { "//components/cross_device/logging", "//components/dom_distiller/core", "//components/paint_preview/buildflags", @@ -73,7 +73,7 @@ "//components/sync", "//components/sync_user_events", "//components/translate/content/browser", -@@ -437,7 +436,6 @@ static_library("ui") { +@@ -452,7 +451,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", -@@ -580,17 +578,8 @@ static_library("ui") { +@@ -596,17 +594,8 @@ static_library("ui") { "//components/reading_list/features:flags", "//components/renderer_context_menu", "//components/resources", @@ -99,24 +99,15 @@ "//components/schema_org/common:improved_mojom", "//components/search", "//components/search_engines", -@@ -703,7 +692,6 @@ static_library("ui") { +@@ -720,7 +709,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", - ] -@@ -2011,8 +1999,6 @@ static_library("ui") { - "//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings", - "//chrome/browser/new_tab_page/modules/v2/tab_resumption: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", -@@ -6664,26 +6650,6 @@ static_library("ui") { + "//chrome/browser/permissions", +@@ -6774,26 +6762,6 @@ static_library("ui") { } } @@ -160,7 +151,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 -@@ -996,9 +996,13 @@ std::u16string DownloadItemNotification: +@@ -994,9 +994,13 @@ std::u16string DownloadItemNotification: } case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: { bool requests_ap_verdicts = @@ -201,7 +192,7 @@ static constexpr webui::LocalizedString kStrings[] = { --- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc +++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc -@@ -199,17 +199,18 @@ std::u16string DownloadDangerPromptViews +@@ -202,17 +202,18 @@ std::u16string DownloadDangerPromptViews download_->GetFileNameToReportUser().LossyDisplayName()); } case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: { @@ -224,7 +215,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 -@@ -1022,11 +1022,13 @@ ui::ImageModel DownloadItemView::GetIcon +@@ -1018,11 +1018,13 @@ ui::ImageModel DownloadItemView::GetIcon switch (danger_type) { case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: @@ -240,23 +231,23 @@ case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7285,13 +7285,9 @@ test("unit_tests") { - "//chrome/browser/renderer_host:history_swiper", - "//chrome/browser/updater:browser_updater_client", - "//chrome/common/notifications", -- "//chrome/common/safe_browsing:archive_analyzer_results", -- "//chrome/common/safe_browsing:disk_image_type_sniffer_mac", - "//chrome/services/mac_notifications:unit_tests", - "//chrome/services/mac_notifications/public/mojom", - "//chrome/updater:browser_sources", -- "//chrome/utility/safe_browsing", -- "//chrome/utility/safe_browsing/mac:dmg_common", - "//components/power_metrics", +@@ -7310,13 +7310,9 @@ if (!is_fuchsia) { + "//chrome/browser/renderer_host:history_swiper", + "//chrome/browser/updater:browser_updater_client", + "//chrome/common/notifications", +- "//chrome/common/safe_browsing:archive_analyzer_results", +- "//chrome/common/safe_browsing:disk_image_type_sniffer_mac", + "//chrome/services/mac_notifications:unit_tests", + "//chrome/services/mac_notifications/public/mojom", + "//chrome/updater:browser_sources", +- "//chrome/utility/safe_browsing", +- "//chrome/utility/safe_browsing/mac:dmg_common", + "//components/power_metrics", - # The test fetches resources which means Mac need the app bundle to exist + # 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 -@@ -42,10 +42,6 @@ source_set("file_util") { +@@ -44,10 +44,6 @@ source_set("file_util") { deps += [ "//components/services/filesystem/public/mojom" ] } diff --git a/patches/ungoogled-chromium/macos/no-unknown-warnings.patch b/patches/ungoogled-chromium/macos/no-unknown-warnings.patch index 3f930049..a79ec681 100644 --- a/patches/ungoogled-chromium/macos/no-unknown-warnings.patch +++ b/patches/ungoogled-chromium/macos/no-unknown-warnings.patch @@ -1,6 +1,6 @@ --- a/build/config/mac/BUILD.gn +++ b/build/config/mac/BUILD.gn -@@ -52,6 +52,8 @@ config("compiler") { +@@ -45,6 +45,8 @@ config("compiler") { if (export_libcxxabi_from_executables) { ldflags += [ "-Wl,-undefined,dynamic_lookup" ] } diff --git a/ungoogled-chromium b/ungoogled-chromium index 92da5e61..1f5ab6c0 160000 --- a/ungoogled-chromium +++ b/ungoogled-chromium @@ -1 +1 @@ -Subproject commit 92da5e61adfa9f8c97c9637a6a638a2651cd7750 +Subproject commit 1f5ab6c072cdd12bd0b915bf791f25f13fcfa26e