From e0a5517fa9d4f36af0a021cd97778401fabd2684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Qian=20Qian=20=22Cubik=22=E2=80=8E?= Date: Sun, 19 May 2024 22:34:47 -0400 Subject: [PATCH] Update to ungoogled-chromium 125.0.6422.60 (#168) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update to ungoogled-chromium 125.0.6422.60 Signed-off-by: Qian Qian "Cubik"‎ * Refresh patches & Fix safebrowsing patches Signed-off-by: Qian Qian "Cubik"‎ * ci: Use up-to-date Ninja Signed-off-by: Qian Qian "Cubik"‎ * Add another missed Ninja dependency Signed-off-by: Qian Qian "Cubik"‎ * Add another missed Ninja dependency Signed-off-by: Qian Qian "Cubik"‎ * Add fix disabling safebrowsing patch Signed-off-by: Qian Qian "Cubik"‎ --------- Signed-off-by: Qian Qian "Cubik"‎ --- .github/workflows/building.yml | 36 +++-------- downloads-arm64.ini | 2 +- downloads-x86-64.ini | 2 +- ninja.rb | 64 ------------------- patches/series | 1 + .../macos/disable-clang-version-check.patch | 2 +- .../disable-symbol-order-verification.patch | 2 +- .../macos/fix-build-with-rust.patch | 4 +- .../macos/fix-disabling-safebrowsing.patch | 62 ++++++++++++------ .../macos/fix-dsymutil.patch | 2 +- .../macos/fix-libpng-build.patch | 2 +- .../ungoogled-chromium/macos/fix-ninja.patch | 59 +++++++++++++++++ .../macos/no-unknown-warnings.patch | 2 +- retrieve_and_unpack_resource.sh | 2 +- ungoogled-chromium | 2 +- 15 files changed, 123 insertions(+), 121 deletions(-) delete mode 100644 ninja.rb create mode 100644 patches/ungoogled-chromium/macos/fix-ninja.patch diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml index 4bdb5ceb..4910edcb 100644 --- a/.github/workflows/building.yml +++ b/.github/workflows/building.yml @@ -63,9 +63,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Download resources uses: actions/download-artifact@v4 with: @@ -134,9 +132,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Unpack archive of build run: ./github_unpack_archive.sh - name: Resume Build @@ -197,9 +193,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Unpack archive of build run: ./github_unpack_archive.sh - name: Resume Build @@ -260,9 +254,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Unpack archive of build run: ./github_unpack_archive.sh - name: Resume Build @@ -323,9 +315,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Unpack archive of build run: ./github_unpack_archive.sh - name: Resume Build @@ -386,9 +376,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Unpack archive of build run: ./github_unpack_archive.sh - name: Resume Build @@ -449,9 +437,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Unpack archive of build run: ./github_unpack_archive.sh - name: Resume Build @@ -512,9 +498,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Unpack archive of build run: ./github_unpack_archive.sh - name: Resume Build @@ -575,9 +559,7 @@ jobs: with: python-version: '3.11' - name: Install dependencies - run: brew install coreutils --overwrite - - name: Install Ninja 1.11.1 # This is required as Ninja 1.12.0 fails the build - run: brew install ninja.rb + run: brew install coreutils ninja --overwrite - name: Unpack archive of build run: ./github_unpack_archive.sh - name: Resume Build diff --git a/downloads-arm64.ini b/downloads-arm64.ini index 1fb968de..82aba14b 100644 --- a/downloads-arm64.ini +++ b/downloads-arm64.ini @@ -18,7 +18,7 @@ sha512=8678a2baf8d0c1c0e74ccf64c0dfdbb634e4c99d5770f20cf670f0a725885c668d7950e31 output_path = third_party/node/mac/node-darwin-arm64 [rust] -version = 2024-02-21 +version = 2024-04-12 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-apple-darwin.tar.xz download_filename = rust-nightly-%(version)s-aarch64-apple-darwin.tar.xz output_path = third_party/rust-toolchain diff --git a/downloads-x86-64.ini b/downloads-x86-64.ini index 77dcace1..413c4b51 100644 --- a/downloads-x86-64.ini +++ b/downloads-x86-64.ini @@ -18,7 +18,7 @@ sha512=0e2ad3e108a6a2e938180ac958094476d5217e77176ecd18f6eb7f295ac2890781577c6dd output_path = third_party/node/mac/node-darwin-x64 [rust] -version = 2024-02-21 +version = 2024-04-12 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-apple-darwin.tar.xz download_filename = rust-nightly-%(version)s-x86_64-apple-darwin.tar.xz output_path = third_party/rust-toolchain diff --git a/ninja.rb b/ninja.rb deleted file mode 100644 index 1748db24..00000000 --- a/ninja.rb +++ /dev/null @@ -1,64 +0,0 @@ -class Ninja < Formula - desc "Small build system for use with gyp or CMake" - homepage "https://ninja-build.org/" - url "https://github.com/ninja-build/ninja/archive/refs/tags/v1.11.1.tar.gz" - sha256 "31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea" - license "Apache-2.0" - head "https://github.com/ninja-build/ninja.git", branch: "master" - - livecheck do - url :stable - regex(/^v?(\d+(?:\.\d+)+)$/i) - end - - bottle do - rebuild 1 - sha256 cellar: :any_skip_relocation, arm64_sonoma: "ffeafe29b18803d198ec794be40267e6df9384eb485af19197ecf29b61a1451a" - sha256 cellar: :any_skip_relocation, arm64_ventura: "f973424d56f32c88d2de08e26d2ab37c9966ab3f0b6ad5e8d36a953e24a1998e" - sha256 cellar: :any_skip_relocation, arm64_monterey: "9258efc6ef75aa56f68844ddf48f8ca050a91a45738c6715de73e5a2fe88dccf" - sha256 cellar: :any_skip_relocation, arm64_big_sur: "293c707dd52fb9136ca3d95f74e63a741a975e4589c0900e9a184bfeb90d0625" - sha256 cellar: :any_skip_relocation, sonoma: "0985f9b135ca58e18efe12665d410b08109dd215f087c22d44e02c3779d368d3" - sha256 cellar: :any_skip_relocation, ventura: "51b5d6787ffc70b7b5762942c9329d2341afacbc96c3035f5e46ade9b036af7c" - sha256 cellar: :any_skip_relocation, monterey: "7083778d561200849c37c7763032f157c66ddfdcd9f2a813a685d1fc90ca2799" - sha256 cellar: :any_skip_relocation, big_sur: "3f625fc538dbceeecebb5088bda7b3d2daa8477adb3f9653f01e3eff76983b8d" - sha256 cellar: :any_skip_relocation, x86_64_linux: "96fe0b239b3add346f8e4e2ea7e0713018f49f03e684e80706fcf4cba7b24fcb" - end - - uses_from_macos "python" => [:build, :test], since: :catalina - - # Fix `source code cannot contain null bytes` for Python 3.11.4+ - # https://github.com/ninja-build/ninja/pull/2311 - patch do - url "https://github.com/ninja-build/ninja/commit/67834978a6abdfb790dac165b8b1f1c93648e624.patch?full_index=1" - sha256 "078c7d08278aebff346b0e7490d98f3d147db88ebfa6abf34be615b5f12bdf42" - end - - def install - system "python3", "configure.py", "--bootstrap", "--verbose", "--with-python=python3" - - bin.install "ninja" - bash_completion.install "misc/bash-completion" => "ninja-completion.sh" - zsh_completion.install "misc/zsh-completion" => "_ninja" - doc.install "doc/manual.asciidoc" - elisp.install "misc/ninja-mode.el" - (share/"vim/vimfiles/syntax").install "misc/ninja.vim" - end - - test do - (testpath/"build.ninja").write <<~EOS - cflags = -Wall - - rule cc - command = gcc $cflags -c $in -o $out - - build foo.o: cc foo.c - EOS - system bin/"ninja", "-t", "targets" - port = free_port - fork do - exec bin/"ninja", "-t", "browse", "--port=#{port}", "--hostname=127.0.0.1", "--no-browser", "foo.o" - end - sleep 15 - assert_match "foo.c", shell_output("curl -s http://127.0.0.1:#{port}?foo.o") - end -end diff --git a/patches/series b/patches/series index e3b7bbd7..098f0edd 100644 --- a/patches/series +++ b/patches/series @@ -8,3 +8,4 @@ ungoogled-chromium/macos/fix-dsymutil.patch ungoogled-chromium/macos/fix-libpng-build.patch ungoogled-chromium/macos/fix-runTsc-log-info.patch ungoogled-chromium/macos/no-unknown-warnings.patch +ungoogled-chromium/macos/fix-ninja.patch diff --git a/patches/ungoogled-chromium/macos/disable-clang-version-check.patch b/patches/ungoogled-chromium/macos/disable-clang-version-check.patch index 7a985779..f26708e9 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 -@@ -1582,7 +1582,7 @@ config("compiler_deterministic") { +@@ -1600,7 +1600,7 @@ config("compiler_deterministic") { } config("clang_revision") { diff --git a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch index 6dd5e6ac..c6038ee4 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 -@@ -1257,7 +1257,7 @@ if (is_win) { +@@ -1260,7 +1260,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-build-with-rust.patch b/patches/ungoogled-chromium/macos/fix-build-with-rust.patch index 242b7331..f7e71ceb 100644 --- a/patches/ungoogled-chromium/macos/fix-build-with-rust.patch +++ b/patches/ungoogled-chromium/macos/fix-build-with-rust.patch @@ -1,6 +1,6 @@ --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn -@@ -218,8 +218,6 @@ clang_lib("compiler_builtins") { +@@ -227,8 +227,6 @@ clang_lib("compiler_builtins") { } else { libname = "ios" } @@ -23,7 +23,7 @@ # Rust targets to be rebuilt, which allows you to update your toolchain and # not break incremental builds. - rustc_version = "" -+ rustc_version = "rustc 1.78.0-nightly (bb594538f 2024-02-20)" ++ rustc_version = "rustc 1.79.0-nightly (a07f3eb43 2024-04-11)" # If you're using a Rust toolchain as specified by rust_sysroot_absolute, # you can specify whether it supports nacl here. diff --git a/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch b/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch index 1d40135d..c4c48b09 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 -@@ -1966,10 +1966,6 @@ static_library("browser") { +@@ -2005,10 +2005,6 @@ static_library("browser") { "//chrome/browser/ui", "//chrome/browser/storage_access_api", "//chrome/browser/top_level_storage_access_api:permissions", @@ -13,7 +13,7 @@ "//chrome/browser/ip_protection", # TODO(crbug.com/1030821): Eliminate usages of browser.h from Media Router. -@@ -2092,7 +2088,6 @@ static_library("browser") { +@@ -2131,7 +2127,6 @@ static_library("browser") { "//chrome/browser/resource_coordinator:mojo_bindings", "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/resources/accessibility:resources", @@ -23,17 +23,17 @@ "//chrome/browser/safe_browsing:verdict_cache_manager_factory", --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -755,9 +755,6 @@ static_library("extensions") { +@@ -757,9 +757,6 @@ static_library("extensions") { # TODO(crbug.com/1065748): Remove this circular dependency. "//chrome/browser/web_applications/extensions", - -- # TODO(crbug/925153): Remove this circular dependency. +- # TODO(crbug.com/41437292): Remove this circular dependency. - "//chrome/browser/safe_browsing", ] # Since browser and browser_extensions actually depend on each other, -@@ -770,8 +767,6 @@ static_library("extensions") { +@@ -772,8 +769,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", -@@ -811,7 +806,6 @@ static_library("extensions") { +@@ -813,7 +808,6 @@ static_library("extensions") { "//chrome/browser/profiles", "//chrome/browser/profiles:profile", "//chrome/browser/resource_coordinator:mojo_bindings", @@ -50,7 +50,7 @@ "//chrome/browser/safe_browsing:metrics_collector", "//chrome/browser/ui/tabs:tab_enums", "//chrome/browser/web_applications", -@@ -896,12 +890,6 @@ static_library("extensions") { +@@ -899,12 +893,6 @@ static_library("extensions") { "//components/proxy_config", "//components/reading_list/core", "//components/resources", @@ -65,7 +65,7 @@ "//components/services/patch/content", --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -403,7 +403,6 @@ static_library("ui") { +@@ -411,7 +411,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", -@@ -450,7 +449,6 @@ static_library("ui") { +@@ -458,7 +457,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", -@@ -597,17 +595,8 @@ static_library("ui") { +@@ -610,17 +608,8 @@ static_library("ui") { "//components/reading_list/features:flags", "//components/renderer_context_menu", "//components/resources", @@ -90,24 +90,24 @@ "//components/safe_browsing/content/browser/web_ui", - "//components/safe_browsing/core/browser/db:database_manager", - "//components/safe_browsing/core/browser/db:util", - "//components/safe_browsing/core/browser/hashprefix_realtime:hash_realtime_utils", - "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util", - "//components/safe_browsing/core/browser/tailored_security_service", - "//components/safe_browsing/core/common", - "//components/safe_browsing/core/common:safe_browsing_prefs", + "//components/safe_browsing/core/common/hashprefix_realtime:hash_realtime_utils", - "//components/safe_browsing/core/common/proto:csd_proto", "//components/schema_org/common:improved_mojom", "//components/search", "//components/search_engines", -@@ -721,7 +710,6 @@ static_library("ui") { - # TODO(crbug.com/1158905): Remove this circular dependency. +@@ -734,7 +723,6 @@ static_library("ui") { + # TODO(crbug.com/40161499): Remove this circular dependency. "//chrome/browser/devtools", "//chrome/browser/favicon", - "//chrome/browser/safe_browsing", "//chrome/browser/profiling_host", "//chrome/browser/permissions", -@@ -6863,26 +6851,6 @@ static_library("ui") { +@@ -6945,26 +6933,6 @@ static_library("ui") { } } @@ -136,7 +136,7 @@ } --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc -@@ -450,8 +450,12 @@ void DownloadProtectionService::ShowDeta +@@ -449,8 +449,12 @@ void DownloadProtectionService::ShowDeta Profile* profile = Profile::FromBrowserContext( content::DownloadItemUtils::GetBrowserContext(item)); if (profile && @@ -151,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 -@@ -991,9 +991,13 @@ std::u16string DownloadItemNotification: +@@ -969,9 +969,13 @@ std::u16string DownloadItemNotification: } case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: { bool requests_ap_verdicts = @@ -215,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 -@@ -1018,11 +1018,13 @@ ui::ImageModel DownloadItemView::GetIcon +@@ -1025,11 +1025,13 @@ ui::ImageModel DownloadItemView::GetIcon switch (danger_type) { case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: @@ -231,7 +231,7 @@ case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7299,13 +7299,9 @@ test("unit_tests") { +@@ -7337,13 +7337,9 @@ test("unit_tests") { "//chrome/browser/renderer_host:history_swiper", "//chrome/browser/updater:browser_updater_client", "//chrome/common/notifications", @@ -273,7 +273,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -2112,12 +2112,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2118,12 +2118,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kCAPlatformIntegrationEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(CHROME_CERTIFICATE_POLICIES_SUPPORTED) @@ -286,3 +286,27 @@ }; // clang-format on +--- a/chrome/browser/net/profile_network_context_service.cc ++++ b/chrome/browser/net/profile_network_context_service.cc +@@ -285,20 +285,7 @@ void UpdateCookieSettings(Profile* profi + std::unique_ptr GetWrappedCertStore( + Profile* profile, + std::unique_ptr platform_store) { +- if (!profile || !client_certificates::features:: +- IsManagedClientCertificateForUserEnabled()) { +- return platform_store; +- } +- +- auto* provisioning_service = +- client_certificates::CertificateProvisioningServiceFactory::GetForProfile( +- profile); +- if (!provisioning_service) { +- return platform_store; +- } +- +- return client_certificates::ClientCertificatesService::Create( +- provisioning_service, std::move(platform_store)); ++ return nullptr; + } + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + diff --git a/patches/ungoogled-chromium/macos/fix-dsymutil.patch b/patches/ungoogled-chromium/macos/fix-dsymutil.patch index 3a06cd57..bd95f0aa 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 -@@ -245,8 +245,9 @@ template("single_apple_toolchain") { +@@ -228,8 +228,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-libpng-build.patch b/patches/ungoogled-chromium/macos/fix-libpng-build.patch index 51c58dcb..4547c358 100644 --- a/patches/ungoogled-chromium/macos/fix-libpng-build.patch +++ b/patches/ungoogled-chromium/macos/fix-libpng-build.patch @@ -1,6 +1,6 @@ --- a/third_party/libpng/BUILD.gn +++ b/third_party/libpng/BUILD.gn -@@ -100,6 +100,12 @@ source_set("libpng_sources") { +@@ -101,6 +101,12 @@ source_set("libpng_sources") { cflags += [ "/wd4146" ] } diff --git a/patches/ungoogled-chromium/macos/fix-ninja.patch b/patches/ungoogled-chromium/macos/fix-ninja.patch new file mode 100644 index 00000000..a5eb5e9b --- /dev/null +++ b/patches/ungoogled-chromium/macos/fix-ninja.patch @@ -0,0 +1,59 @@ +--- a/content/browser/BUILD.gn ++++ b/content/browser/BUILD.gn +@@ -72,6 +72,7 @@ source_set("browser") { + "//cc/animation", + "//cc/mojo_embedder", + "//cc/paint", ++ "//chrome/common:buildflags", + "//components/attribution_reporting:mojom", + "//components/back_forward_cache:enum", + "//components/browsing_topics/common:common", +@@ -82,6 +83,7 @@ source_set("browser") { + "//components/download/public/common:public", + "//components/file_access", + "//components/filename_generation", ++ "//components/lens:buildflags", + "//components/link_header_util", + "//components/metrics", + "//components/metrics:single_sample_metrics", +--- a/chrome/common/BUILD.gn ++++ b/chrome/common/BUILD.gn +@@ -604,6 +604,7 @@ static_library("url_constants") { + "//components/optimization_guide/optimization_guide_internals/webui:url_constants", + "//components/password_manager/content/common", + "//components/safe_browsing/core/common", ++ "//components/supervised_user/core/common:buildflags", + "//device/vr/buildflags", + ] + } +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -122,7 +122,7 @@ def main(argv): + + shutil.copy2( + os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) +- cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'] ++ cmd = [ninja_binary, '-C', gn_build_dir, 'gn'] + if options.jobs: + cmd += ['-j', str(options.jobs)] + subprocess.check_call(cmd) +--- a/chrome/browser/devtools/BUILD.gn ++++ b/chrome/browser/devtools/BUILD.gn +@@ -115,6 +115,7 @@ static_library("devtools") { + "//chrome/browser/autofill:autofill", + "//components/autofill/content/browser:browser", + "//components/autofill/core/browser:browser", ++ "//components/enterprise/buildflags", + "//components/paint_preview/buildflags:buildflags", + "//components/variations/service:service", + "//components/webapps/common:common", +--- a/chrome/browser/extensions/BUILD.gn ++++ b/chrome/browser/extensions/BUILD.gn +@@ -893,6 +893,7 @@ static_library("extensions") { + "//components/proxy_config", + "//components/reading_list/core", + "//components/resources", ++ "//components/safe_browsing/content/common/proto:download_file_types_proto", + "//components/search_engines", + "//components/services/app_service", + "//components/services/patch/content", diff --git a/patches/ungoogled-chromium/macos/no-unknown-warnings.patch b/patches/ungoogled-chromium/macos/no-unknown-warnings.patch index a79ec681..236db70c 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 -@@ -45,6 +45,8 @@ config("compiler") { +@@ -44,6 +44,8 @@ config("compiler") { if (export_libcxxabi_from_executables) { ldflags += [ "-Wl,-undefined,dynamic_lookup" ] } diff --git a/retrieve_and_unpack_resource.sh b/retrieve_and_unpack_resource.sh index 1bf571ee..96a0645d 100755 --- a/retrieve_and_unpack_resource.sh +++ b/retrieve_and_unpack_resource.sh @@ -39,7 +39,7 @@ _rust_lib_dir="$_rust_dir/rust-std-$_rust_name/lib/rustlib/$_rust_name/lib" _rustc_dir="$_rust_dir/rustc" _rustc_lib_dir="$_rust_dir/rustc/lib/rustlib/$_rust_name/lib" -echo "rustc 1.78.0-nightly (bb594538f 2024-02-20)" > "$_rust_flag_file" +echo "rustc 1.79.0-nightly (a07f3eb43 2024-04-11)" > "$_rust_flag_file" mkdir $_rust_bin_dir ln -s "$_rust_dir/rustc/bin/rustc" "$_rust_bin_dir/rustc" diff --git a/ungoogled-chromium b/ungoogled-chromium index 7fb6cc3d..168c744d 160000 --- a/ungoogled-chromium +++ b/ungoogled-chromium @@ -1 +1 @@ -Subproject commit 7fb6cc3d813ed995647db36a608a192e0e0cc0b1 +Subproject commit 168c744dcff0f4cf2ca4622eea92a53413f6a176