Update to ungoogled-chromium 126.0.6478.61 (#171)

* Update to ungoogled-chromium 126.0.6478.55 Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * Refresh Patches Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * Remove Ninja Patch Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * build: Update LLVM Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * Add Rust allocator fix patch Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * build: Update LLVM to 18.1.7 Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * build: Disable ThinLTO Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * Update to ungoogled-chromium 126.0.6478.61 Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> * build: Fix LLVM 18.1.7 x86-64 sha Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top> --------- Signed-off-by: Qian Qian "Cubik"‎ <cubik65536@cubik65536.top>
ungoogled-software · Jun 18, 2024 · bd0871a · bd0871a
1 parent c86ec39
commit bd0871a
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 127 deletions.
diff --git a/downloads-arm64.ini b/downloads-arm64.ini
@@ -2,11 +2,11 @@
 
 # Pre-built LLVM toolchain for convenience
 [llvm]
-version = 18.1.1
+version = 18.1.7
 url = https://github.com/iXORTech/llvm-macos-buildbot/releases/download/%(version)s-arm64/clang+llvm-%(version)s-arm64-apple-darwin21.0.tar.xz
 download_filename = clang+llvm-%(version)s-arm64-apple-darwin21.0.tar.xz
 strip_leading_dirs = clang+llvm-%(version)s-arm64-apple-darwin21.0
-sha512 = cac83e7ea93aba6eb9c9f8623ada0b7fcaf9fb8c9fc79e2313be26e8013235a8ed07c0b9e2d2b7f7e86c71c16e407953ad5e4d3304f55024bbb3cf1fe1901806
+sha512 = 62f20152da26d92650a08c207d22f6b3fbec72ee4e8711b4e61d48e02a09f1a19a8ca3937e5786bc54bc71fcfe895ec6b898f0112a1a07753ee8bbebd8a35da5
 output_path = third_party/llvm-build/Release+Asserts
 
 [nodejs]
@@ -18,7 +18,7 @@ sha512=8678a2baf8d0c1c0e74ccf64c0dfdbb634e4c99d5770f20cf670f0a725885c668d7950e31
 output_path = third_party/node/mac/node-darwin-arm64
 
 [rust]
-version = 2024-04-12
+version = 2024-04-25
 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
@@ -2,11 +2,11 @@
 
 # Pre-built LLVM toolchain for convenience
 [llvm]
-version = 18.1.1
+version = 18.1.7
 url = https://github.com/iXORTech/llvm-macos-buildbot/releases/download/%(version)s-x86-64/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 = 6fda58ee638f5335f39d7ef401a2cdbc5ab95389e1a695e4d6538afb8b145f0fda32fd7626bade0e6c640fcb806f960f7366852b601109c4af4abe53f2026e66
+sha512 = 15b130f699fcc8014b1fdbba414eda93240efd0f2c6d9debb3d9ff9c2ea94e723ce4f83e0c24aa289df5193acdf8c8f367dcb02aab80c5237f1775e8bb5a90f9
 output_path = third_party/llvm-build/Release+Asserts
 
 [nodejs]
@@ -18,7 +18,7 @@ sha512=0e2ad3e108a6a2e938180ac958094476d5217e77176ecd18f6eb7f295ac2890781577c6dd
 output_path = third_party/node/mac/node-darwin-x64
 
 [rust]
-version = 2024-04-12
+version = 2024-04-25
 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/flags.macos.gn b/flags.macos.gn
@@ -12,3 +12,4 @@ is_official_build=true
 proprietary_codecs=true
 symbol_level=0
 use_sysroot=false
+use_thin_lto=false
diff --git a/patches/series b/patches/series
@@ -8,4 +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
+ungoogled-chromium/macos/rust-alloc-fix.patch
diff --git 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
-@@ -1600,7 +1600,7 @@ config("compiler_deterministic") {
+@@ -1575,7 +1575,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
@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1260,7 +1260,7 @@ if (is_win) {
+@@ -1261,7 +1261,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
@@ -1,6 +1,6 @@
 --- a/build/config/clang/BUILD.gn
 +++ b/build/config/clang/BUILD.gn
-@@ -227,8 +227,6 @@ clang_lib("compiler_builtins") {
+@@ -229,8 +229,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.79.0-nightly (a07f3eb43 2024-04-11)"
++  rustc_version = "rustc 1.79.0-nightly (ef8b9dcf2 2024-04-24)"
 
    # 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-clang-format-path.patch b/patches/ungoogled-chromium/macos/fix-clang-format-path.patch
@@ -1,12 +1,19 @@
 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
 +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
-@@ -42,9 +42,16 @@ def init(root_src_dir, enable_style_form
-     buildtools_platform_dir = os.path.join(root_src_dir, "buildtools",
-                                            platform)
+@@ -49,16 +49,16 @@ def init(root_src_dir, enable_style_form
+     new_buildtools_platform_dir = os.path.join(
+         root_src_dir, "buildtools", platform + new_path_platform_suffix)
 
+-    # TODO(b/328065301): Remove old_path once clang hooks are migrated
 -    # //buildtools/<platform>/clang-format
--    _clang_format_command_path = os.path.join(
--        buildtools_platform_dir, "clang-format{}".format(exe_suffix))
+-    old_path = os.path.join(buildtools_platform_dir,
+-                            "clang-format{}".format(exe_suffix))
+-    # //buildtools/<platform>/format/clang-format
+-    new_path = os.path.join(new_buildtools_platform_dir, "format",
+-                            "clang-format{}".format(exe_suffix))
+-    for path in [new_path, old_path]:
+-        if os.path.isfile(path):
+-            _clang_format_command_path = path
 +    _clang_format_command_path = ""
 +    try:
 +        # try to get system clang-format

diff --git 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
-@@ -2005,10 +2005,6 @@ static_library("browser") {
+@@ -2008,10 +2008,6 @@ static_library("browser") {
      "//chrome/browser/ui",
      "//chrome/browser/storage_access_api",
      "//chrome/browser/top_level_storage_access_api:permissions",
@@ -12,8 +12,8 @@
 -    "//chrome/browser/safe_browsing:metrics_collector",
      "//chrome/browser/ip_protection",
 
-     # TODO(crbug.com/1030821): Eliminate usages of browser.h from Media Router.
-@@ -2131,7 +2127,6 @@ static_library("browser") {
+     # TODO(crbug.com/40110173): Eliminate usages of browser.h from Media Router.
+@@ -2139,7 +2135,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
-@@ -757,9 +757,6 @@ static_library("extensions") {
+@@ -767,9 +767,6 @@ static_library("extensions") {
 
-     # TODO(crbug.com/1065748): Remove this circular dependency.
+     # TODO(crbug.com/40124309): Remove this circular dependency.
      "//chrome/browser/web_applications/extensions",
 -
 -    # TODO(crbug.com/41437292): Remove this circular dependency.
 -    "//chrome/browser/safe_browsing",
    ]
 
    # Since browser and browser_extensions actually depend on each other,
-@@ -772,8 +769,6 @@ static_library("extensions") {
+@@ -782,8 +779,6 @@ static_library("extensions") {
      "//chrome/common",
      "//chrome/common/extensions/api",
      "//components/omnibox/browser",
@@ -42,46 +42,33 @@
      "//components/safe_browsing/core/common/proto:realtimeapi_proto",
      "//components/signin/core/browser",
      "//components/translate/content/browser",
-@@ -813,7 +808,6 @@ static_library("extensions") {
+@@ -826,7 +821,6 @@ static_library("extensions") {
      "//chrome/browser/profiles",
      "//chrome/browser/profiles:profile",
      "//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",
-@@ -899,12 +893,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",
--    "//components/safe_browsing/core/browser/db:database_manager",
--    "//components/safe_browsing/core/common",
--    "//components/safe_browsing/core/common:safe_browsing_prefs",
--    "//components/safe_browsing/core/common/proto:csd_proto",
-     "//components/search_engines",
-     "//components/services/app_service",
-     "//components/services/patch/content",
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -411,7 +411,6 @@ static_library("ui") {
+@@ -413,7 +413,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",
-@@ -458,7 +457,6 @@ static_library("ui") {
+@@ -461,7 +460,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",
-@@ -610,17 +608,8 @@ static_library("ui") {
+     "//chrome/browser/themes",
+@@ -617,17 +615,8 @@ static_library("ui") {
      "//components/reading_list/features:flags",
      "//components/renderer_context_menu",
      "//components/resources",
@@ -99,15 +86,15 @@
      "//components/schema_org/common:improved_mojom",
      "//components/search",
      "//components/search_engines",
-@@ -734,7 +723,6 @@ static_library("ui") {
+@@ -745,7 +734,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",
-@@ -6945,26 +6933,6 @@ static_library("ui") {
+@@ -7021,26 +7009,6 @@ static_library("ui") {
      }
    }
 
@@ -167,15 +154,15 @@
                ? IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION
 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
 +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
-@@ -39,6 +39,7 @@
+@@ -41,6 +41,7 @@
  #include "components/history/core/common/pref_names.h"
  #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 "components/strings/grit/components_strings.h"
  #include "content/public/browser/download_manager.h"
-@@ -68,10 +69,12 @@ content::WebUIDataSource* CreateAndAddDo
+@@ -70,10 +71,12 @@ content::WebUIDataSource* CreateAndAddDo
        source, base::make_span(kDownloadsResources, kDownloadsResourcesSize),
        IDR_DOWNLOADS_DOWNLOADS_HTML);
 
@@ -215,7 +202,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
-@@ -1025,11 +1025,13 @@ ui::ImageModel DownloadItemView::GetIcon
+@@ -1020,11 +1020,13 @@ ui::ImageModel DownloadItemView::GetIcon
 
    switch (danger_type) {
      case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
@@ -231,7 +218,7 @@
      case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7337,13 +7337,9 @@ test("unit_tests") {
+@@ -7414,13 +7414,9 @@ test("unit_tests") {
        "//chrome/browser/renderer_host:history_swiper",
        "//chrome/browser/updater:browser_updater_client",
        "//chrome/common/notifications",
@@ -258,31 +245,17 @@
    if (safe_browsing_mode == 1) {
      sources += [
        "safe_archive_analyzer.cc",
---- a/chrome/browser/enterprise/connectors/connectors_prefs.cc
-+++ b/chrome/browser/enterprise/connectors/connectors_prefs.cc
-@@ -69,10 +69,6 @@ void RegisterProfilePrefs(PrefRegistrySi
- #endif
-   registry->RegisterIntegerPref(kOnSecurityEventScopePref, 0);
-   RegisterDeviceTrustConnectorProfilePrefs(registry);
--
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
--  client_certificates::RegisterProfilePrefs(registry);
--#endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
- }
-
- void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -2118,12 +2118,6 @@ const PolicyToPreferenceMapEntry kSimple
-     prefs::kCAPlatformIntegrationEnabled,
-     base::Value::Type::BOOLEAN },
+@@ -2124,11 +2124,6 @@ const PolicyToPreferenceMapEntry kSimple
+ #endif
  #endif // BUILDFLAG(CHROME_CERTIFICATE_POLICIES_SUPPORTED)
--
+ 
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 -  { key::kProvisionManagedClientCertificateForUser,
 -    client_certificates::prefs::kProvisionManagedClientCertificateForUserPrefs,
 -    base::Value::Type::INTEGER },
 -#endif  //
- };
- // clang-format on
-
+ #if !BUILDFLAG(IS_ANDROID)
+   { key::kLensOverlaySettings,
+     lens::prefs::kLensOverlaySettings,
diff --git a/patches/ungoogled-chromium/macos/fix-ninja.patch b/patches/ungoogled-chromium/macos/fix-ninja.patch
diff --git a/patches/ungoogled-chromium/macos/rust-alloc-fix.patch b/patches/ungoogled-chromium/macos/rust-alloc-fix.patch
@@ -0,0 +1,11 @@
+--- a/build/toolchain/gcc_toolchain.gni
++++ b/build/toolchain/gcc_toolchain.gni
+@@ -629,7 +629,7 @@ template("single_gcc_toolchain") {
+         start_group_flag = "-Wl,--start-group"
+         end_group_flag = "-Wl,--end-group "
+       }
+-      link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" {{solibs}} $end_group_flag {{libs}} {{rlibs}}"
++      link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" $end_group_flag {{solibs}} {{libs}} $start_group_flag {{rlibs}} $end_group_flag"
+
+       # Generate a map file to be used for binary size analysis.
+       # Map file adds ~10% to the link time on a z620.
diff --git 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.79.0-nightly (a07f3eb43 2024-04-11)" > "$_rust_flag_file"
+echo "rustc 1.79.0-nightly (ef8b9dcf2 2024-04-24)" > "$_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