Merge pull request #466 from teeminus/update

Author: teeminus

domain_substitution.list

@@ -21,13 +21,13 @@
 #   `http://prereleases.llvm.org/win-snapshots/LLVM-9.8.7-r123456-win64.exe`
 #   (link derived from [LLVM Snapshot Builds](http://llvm.org/builds/))
 [llvm]
-version = 20.1.5
+version = 20.1.7
 #Uncomment when pre-release version is used.
 #url = https://prereleases.llvm.org/win-snapshots/LLVM-%(version)s-win64.exe
 #Uncomment the below instead when a new enough stable version of LLVM comes around
 url = https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s/LLVM-%(version)s-win64.exe
 download_filename = LLVM-%(version)s-win64.exe
-sha512 = 2a8c86f5e17251303eb3e876f52711618abac59a4bd041e15f62893b73b30dab76af7d91018481ea1b472aa17f46891ed9c3b402be88d35a79ca0897eeddbd02
+sha512 = 0e5e3dbd2e7ae4731d0e553159e7e60de9c003e3ba4dd3b2e663ce87b939be0cfe694990475855214a980fabf0d3566f701d0071f8583cbe088d30e0602dd137
 extractor = 7z
 output_path = third_party/llvm-build/Release+Asserts
 
@@ -78,10 +78,10 @@ output_path = third_party/ninja
 
 # Pre-built git
 [git]
-version = 2.49.0
+version = 2.50.0
 url =  https://github.com/git-for-windows/git/releases/download/v%(version)s.windows.1/PortableGit-%(version)s-64-bit.7z.exe
 download_filename = PortableGit-%(version)s-64-bit.7z.exe
-sha512 = 7a91e563bf87ef09ee62c03b005ccadcc6565d36ac09f2397f773c1740a01dc6d3595d3a0afeeff2f86cb334267a6fd2ebf7b15666c623fae39aec477716e8a8
+sha256 = 0a16ff4699b62f171309dca221bd90f0dad5d4e68668d49b3ef0889bcb6da370
 extractor = 7z
 output_path = third_party/git
 
@@ -115,24 +115,24 @@ strip_leading_dirs=DirectX-Headers-%(version)s
 
 # Rust
 [rust-x64]
-version = 2025-04-21
+version = 2025-05-06
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-pc-windows-msvc.tar.gz
 download_filename = rust-nightly-%(version)s-x86_64-pc-windows-msvc.tar.gz
-sha512 = c48d2a459ec87cf12b92b2434f2397c01961dd554f3d01aef1ef773ea69630ceede33fe17b60de580064f746fae9eac5d6637b9f561a0856fb2b11dfbe3edbf6
+sha512 = de63764d4f80df2f39b416444ca675a802afd5f0d080953940c72c25edba32e7e7647bb36ca979a32433870262b6a8c39b659c1f595f5cf7efa73a34a7c89ce6
 output_path = third_party/rust-toolchain-x64
 strip_leading_dirs=rust-nightly-x86_64-pc-windows-msvc
 [rust-x86]
-version = 2025-04-21
+version = 2025-05-06
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-i686-pc-windows-msvc.tar.gz
 download_filename = rust-nightly-%(version)s-i686-pc-windows-msvc.tar.gz
-sha512 = 26693974db960f755306ca528a1fc276bf4f12e57c31d0127061810e0825dd6615d53d3df067661ad6a2778628e6ed6414976287febbd58cdc8cd4e4a09abe33
+sha512 = 2fab19df4d8881ea78c3e934bbbc0fdb4b6d717eab622c64797c25b0a089b7b20ad3cb9e6171043483afcbdad9f45a149cd5837b797abea4e3f1e9ea3bd88d07
 output_path = third_party/rust-toolchain-x86
 strip_leading_dirs=rust-nightly-i686-pc-windows-msvc
 [rust-arm]
-version = 2025-04-21
+version = 2025-05-06
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-pc-windows-msvc.tar.gz
 download_filename = rust-nightly-%(version)s-aarch64-pc-windows-msvc.tar.gz
-sha512 = 2129e13f57b787370febdda68898259f3023a44853c663a306482f6e8560999b1765f5994f721165d93ecaf1756cff3d47dc73148d6690c31a275389d59d7702
+sha512 = c53dabf46a5939771f3c105460e68d767ba4d705f4da3a350124bd3d28427ef35b6fa9e14b44392f63631a7d736d9da7b517ed4c7e891ed97a2b80e2984f92ad
 output_path = third_party/rust-toolchain-arm
 strip_leading_dirs=rust-nightly-aarch64-pc-windows-msvc
 [rust-windows-create]

downloads.ini

@@ -1,6 +1,6 @@
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1634,8 +1634,7 @@ config("compiler_deterministic") {
+@@ -1683,8 +1683,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_revision") {

patches/ungoogled-chromium/windows/windows-disable-clang-version-check.patch

@@ -1,6 +1,6 @@
 --- a/components/download/internal/common/download_item_impl.cc
 +++ b/components/download/internal/common/download_item_impl.cc
-@@ -2499,7 +2499,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2508,7 +2508,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }

