Skip to content

Commit 209f1d8

Browse files
authored
Merge pull request #457 from teeminus/update
2 parents c969630 + 8597d77 commit 209f1d8

13 files changed

+299
-134
lines changed

domain_substitution.list

Lines changed: 143 additions & 54 deletions
Large diffs are not rendered by default.

downloads.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
# `http://prereleases.llvm.org/win-snapshots/LLVM-9.8.7-r123456-win64.exe`
2222
# (link derived from [LLVM Snapshot Builds](http://llvm.org/builds/))
2323
[llvm]
24-
version = 20.1.3
24+
version = 20.1.5
2525
#Uncomment when pre-release version is used.
2626
#url = https://prereleases.llvm.org/win-snapshots/LLVM-%(version)s-win64.exe
2727
#Uncomment the below instead when a new enough stable version of LLVM comes around
2828
url = https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s/LLVM-%(version)s-win64.exe
2929
download_filename = LLVM-%(version)s-win64.exe
30-
sha512 = eec5b6c6d8089b6e57998cba5362b026de3f3022243e24609ea006c874ad52c6f4af19019a81ff609728cd0f80e20a3c8e935eaed4df118d139ebb4a63cbc190
30+
sha512 = 2a8c86f5e17251303eb3e876f52711618abac59a4bd041e15f62893b73b30dab76af7d91018481ea1b472aa17f46891ed9c3b402be88d35a79ca0897eeddbd02
3131
extractor = 7z
3232
output_path = third_party/llvm-build/Release+Asserts
3333

@@ -115,24 +115,24 @@ strip_leading_dirs=DirectX-Headers-%(version)s
115115

116116
# Rust
117117
[rust-x64]
118-
version = 2025-03-14
118+
version = 2025-04-21
119119
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-pc-windows-msvc.tar.gz
120120
download_filename = rust-nightly-%(version)s-x86_64-pc-windows-msvc.tar.gz
121-
sha512 = f9e7a54a2810e52f913d48bd3829394aae6bfe2bb1714bec82d68326529ff11cee88801ef040e15dc16f6b516139abbf94f78b0e8f0a85c38bf79faab6313b68
121+
sha512 = c48d2a459ec87cf12b92b2434f2397c01961dd554f3d01aef1ef773ea69630ceede33fe17b60de580064f746fae9eac5d6637b9f561a0856fb2b11dfbe3edbf6
122122
output_path = third_party/rust-toolchain-x64
123123
strip_leading_dirs=rust-nightly-x86_64-pc-windows-msvc
124124
[rust-x86]
125-
version = 2025-03-14
125+
version = 2025-04-21
126126
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-i686-pc-windows-msvc.tar.gz
127127
download_filename = rust-nightly-%(version)s-i686-pc-windows-msvc.tar.gz
128-
sha512 = 1232ff15bbbc7a9b8c88ded9116d1dcc4642d19e0381539ac3b3b209c676a274943f73f377461a19c036617886307a259bf4976508b0800596e8a6cfd2e49c6c
128+
sha512 = 26693974db960f755306ca528a1fc276bf4f12e57c31d0127061810e0825dd6615d53d3df067661ad6a2778628e6ed6414976287febbd58cdc8cd4e4a09abe33
129129
output_path = third_party/rust-toolchain-x86
130130
strip_leading_dirs=rust-nightly-i686-pc-windows-msvc
131131
[rust-arm]
132-
version = 2025-03-14
132+
version = 2025-04-21
133133
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-pc-windows-msvc.tar.gz
134134
download_filename = rust-nightly-%(version)s-aarch64-pc-windows-msvc.tar.gz
135-
sha512 = 468df510237be05ebce9a9eb22c09a8d8044f66a5bb430b3bd8206bca6fbb563807e1aba37455fbd338712aad2dc400f127886a42d68ea88b47386f91d12b613
135+
sha512 = 2129e13f57b787370febdda68898259f3023a44853c663a306482f6e8560999b1765f5994f721165d93ecaf1756cff3d47dc73148d6690c31a275389d59d7702
136136
output_path = third_party/rust-toolchain-arm
137137
strip_leading_dirs=rust-nightly-aarch64-pc-windows-msvc
138138
[rust-windows-create]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
--- a/build/config/compiler/BUILD.gn
22
+++ b/build/config/compiler/BUILD.gn
3-
@@ -1619,8 +1619,7 @@ config("compiler_deterministic") {
3+
@@ -1634,8 +1634,7 @@ config("compiler_deterministic") {
44
}
55

66
config("clang_revision") {
77
- if (is_clang && clang_base_path == default_clang_base_path &&
88
- current_os != "zos") {
99
+ if (false) {
10-
update_args = [
11-
"--print-revision",
12-
"--verify-version=$clang_version",
10+
_perform_consistency_checks = current_toolchain == default_toolchain
11+
if (llvm_force_head_revision) {
12+
_head_revision_stamp_path = "//third_party/llvm-build/force_head_revision"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/components/download/internal/common/download_item_impl.cc
22
+++ b/components/download/internal/common/download_item_impl.cc
3-
@@ -2487,7 +2487,7 @@ void DownloadItemImpl::SetDangerType(Dow
3+
@@ -2499,7 +2499,7 @@ void DownloadItemImpl::SetDangerType(Dow
44
TRACE_EVENT_SCOPE_THREAD, "danger_type",
55
GetDownloadDangerNames(danger_type).c_str());
66
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
- "//chrome/common/win:eventlog_messages",
1111
]
1212
sources = [
13-
"all_messages.h",
14-
@@ -369,7 +368,6 @@ static_library("common_lib") {
13+
"actor/actor_logging.h",
14+
@@ -370,7 +369,6 @@ static_library("common_lib") {
1515
"conflicts/remote_module_watcher_win.cc",
1616
"conflicts/remote_module_watcher_win.h",
1717
]
@@ -24,7 +24,7 @@
2424
@@ -68,7 +68,6 @@
2525
#include "base/syslog_logging.h"
2626
#include "base/win/scoped_handle.h"
27-
#include "base/win/win_util.h"
27+
#include "base/win/windows_handle_util.h"
2828
-#include "chrome/common/win/eventlog_messages.h"
2929
#include "chrome/install_static/install_details.h"
3030
#include "sandbox/policy/switches.h"

patches/ungoogled-chromium/windows/windows-disable-rcpy.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"P", IDC_BASIC_PRINT, VIRTKEY, CONTROL, SHIFT
3232
#endif
3333
"D", IDC_BOOKMARK_ALL_TABS, VIRTKEY, CONTROL, SHIFT
34-
@@ -167,12 +167,12 @@ END
34+
@@ -166,12 +166,12 @@ END
3535
// the icon from the current module). We can perhaps work around this in the
3636
// future to get the icon from the .exe, which would save a copy.
3737

patches/ungoogled-chromium/windows/windows-fix-building-gn.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
--- a/tools/gn/build/gen.py
3939
+++ b/tools/gn/build/gen.py
40-
@@ -578,6 +578,7 @@ def WriteGNNinja(path, platform, host, o
40+
@@ -587,6 +587,7 @@ def WriteGNNinja(path, platform, host, o
4141
'/D_SCL_SECURE_NO_DEPRECATE',
4242
'/D_UNICODE',
4343
'/D_WIN32_WINNT=0x0A00',

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Rust targets to be rebuilt, which allows you to update your toolchain and
2626
# not break incremental builds.
2727
- rustc_version = ""
28-
+ rustc_version = "rustc 1.87.0-nightly (cbfdf0b01 2025-03-13)"
28+
+ rustc_version = "rustc 1.88.0-nightly (b8c54d635 2025-04-20)"
2929

3030
# If you're using a Rust toolchain as specified by rust_sysroot_absolute,
3131
# you can specify whether it supports nacl here.
@@ -35,8 +35,8 @@
3535
crate_name = "windows_aarch64_msvc"
3636
epoch = "0.52"
3737
crate_type = "rlib"
38-
- crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/src/lib.rs"
39-
- sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/src/lib.rs" ]
38+
- crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/lib.rs"
39+
- sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/lib.rs" ]
4040
+ crate_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/src/lib.rs"
4141
+ sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/src/lib.rs" ]
4242
inputs = []
@@ -52,14 +52,14 @@
5252
executable_configs += [ "//build/config/compiler:no_chromium_code" ]
5353
proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
5454
proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
55-
- build_root = "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/build.rs"
56-
- build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/build.rs" ]
55+
- build_root = "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/build.rs"
56+
- build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/build.rs" ]
5757
+ build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/build.rs"
5858
+ build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/build.rs" ]
5959
rustflags = [
6060
"--cap-lints=allow", # Suppress all warnings in crates.io crates
6161
]
62-
- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/src/../lib/windows.0.52.0.lib" ]
62+
- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
6363
+ native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/lib/windows.0.52.0.lib" ]
6464

6565
# Only for usage from third-party crates. Add the crate to
@@ -70,8 +70,8 @@
7070
crate_name = "windows_i686_msvc"
7171
epoch = "0.52"
7272
crate_type = "rlib"
73-
- crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/src/lib.rs"
74-
- sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/src/lib.rs" ]
73+
- crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/lib.rs"
74+
- sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/lib.rs" ]
7575
+ crate_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/src/lib.rs"
7676
+ sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/src/lib.rs" ]
7777
inputs = []
@@ -87,14 +87,14 @@
8787
executable_configs += [ "//build/config/compiler:no_chromium_code" ]
8888
proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
8989
proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
90-
- build_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/build.rs"
91-
- build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/build.rs" ]
90+
- build_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/build.rs"
91+
- build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/build.rs" ]
9292
+ build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/build.rs"
9393
+ build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/build.rs" ]
9494
rustflags = [
9595
"--cap-lints=allow", # Suppress all warnings in crates.io crates
9696
]
97-
- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/src/../lib/windows.0.52.0.lib" ]
97+
- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
9898
+ native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/lib/windows.0.52.0.lib" ]
9999

100100
# Only for usage from third-party crates. Add the crate to
@@ -105,8 +105,8 @@
105105
crate_name = "windows_x86_64_msvc"
106106
epoch = "0.52"
107107
crate_type = "rlib"
108-
- crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/src/lib.rs"
109-
- sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/src/lib.rs" ]
108+
- crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/lib.rs"
109+
- sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/lib.rs" ]
110110
+ crate_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/src/lib.rs"
111111
+ sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/src/lib.rs" ]
112112
inputs = []
@@ -122,14 +122,14 @@
122122
executable_configs += [ "//build/config/compiler:no_chromium_code" ]
123123
proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
124124
proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
125-
- build_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/build.rs"
126-
- build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/build.rs" ]
125+
- build_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/build.rs"
126+
- build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/build.rs" ]
127127
+ build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/build.rs"
128128
+ build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/build.rs" ]
129129
rustflags = [
130130
"--cap-lints=allow", # Suppress all warnings in crates.io crates
131131
]
132-
- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/src/../lib/windows.0.52.0.lib" ]
132+
- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ]
133133
+ 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" ]
134134

135135
# Only for usage from third-party crates. Add the crate to

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"//build:branding_buildflags",
1818
--- a/chrome/browser/chrome_content_browser_client.cc
1919
+++ b/chrome/browser/chrome_content_browser_client.cc
20-
@@ -5025,7 +5025,6 @@ std::wstring ChromeContentBrowserClient:
20+
@@ -5069,7 +5069,6 @@ std::wstring ChromeContentBrowserClient:
2121
#endif
2222
case sandbox::mojom::Sandbox::kPrintCompositor:
2323
case sandbox::mojom::Sandbox::kAudio:
2424
- case sandbox::mojom::Sandbox::kScreenAI:
2525
case sandbox::mojom::Sandbox::kSpeechRecognition:
2626
case sandbox::mojom::Sandbox::kPdfConversion:
2727
case sandbox::mojom::Sandbox::kService:
28-
@@ -5121,7 +5120,6 @@ bool ChromeContentBrowserClient::PreSpaw
28+
@@ -5165,7 +5164,6 @@ bool ChromeContentBrowserClient::PreSpaw
2929
case sandbox::mojom::Sandbox::kPrintBackend:
3030
#endif
3131
case sandbox::mojom::Sandbox::kPrintCompositor:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define IDC_RESTORE_WINDOW 34052
2020
#endif
2121

22-
@@ -89,7 +89,7 @@
22+
@@ -90,7 +90,7 @@
2323
#define IDC_WEB_APP_SETTINGS 34062
2424
#define IDC_WEB_APP_MENU_APP_INFO 34063
2525

@@ -28,7 +28,7 @@
2828
// Move window to other user commands
2929
#define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34080
3030
#define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34081
31-
@@ -487,7 +487,7 @@
31+
@@ -496,7 +496,7 @@
3232
#define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
3333

3434
// Context menu items for media toolbar button
@@ -37,7 +37,7 @@
3737
#define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
3838
#endif
3939
#define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
40-
@@ -524,7 +524,7 @@
40+
@@ -533,7 +533,7 @@
4141
#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
4242
#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
4343

0 commit comments

Comments
 (0)