Skip to content

Commit 5b81004

Browse files
authored
Merge pull request #437 from teeminus/update
2 parents 039e53d + 1415c47 commit 5b81004

17 files changed

+965
-2323
lines changed

README.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ ln -s /usr/bin/vim /usr/bin/vi
130130
**NOTE:** For all steps, update `downloads.ini` accordingly.
131131

132132
1. Check the [LLVM GitHub](https://github.com/llvm/llvm-project/releases/) for the latest version of LLVM.
133+
1. Download `LLVM-*-win64.exe` file.
134+
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
133135
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.
134136
* Example: `version:[email protected]` should be `0.24.0`
135137
1. Check the [ninja GitHub](https://github.com/ninja-build/ninja/releases/) for the latest version of ninja.
@@ -141,23 +143,31 @@ ln -s /usr/bin/vim /usr/bin/vi
141143
1. Replace `version` with the Chromium version in `ungoogled-chromium/chromium_version.txt`.
142144
1. Check the [NodeJS website](https://nodejs.org/en/download) for the latest **LTS** version of NodeJS.
143145
1. Download the "Standalone Binary" version.
144-
1. Get the SHA-256 checksum using `sha256sum` in **`MSYS2 MSYS`**.
146+
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
145147
1. Check for version changes of windows rust crate (`third_party/rust/windows_x86_64_msvc/`).
148+
1. Download rust crate zip file.
149+
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
146150
1. Update `patches/ungoogled-chromium/windows/windows-fix-building-with-rust.patch` accordingly.
147151

148152
### Update rust
149153
1. Check `RUST_REVISION` constant in file `tools/rust/update_rust.py` in build root.
150-
* Example: Revision could be `ab71ee7a9214c2793108a41efb065aa77aeb7326`
154+
* Example: Revision could be `9fcc9cf4a202aadfe1f44722b39c83536eba3dba`
151155
1. Get date for nightly rust build from the Rust GitHub page: `https://github.com/rust-lang/rust/commit/<RUST_REVISION>`
152156
1. Replace `RUST_REVISION` with the obtained value
153157
1. Adapt `downloads.ini` accordingly
154-
* Example: The above revision corresponds to the nightly build date `2024-04-12` (`YYYY-mm-dd`)
158+
* Example: The above revision corresponds to the nightly build date `2025-02-13` (`YYYY-mm-dd`)
155159
1. Download nightly rust build from: `https://static.rust-lang.org/dist/<build-date>/rust-nightly-x86_64-pc-windows-msvc.tar.gz`
156160
1. Replace `build-date` with the obtained value
161+
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
157162
1. Extract archive
158163
1. Execute `rustc\bin\rustc.exe -V` to get rust version string
159-
1. Adapt `build.py` and `patches\ungoogled-chromium\windows\windows-fix-building-with-rust.patch` accordingly
160-
164+
1. Adapt `patches\ungoogled-chromium\windows\windows-fix-building-with-rust.patch` accordingly
165+
1. Download nightly rust build from: `https://static.rust-lang.org/dist/<build-date>/rust-nightly-i686-pc-windows-msvc.tar.gz`
166+
1. Replace `build-date` with the obtained value
167+
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
168+
1. Download nightly rust build from: `https://static.rust-lang.org/dist/<build-date>/rust-nightly-aarch64-pc-windows-msvc.tar.gz`
169+
1. Replace `build-date` with the obtained value
170+
1. Get the SHA-512 checksum using `sha512sum` in **`MSYS2 MSYS`**.
161171
## License
162172

163173
See [LICENSE](LICENSE)

build.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,7 @@ def main():
265265

266266
# Generate version file
267267
with open(RUST_FLAG_FILE, 'w') as f:
268-
f.write('rustc 1.86.0-nightly (243d2ca4d 2025-01-06)')
269-
f.write('\n')
268+
subprocess.run([source_tree / 'third_party' / 'rust-toolchain-x64' / 'rustc' / 'bin' / 'rustc.exe', '--version'], stdout=f)
270269

271270
if not args.ci or not (source_tree / 'out/Default').exists():
272271
# Output args.gn

domain_substitution.list

Lines changed: 853 additions & 390 deletions
Large diffs are not rendered by default.

downloads.ini

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +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 = 19.1.2
24+
version = 20.1.1
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
3031
extractor = 7z
3132
output_path = third_party/llvm-build/Release+Asserts
3233

@@ -68,37 +69,38 @@ output_path = third_party/bison
6869

6970
# Pre-built Ninja (build system)
7071
[ninja]
71-
version = 1.10.2
72+
version = 1.12.1
7273
url = https://github.com/ninja-build/ninja/releases/download/v%(version)s/ninja-win.zip
7374
download_filename = ninja-win-%(version)s.zip
74-
sha512 = 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3
75+
sha512 = d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f
7576
extractor = 7z
7677
output_path = third_party/ninja
7778

7879
# Pre-built git
7980
[git]
80-
version = 2.30.1
81+
version = 2.49.0
8182
url = https://github.com/git-for-windows/git/releases/download/v%(version)s.windows.1/PortableGit-%(version)s-64-bit.7z.exe
8283
download_filename = PortableGit-%(version)s-64-bit.7z.exe
83-
sha256 = 54bb3a0035bad71148fb6c771942a880d46a8dc6f3a0cb42eda88ca1374f1570
84+
sha512 = 7a91e563bf87ef09ee62c03b005ccadcc6565d36ac09f2397f773c1740a01dc6d3595d3a0afeeff2f86cb334267a6fd2ebf7b15666c623fae39aec477716e8a8
8485
extractor = 7z
8586
output_path = third_party/git
8687

8788
# Pre-built Node.JS (LTS)
8889
[nodejs]
89-
version = 16.17.0
90+
version = 22.14.0
9091
url = https://nodejs.org/dist/v%(version)s/node-v%(version)s-win-x64.zip
9192
download_filename = node-v%(version)s-win-x64.zip
92-
sha256 = c1a3be05342166cb9304d01da7ff8b23df6d4b16f9c98ae33b9b4fff79d8d0e2
93+
sha512 = 2b4b13e64ccfb63a5498eb3ba1f27a58e1ce104755a3b42cf25c24c7ce8be0cf1bf4ef7f18583c844526197850a55758e173cd8d064b3bfba476f79190b4c501
9394
extractor = 7z
9495
output_path = third_party/node/win
9596
strip_leading_dirs=node-v%(version)s-win-x64
9697

9798
# esbuild
9899
[esbuild]
99-
version = 0.14.13
100-
url = https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-%(version)s.tgz
101-
download_filename = esbuild-windows-64-%(version)s.tgz
100+
version = 0.24.0
101+
url = https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-%(version)s.tgz
102+
download_filename = esbuild-win32-x64-%(version)s.tgz
103+
sha512 = ec80053eb8d240826b1ac2ba7e5c20ecd166c01a124f2177ae5ec87f484d505414e22953b043cbe86b8cb94f417c8595546b919ee22276448c0be7343adbbc20
102104
output_path = third_party/devtools-frontend/src/third_party/esbuild
103105
strip_leading_dirs=package
104106

@@ -113,26 +115,30 @@ strip_leading_dirs=DirectX-Headers-%(version)s
113115

114116
# Rust
115117
[rust-x64]
116-
version = 2025-01-07
118+
version = 2025-02-13
117119
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-pc-windows-msvc.tar.gz
118120
download_filename = rust-nightly-%(version)s-x86_64-pc-windows-msvc.tar.gz
121+
sha512 = c2132543ad1c8b0133840a7b50cc6ea07adc3858321bd79e8c911ddb02118d95acc6de2fed55d4cab8462bb77589ef8fbe8d5a8a0d4a8d8bf58c2a050104aa63
119122
output_path = third_party/rust-toolchain-x64
120123
strip_leading_dirs=rust-nightly-x86_64-pc-windows-msvc
121124
[rust-x86]
122-
version = 2025-01-07
125+
version = 2025-02-13
123126
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-i686-pc-windows-msvc.tar.gz
124127
download_filename = rust-nightly-%(version)s-i686-pc-windows-msvc.tar.gz
128+
sha512 = 2dc5079dfdef1d781d0e0d2e96bf9b57fb59a5575c06cdf314db6e4dcb1659d0521debad93bb3ed23569b02f8e9248c2b1e57c4888dce7179a4a6ecff69d9708
125129
output_path = third_party/rust-toolchain-x86
126130
strip_leading_dirs=rust-nightly-i686-pc-windows-msvc
127131
[rust-arm]
128-
version = 2025-01-07
132+
version = 2025-02-13
129133
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-pc-windows-msvc.tar.gz
130134
download_filename = rust-nightly-%(version)s-aarch64-pc-windows-msvc.tar.gz
135+
sha512 = ad6c0eae038611c107128320f9f96afdc9d7855e65f6da4bb03ee960a448aace151f559c6c9c37b46cf772c0ac9b6cbbb2e9e8d1cad2aae5890612aa914c036e
131136
output_path = third_party/rust-toolchain-arm
132137
strip_leading_dirs=rust-nightly-aarch64-pc-windows-msvc
133138
[rust-windows-create]
134139
version = 0.52.0
135140
url = https://github.com/microsoft/windows-rs/archive/refs/tags/%(version)s.zip
136141
download_filename = rust-windows-create-%(version)s.zip
142+
sha512 = b505d45dfa201b0b2bf18aecea549fe72b60fbc7a2cb83d9319363e550585072cf87ce543ecf9e39d951dda2e60fcf3755bd75ead7096efdfa700f5faf781339
137143
extractor = 7z
138144
output_path = third_party/rust/chromium_crates_io/vendor

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-
@@ -1641,8 +1641,7 @@ config("compiler_deterministic") {
3+
@@ -1630,8 +1630,7 @@ config("compiler_deterministic") {
44
}
55

66
config("clang_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-
@@ -2486,7 +2486,7 @@ void DownloadItemImpl::SetDangerType(Dow
3+
@@ -2487,7 +2487,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-encryption.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
+#include "base/command_line.h"
2323
#include "base/logging.h"
2424
#include "base/metrics/histogram_functions.h"
25-
#include "base/types/expected.h"
26-
@@ -40,6 +41,9 @@ constexpr uint8_t kDPAPIKeyPrefix[] = {'
25+
#include "base/notreached.h"
26+
@@ -41,6 +42,9 @@ constexpr uint8_t kDPAPIKeyPrefix[] = {'
2727

2828
std::optional<std::vector<uint8_t>> DecryptKeyWithDPAPI(
2929
base::span<const uint8_t> ciphertext) {

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

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

44
--- a/chrome/common/BUILD.gn
55
+++ b/chrome/common/BUILD.gn
6-
@@ -128,7 +128,6 @@ source_set("request_code_constants") {
6+
@@ -124,7 +124,6 @@ source_set("request_code_constants") {
77
static_library("common_lib") {
88
visibility = [
99
":*",
1010
- "//chrome/common/win:eventlog_messages",
1111
]
1212
sources = [
1313
"all_messages.h",
14-
@@ -375,7 +374,6 @@ static_library("common_lib") {
14+
@@ -369,7 +368,6 @@ static_library("common_lib") {
1515
"conflicts/remote_module_watcher_win.cc",
1616
"conflicts/remote_module_watcher_win.h",
1717
]
@@ -21,15 +21,15 @@
2121
"//components/dom_distiller/core", # Needed by chrome_content_client.cc.
2222
--- a/chrome/common/logging_chrome.cc
2323
+++ b/chrome/common/logging_chrome.cc
24-
@@ -72,7 +72,6 @@
24+
@@ -68,7 +68,6 @@
2525
#include "base/syslog_logging.h"
2626
#include "base/win/scoped_handle.h"
2727
#include "base/win/win_util.h"
2828
-#include "chrome/common/win/eventlog_messages.h"
2929
#include "chrome/install_static/install_details.h"
3030
#include "sandbox/policy/switches.h"
3131
#endif
32-
@@ -538,11 +537,6 @@ void InitChromeLogging(const base::Comma
32+
@@ -528,11 +527,6 @@ void InitChromeLogging(const base::Comma
3333
#if BUILDFLAG(IS_WIN)
3434
// Enable trace control and transport through event tracing for Windows.
3535
LogEventProvider::Initialize(kChromeTraceProviderName);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
- action("reorder_imports") {
1111
- script = "//build/win/reorder-imports.py"
1212
-
13-
- # See comment in chrome_dll.gypi in the hardlink_to_output
14-
- # target for why this cannot be 'initial' like the DLL.
13+
- # initialexe/ is used so that the we can reorder imports and write back to
14+
- # the final destination at $root_out_dir/.
1515
- inputs = [ "$root_out_dir/initialexe/chrome.exe" ]
1616
- outputs = [
1717
- "$root_out_dir/chrome.exe",
@@ -53,7 +53,7 @@
5353
configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
5454
--- a/chrome/test/chromedriver/BUILD.gn
5555
+++ b/chrome/test/chromedriver/BUILD.gn
56-
@@ -502,11 +502,6 @@ python_library("chromedriver_py_tests")
56+
@@ -500,11 +500,6 @@ python_library("chromedriver_py_tests")
5757
if (is_component_build && is_mac) {
5858
data_deps += [ "//chrome:chrome_framework" ]
5959
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
// Removes all files from the installer directory. Returns false in case of an
4343
// error.
4444
bool RemoveInstallerFiles(const base::FilePath& installer_directory) {
45-
@@ -906,11 +888,6 @@ InstallStatus UninstallProduct(const Mod
45+
@@ -908,11 +890,6 @@ InstallStatus UninstallProduct(const Mod
4646
}
4747
}
4848

0 commit comments

Comments
 (0)