patches/ungoogled-chromium/windows/windows-disable-download-warning-prompt.patch

@@ -3,15 +3,15 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -124,7 +124,6 @@ source_set("request_code_constants") {
+@@ -125,7 +125,6 @@ source_set("request_code_constants") {
  static_library("common_lib") {
    visibility = [
      ":*",
 -    "//chrome/common/win:eventlog_messages",
    ]
    sources = [
-     "actor/actor_logging.h",
-@@ -370,7 +369,6 @@ static_library("common_lib") {
+     "all_messages.h",
+@@ -374,7 +373,6 @@ static_library("common_lib") {
        "conflicts/remote_module_watcher_win.cc",
        "conflicts/remote_module_watcher_win.h",
      ]

patches/ungoogled-chromium/windows/windows-disable-event-log.patch

@@ -22,20 +22,19 @@
  #include "base/files/file_path.h"
  #include "base/notreached.h"
  #include "base/path_service.h"
-@@ -20,6 +21,9 @@ namespace metrics {
+@@ -23,12 +24,19 @@ MachineIdProvider::MachineIdProvider() =
+ MachineIdProvider::~MachineIdProvider() = default;
 
- // static
- bool MachineIdProvider::HasId() {
+ bool MachineIdProvider::HasId() const {
 +  if (base::CommandLine::ForCurrentProcess()->HasSwitch("disable-machine-id")) {
 +    return false;
 +  }
    return true;
  }
 
-@@ -27,6 +31,10 @@ bool MachineIdProvider::HasId() {
+ // On windows, the machine id is based on the serial number of the drive Chrome
  // is running from.
- // static
- std::string MachineIdProvider::GetMachineId() {
+ std::string MachineIdProvider::GetMachineId() const {
 +  if (base::CommandLine::ForCurrentProcess()->HasSwitch("disable-machine-id")) {
 +    return std::string();
 +  }

patches/ungoogled-chromium/windows/windows-disable-machine-id.patch

@@ -1,6 +1,6 @@
 --- a/build/config/clang/BUILD.gn
 +++ b/build/config/clang/BUILD.gn
-@@ -276,8 +276,6 @@ clang_lib("compiler_builtins") {
+@@ -287,8 +287,6 @@ clang_lib("compiler_builtins") {
      } else {
        assert(false, "unsupported target_platform=$target_platform")
      }
@@ -11,7 +11,7 @@
 
 --- a/build/config/rust.gni
 +++ b/build/config/rust.gni
-@@ -59,7 +59,7 @@ declare_args() {
+@@ -52,7 +52,7 @@ declare_args() {
    # To use a custom toolchain instead, specify an absolute path to the root of
    # a Rust sysroot, which will have a 'bin' directory and others. Commonly
    # <home dir>/.rustup/toolchains/nightly-<something>-<something>
@@ -20,20 +20,20 @@
 
    # Directory under which to find `bin/bindgen` (a `bin` directory containing
    # the bindgen exectuable).
-@@ -69,7 +69,7 @@ declare_args() {
+@@ -62,7 +62,7 @@ declare_args() {
    # set this to the output of `rustc -V`. Changing this string will cause all
    # Rust targets to be rebuilt, which allows you to update your toolchain and
    # not break incremental builds.
 -  rustc_version = ""
-+  rustc_version = "rustc 1.88.0-nightly (b8c54d635 2025-04-20)"
++  rustc_version = "rustc 1.88.0-nightly (2e6882ac5 2025-05-05)"
 
    # If you're using a Rust toolchain as specified by rust_sysroot_absolute,
    # you can specify whether it supports nacl here.
 --- a/third_party/rust/windows_aarch64_msvc/v0_52/BUILD.gn
 +++ b/third_party/rust/windows_aarch64_msvc/v0_52/BUILD.gn
-@@ -12,13 +12,13 @@ cargo_crate("lib") {
-   crate_name = "windows_aarch64_msvc"
+@@ -13,8 +13,8 @@ cargo_crate("lib") {
    epoch = "0.52"
+   enabled = is_win && current_cpu == "arm64"
    crate_type = "rlib"
 -  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/lib.rs"
 -  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/lib.rs" ]
@@ -42,33 +42,29 @@
    inputs = []
 
    build_native_rust_unit_tests = false
-   edition = "2021"
--  cargo_pkg_version = "0.52.6"
-+  cargo_pkg_version = "0.52.0"
+@@ -22,13 +22,13 @@ cargo_crate("lib") {
    cargo_pkg_authors = "Microsoft"
    cargo_pkg_name = "windows_aarch64_msvc"
    cargo_pkg_description = "Import lib for Windows"
-@@ -29,12 +29,12 @@ cargo_crate("lib") {
-   executable_configs += [ "//build/config/compiler:no_chromium_code" ]
-   proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
-   proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
+-  cargo_pkg_version = "0.52.6"
++  cargo_pkg_version = "0.52.0"
+ 
+   allow_unsafe = false
+ 
 -  build_root = "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/build.rs"
 -  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/build.rs" ]
+-  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
 +  build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/build.rs"
 +  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/build.rs" ]
-   rustflags = [
-     "--cap-lints=allow",  # Suppress all warnings in crates.io crates
-   ]
--  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
 +  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/lib/windows.0.52.0.lib" ]
 
    # Only for usage from third-party crates. Add the crate to
    # //third_party/rust/chromium_crates_io/Cargo.toml to use
 --- a/third_party/rust/windows_i686_msvc/v0_52/BUILD.gn
 +++ b/third_party/rust/windows_i686_msvc/v0_52/BUILD.gn
-@@ -12,13 +12,13 @@ cargo_crate("lib") {
-   crate_name = "windows_i686_msvc"
+@@ -13,8 +13,8 @@ cargo_crate("lib") {
    epoch = "0.52"
+   enabled = is_win && current_cpu == "x86"
    crate_type = "rlib"
 -  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/lib.rs"
 -  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/lib.rs" ]
@@ -77,33 +73,29 @@
    inputs = []
 
    build_native_rust_unit_tests = false
-   edition = "2021"
--  cargo_pkg_version = "0.52.6"
-+  cargo_pkg_version = "0.52.0"
+@@ -22,13 +22,13 @@ cargo_crate("lib") {
    cargo_pkg_authors = "Microsoft"
    cargo_pkg_name = "windows_i686_msvc"
    cargo_pkg_description = "Import lib for Windows"
-@@ -29,12 +29,12 @@ cargo_crate("lib") {
-   executable_configs += [ "//build/config/compiler:no_chromium_code" ]
-   proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
-   proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
+-  cargo_pkg_version = "0.52.6"
++  cargo_pkg_version = "0.52.0"
+ 
+   allow_unsafe = false
+ 
 -  build_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/build.rs"
 -  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/build.rs" ]
+-  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
 +  build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/build.rs"
 +  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/build.rs" ]
-   rustflags = [
-     "--cap-lints=allow",  # Suppress all warnings in crates.io crates
-   ]
--  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
 +  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/lib/windows.0.52.0.lib" ]
 
    # Only for usage from third-party crates. Add the crate to
    # //third_party/rust/chromium_crates_io/Cargo.toml to use
 --- a/third_party/rust/windows_x86_64_msvc/v0_52/BUILD.gn
 +++ b/third_party/rust/windows_x86_64_msvc/v0_52/BUILD.gn
-@@ -12,13 +12,13 @@ cargo_crate("lib") {
-   crate_name = "windows_x86_64_msvc"
+@@ -13,8 +13,8 @@ cargo_crate("lib") {
    epoch = "0.52"
+   enabled = is_win && current_cpu == "x64"
    crate_type = "rlib"
 -  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/lib.rs"
 -  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/lib.rs" ]
@@ -112,24 +104,20 @@
    inputs = []
 
    build_native_rust_unit_tests = false
-   edition = "2021"
--  cargo_pkg_version = "0.52.6"
-+  cargo_pkg_version = "0.52.0"
+@@ -22,13 +22,13 @@ cargo_crate("lib") {
    cargo_pkg_authors = "Microsoft"
    cargo_pkg_name = "windows_x86_64_msvc"
    cargo_pkg_description = "Import lib for Windows"
-@@ -29,12 +29,12 @@ cargo_crate("lib") {
-   executable_configs += [ "//build/config/compiler:no_chromium_code" ]
-   proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
-   proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
+-  cargo_pkg_version = "0.52.6"
++  cargo_pkg_version = "0.52.0"
+ 
+   allow_unsafe = false
+ 
 -  build_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/build.rs"
 -  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/build.rs" ]
+-  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
 +  build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/build.rs"
 +  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/build.rs" ]
-   rustflags = [
-     "--cap-lints=allow",  # Suppress all warnings in crates.io crates
-   ]
--  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
 +  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/lib/windows.0.52.0.lib" ]
 
    # Only for usage from third-party crates. Add the crate to

patches/ungoogled-chromium/windows/windows-fix-building-with-rust.patch

@@ -17,15 +17,15 @@
        "//build:branding_buildflags",
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5069,7 +5069,6 @@ std::wstring ChromeContentBrowserClient:
+@@ -5009,7 +5009,6 @@ std::wstring ChromeContentBrowserClient:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
      case sandbox::mojom::Sandbox::kAudio:
 -    case sandbox::mojom::Sandbox::kScreenAI:
      case sandbox::mojom::Sandbox::kSpeechRecognition:
      case sandbox::mojom::Sandbox::kPdfConversion:
      case sandbox::mojom::Sandbox::kService:
-@@ -5165,7 +5164,6 @@ bool ChromeContentBrowserClient::PreSpaw
+@@ -5106,7 +5105,6 @@ bool ChromeContentBrowserClient::PreSpaw
      case sandbox::mojom::Sandbox::kPrintBackend:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:

patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch

@@ -28,7 +28,7 @@
  // Move window to other user commands
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34080
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34081
-@@ -496,7 +496,7 @@
+@@ -497,7 +497,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -37,7 +37,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -533,7 +533,7 @@
+@@ -534,7 +534,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

patches/ungoogled-chromium/windows/windows-fix-command-ids.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -1835,9 +1835,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1813,9 +1813,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },