Skip to content

Commit f2f93dc

Browse files
authored
Merge pull request #445 from teeminus/update
2 parents 1af503e + 91f9871 commit f2f93dc

15 files changed

+1763
-1463
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ ln -s /usr/bin/vim /usr/bin/vi
134134
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
135135
1. Check the esbuild version in file `build/src/third_party/devtools-frontend/src/DEPS` and find the closest release in the [esbuild GitHub](https://github.com/evanw/esbuild/releases) to it.
136136
* Example: `version:[email protected]` should be `0.24.0`
137-
1. Check the [ninja GitHub](https://github.com/ninja-build/ninja/releases/) for the latest version of ninja.
137+
1. Check the ninja version in file `build/src/third_party/devtools-frontend/src/DEPS` and find the closest release in the [ninja GitHub](https://github.com/ninja-build/ninja/releases/) to it.
138138
1. Download the `ninja-win.zip` file.
139139
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
140140
1. Check the [Git GitHub](https://github.com/git-for-windows/git/releases/) for the latest version of Git.
141141
1. Get the SHA-256 checksum for `PortableGit-<version>-64-bit.7z.exe`.
142142
1. Check for commit hash changes of `src` submodule in `third_party/microsoft_dxheaders` (e.g. using GitHub `https://github.com/chromium/chromium/tree/<version>/third_party/microsoft_dxheaders`).
143143
1. Replace `version` with the Chromium version in `ungoogled-chromium/chromium_version.txt`.
144-
1. Check the [NodeJS website](https://nodejs.org/en/download) for the latest **LTS** version of NodeJS.
145-
1. Download the "Standalone Binary" version.
144+
1. Check the node version changes in `third_party/node/update_node_binaries` (e.g. using GitHub `https://github.com/chromium/chromium/tree/<version>/third_party/node/update_node_binaries`).
145+
1. Download the "Standalone Binary" version from the [NodeJS website](https://nodejs.org/en/download).
146146
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
147147
1. Check for version changes of windows rust crate (`third_party/rust/windows_x86_64_msvc/`).
148148
1. Download rust crate zip file.
@@ -151,11 +151,11 @@ ln -s /usr/bin/vim /usr/bin/vi
151151

152152
### Update rust
153153
1. Check `RUST_REVISION` constant in file `tools/rust/update_rust.py` in build root.
154-
* Example: Revision could be `9fcc9cf4a202aadfe1f44722b39c83536eba3dba`
155-
1. Get date for nightly rust build from the Rust GitHub page: `https://github.com/rust-lang/rust/commit/<RUST_REVISION>`
154+
* Example: Revision could be `f7b43542838f0a4a6cfdb17fbeadf45002042a77`
155+
1. Get date for nightly rust build from the Rust GitHub page: `https://github.com/rust-lang/rust/commit/f7b43542838f0a4a6cfdb17fbeadf45002042a77`
156156
1. Replace `RUST_REVISION` with the obtained value
157157
1. Adapt `downloads.ini` accordingly
158-
* Example: The above revision corresponds to the nightly build date `2025-02-13` (`YYYY-mm-dd`)
158+
* Example: The above revision corresponds to the nightly build date `2025-03-14` (`YYYY-mm-dd`)
159159
1. Download nightly rust build from: `https://static.rust-lang.org/dist/<build-date>/rust-nightly-x86_64-pc-windows-msvc.tar.gz`
160160
1. Replace `build-date` with the obtained value
161161
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.

domain_substitution.list

Lines changed: 489 additions & 401 deletions
Large diffs are not rendered by default.

downloads.ini

Lines changed: 12 additions & 12 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.1
24+
version = 20.1.3
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 = 795711005fc239289a197b16a6f175c40a94df09c18766a82b82fb234f76a827d438e27df0341441d26784664db0fe6452d350c84a6d59714caed29a8bdf0ccf
30+
sha512 = eec5b6c6d8089b6e57998cba5362b026de3f3022243e24609ea006c874ad52c6f4af19019a81ff609728cd0f80e20a3c8e935eaed4df118d139ebb4a63cbc190
3131
extractor = 7z
3232
output_path = third_party/llvm-build/Release+Asserts
3333

@@ -87,20 +87,20 @@ output_path = third_party/git
8787

8888
# Pre-built Node.JS (LTS)
8989
[nodejs]
90-
version = 22.14.0
90+
version = 22.11.0
9191
url = https://nodejs.org/dist/v%(version)s/node-v%(version)s-win-x64.zip
9292
download_filename = node-v%(version)s-win-x64.zip
93-
sha512 = 2b4b13e64ccfb63a5498eb3ba1f27a58e1ce104755a3b42cf25c24c7ce8be0cf1bf4ef7f18583c844526197850a55758e173cd8d064b3bfba476f79190b4c501
93+
sha512 = f483767b01f5fb9c6ad3ed06ef107f45f0699934c3ffcf89b56dcd1fa56292ae4301963e604659d58af3f1f598d5639b0c64199a2f8904e233d5a0e4171e59d0
9494
extractor = 7z
9595
output_path = third_party/node/win
9696
strip_leading_dirs=node-v%(version)s-win-x64
9797

9898
# esbuild
9999
[esbuild]
100-
version = 0.24.0
100+
version = 0.25.1
101101
url = https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-%(version)s.tgz
102102
download_filename = esbuild-win32-x64-%(version)s.tgz
103-
sha512 = ec80053eb8d240826b1ac2ba7e5c20ecd166c01a124f2177ae5ec87f484d505414e22953b043cbe86b8cb94f417c8595546b919ee22276448c0be7343adbbc20
103+
sha512 = 63511075c7f031279037fba347955ac8b389d411da2beb2cca4d001333e30beb759484e0b2771c3ea1636fa57e2ec4e9ffd228bf8cac7e3c4b68627d44fb6456
104104
output_path = third_party/devtools-frontend/src/third_party/esbuild
105105
strip_leading_dirs=package
106106

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

116116
# Rust
117117
[rust-x64]
118-
version = 2025-02-13
118+
version = 2025-03-14
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 = c2132543ad1c8b0133840a7b50cc6ea07adc3858321bd79e8c911ddb02118d95acc6de2fed55d4cab8462bb77589ef8fbe8d5a8a0d4a8d8bf58c2a050104aa63
121+
sha512 = f9e7a54a2810e52f913d48bd3829394aae6bfe2bb1714bec82d68326529ff11cee88801ef040e15dc16f6b516139abbf94f78b0e8f0a85c38bf79faab6313b68
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-02-13
125+
version = 2025-03-14
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 = 2dc5079dfdef1d781d0e0d2e96bf9b57fb59a5575c06cdf314db6e4dcb1659d0521debad93bb3ed23569b02f8e9248c2b1e57c4888dce7179a4a6ecff69d9708
128+
sha512 = 1232ff15bbbc7a9b8c88ded9116d1dcc4642d19e0381539ac3b3b209c676a274943f73f377461a19c036617886307a259bf4976508b0800596e8a6cfd2e49c6c
129129
output_path = third_party/rust-toolchain-x86
130130
strip_leading_dirs=rust-nightly-i686-pc-windows-msvc
131131
[rust-arm]
132-
version = 2025-02-13
132+
version = 2025-03-14
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 = ad6c0eae038611c107128320f9f96afdc9d7855e65f6da4bb03ee960a448aace151f559c6c9c37b46cf772c0ac9b6cbbb2e9e8d1cad2aae5890612aa914c036e
135+
sha512 = 468df510237be05ebce9a9eb22c09a8d8044f66a5bb430b3bd8206bca6fbb563807e1aba37455fbd338712aad2dc400f127886a42d68ea88b47386f91d12b613
136136
output_path = third_party/rust-toolchain-arm
137137
strip_leading_dirs=rust-nightly-aarch64-pc-windows-msvc
138138
[rust-windows-create]

patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
--- a/chrome/installer/mini_installer/BUILD.gn
55
+++ b/chrome/installer/mini_installer/BUILD.gn
6-
@@ -192,7 +192,6 @@ action("mini_installer_archive") {
7-
"//chrome",
6+
@@ -194,7 +194,6 @@ action("mini_installer_archive") {
87
"//chrome:chrome_dll",
98
"//chrome/browser/extensions/default_extensions",
9+
"//chrome/chrome_elf",
1010
- "//chrome/common/win:eventlog_provider",
1111
"//chrome/installer/setup",
1212
"//third_party/icu:icudata",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/build/config/compiler/BUILD.gn
22
+++ b/build/config/compiler/BUILD.gn
3-
@@ -1630,8 +1630,7 @@ config("compiler_deterministic") {
3+
@@ -1619,8 +1619,7 @@ config("compiler_deterministic") {
44
}
55

66
config("clang_revision") {

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

Lines changed: 16 additions & 4 deletions
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-
@@ -166,12 +166,12 @@ END
34+
@@ -167,12 +167,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

@@ -48,7 +48,19 @@
4848
IDR_MAINFRAME ICON "theme\chromium\win\chromium.ico"
4949
--- a/chrome/app/chrome_exe.rc
5050
+++ b/chrome/app/chrome_exe.rc
51-
@@ -36,7 +36,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
51+
@@ -24,9 +24,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
52+
#pragma code_page(1252)
53+
#endif //_WIN32
54+
55+
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
56+
+#if 0
57+
IDENTITY LIMITEDACCESSFEATURE {L"google-chrome_0qgpfzgh1edfy"}
58+
-#elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING)
59+
+#elif 0
60+
IDENTITY LIMITEDACCESSFEATURE {L"google-chrome_0qgpfzgh1edfy"}
61+
#else
62+
IDENTITY LIMITEDACCESSFEATURE {L"chromium_b06a12530me7r"}
63+
@@ -43,7 +43,7 @@ IDENTITY LIMITEDACCESSFEATURE {L"chromiu
5264
// Note: chrome/installer/util/shell_util.cc depends on the order and number of
5365
// icons. To avoid breaking existing shortcuts, add new icons at the end
5466
// (following the ordering described above).
@@ -57,7 +69,7 @@
5769
IDR_MAINFRAME ICON "theme\\google_chrome\\win\\chrome.ico"
5870
// These three are no longer used, but remain as placeholders. (They cannot be
5971
// removed, or existing shortcuts to the later resources will break.)
60-
@@ -46,7 +46,7 @@ IDR_MAINFRAME_4 ICON "them
72+
@@ -53,7 +53,7 @@ IDR_MAINFRAME_4 ICON "them
6173
// The SXS icon must have an index of 4, the constant is used in Chrome code to
6274
// identify it.
6375
IDR_SXS ICON "theme\\google_chrome\\win\\chrome_sxs.ico"
@@ -66,7 +78,7 @@
6678
IDR_MAINFRAME ICON "theme\\google_chrome\\google_chrome_for_testing\\win\\chrome.ico"
6779
#else
6880
IDR_MAINFRAME ICON "theme\\chromium\\win\\chromium.ico"
69-
@@ -57,7 +57,7 @@ IDR_MAINFRAME ICON "them
81+
@@ -64,7 +64,7 @@ IDR_MAINFRAME ICON "them
7082
// should be incremented when a new icon is added. The icon indices in
7183
// chrome_icon_resources_win.h should also be updated.
7284

patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
--- a/chrome/BUILD.gn
44
+++ b/chrome/BUILD.gn
5-
@@ -80,29 +80,6 @@ if (is_win && enable_resource_allowlist_
5+
@@ -81,32 +81,6 @@ if (is_win && enable_resource_allowlist_
66
_chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt"
77
}
88

@@ -12,7 +12,10 @@
1212
-
1313
- # initialexe/ is used so that the we can reorder imports and write back to
1414
- # the final destination at $root_out_dir/.
15-
- inputs = [ "$root_out_dir/initialexe/chrome.exe" ]
15+
- inputs = [
16+
- "$root_out_dir/initialexe/chrome.exe",
17+
- "$root_out_dir/initialexe/chrome.exe.pdb",
18+
- ]
1619
- outputs = [
1720
- "$root_out_dir/chrome.exe",
1821
- "$root_out_dir/chrome.exe.pdb",
@@ -32,7 +35,7 @@
3235
# This does not currently work. See crbug.com/1311822.
3336
# This target exists above chrome and it's main components in the dependency
3437
# tree as a central place to put assert_no_deps annotations. Since this depends
35-
@@ -140,17 +117,9 @@ if (!is_android && !is_mac) {
38+
@@ -144,17 +118,9 @@ if (!is_android && !is_mac) {
3639
# Windows-only deps are OK because chrome_initial uses initialexe/chrome as
3740
# the output name for that platform.
3841
# See crbug.com/1146571.
@@ -67,7 +70,7 @@
6770
python_library("chromedriver_py_tests_headless_shell") {
6871
--- a/tools/perf/chrome_telemetry_build/BUILD.gn
6972
+++ b/tools/perf/chrome_telemetry_build/BUILD.gn
70-
@@ -57,10 +57,6 @@ group("telemetry_chrome_test") {
73+
@@ -52,10 +52,6 @@ group("telemetry_chrome_test") {
7174
data_deps += [ "//chrome" ]
7275
}
7376

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-
@@ -575,6 +575,7 @@ def WriteGNNinja(path, platform, host, o
40+
@@ -578,6 +578,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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
--- a/build/config/clang/BUILD.gn
22
+++ b/build/config/clang/BUILD.gn
3-
@@ -261,8 +261,6 @@ clang_lib("compiler_builtins") {
3+
@@ -276,8 +276,6 @@ clang_lib("compiler_builtins") {
44
} else {
5-
libname = "ios"
5+
assert(false, "unsupported target_platform=$target_platform")
66
}
77
- } else {
88
- libname = "builtins"
@@ -11,7 +11,7 @@
1111

1212
--- a/build/config/rust.gni
1313
+++ b/build/config/rust.gni
14-
@@ -58,7 +58,7 @@ declare_args() {
14+
@@ -59,7 +59,7 @@ declare_args() {
1515
# To use a custom toolchain instead, specify an absolute path to the root of
1616
# a Rust sysroot, which will have a 'bin' directory and others. Commonly
1717
# <home dir>/.rustup/toolchains/nightly-<something>-<something>
@@ -20,12 +20,12 @@
2020

2121
# Directory under which to find `bin/bindgen` (a `bin` directory containing
2222
# the bindgen exectuable).
23-
@@ -68,7 +68,7 @@ declare_args() {
23+
@@ -69,7 +69,7 @@ declare_args() {
2424
# set this to the output of `rustc -V`. Changing this string will cause all
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.80.0-nightly (faefc618c 2024-05-07)"
28+
+ rustc_version = "rustc 1.87.0-nightly (cbfdf0b01 2025-03-13)"
2929

3030
# If you're using a Rust toolchain as specified by rust_sysroot_absolute,
3131
# you can specify whether it supports nacl here.

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

Lines changed: 4 additions & 4 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-
@@ -4963,7 +4963,6 @@ std::wstring ChromeContentBrowserClient:
20+
@@ -5025,7 +5025,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-
@@ -5059,7 +5058,6 @@ bool ChromeContentBrowserClient::PreSpaw
28+
@@ -5121,7 +5120,6 @@ bool ChromeContentBrowserClient::PreSpaw
2929
case sandbox::mojom::Sandbox::kPrintBackend:
3030
#endif
3131
case sandbox::mojom::Sandbox::kPrintCompositor:
@@ -35,7 +35,7 @@
3535
case sandbox::mojom::Sandbox::kSpeechRecognition:
3636
--- a/chrome/browser/safe_browsing/BUILD.gn
3737
+++ b/chrome/browser/safe_browsing/BUILD.gn
38-
@@ -8,6 +8,7 @@ import("//components/safe_browsing/build
38+
@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
3939
import("//extensions/buildflags/buildflags.gni")
4040

4141
static_library("safe_browsing") {
@@ -51,7 +51,7 @@
5151
+#endif
5252
--- a/chrome/browser/signin/signin_util_win.cc
5353
+++ b/chrome/browser/signin/signin_util_win.cc
54-
@@ -279,12 +279,6 @@ bool IsGCPWUsedInOtherProfile(Profile* p
54+
@@ -285,12 +285,6 @@ bool IsGCPWUsedInOtherProfile(Profile* p
5555
}
5656

5757
void SigninWithCredentialProviderIfPossible(Profile* profile) {

0 commit comments

Comments
 (0)