Skip to content

Commit 43fc863

Browse files
teeminusteeminus
authored
Merge pull request #500 from teeminus/update
2 parents 36ade31 + f1d0689 commit 43fc863

13 files changed

+245
-100
lines changed

‎build.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ def main():
298298
# Build bindgen
299299
_run_build_process(
300300
sys.executable,
301-
'tools\\rust\\build_bindgen.py')
301+
'tools\\rust\\build_bindgen.py', '--skip-test')
302302

303303
# Run ninja
304304
if args.ci:

‎domain_substitution.list‎

Lines changed: 197 additions & 75 deletions
Large diffs are not rendered by default.

‎downloads.ini‎

Lines changed: 2 additions & 2 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 = 21.1.0
24+
version = 21.1.2
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 = f4f8fc9f55a3e43cf0bba46539deda8df7a4fee123bd4f9d2bba06304b04989ca04177901ec41cdf9ead2516ae80cd826660ad82564fffbf10785d66d99e4158
30+
sha512 = 4371d370e613d9a4fea9d6cb9a2a75484a482f46edb91a56a4f4565b39c024d7ce017c96a7c2df215f76101c112768bf2a1038b2d0500512b604447982c6973b
3131
extractor = 7z
3232
output_path = third_party/llvm-build/Release+Asserts
3333

‎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-
@@ -1713,8 +1713,7 @@ config("compiler_deterministic") {
3+
@@ -1706,8 +1706,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-
@@ -2508,7 +2508,7 @@ void DownloadItemImpl::SetDangerType(Dow
3+
@@ -2498,7 +2498,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: 2 additions & 2 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-
@@ -124,7 +124,6 @@ source_set("request_code_constants") {
6+
@@ -125,7 +125,6 @@ source_set("request_code_constants") {
77
static_library("common_lib") {
88
visibility = [
99
":*",
1010
- "//chrome/common/win:eventlog_messages",
1111
]
1212
sources = [
1313
"chrome_content_client.cc",
14-
@@ -362,7 +361,6 @@ static_library("common_lib") {
14+
@@ -363,7 +362,6 @@ static_library("common_lib") {
1515
"conflicts/remote_module_watcher_win.cc",
1616
"conflicts/remote_module_watcher_win.h",
1717
]

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/build/config/clang/BUILD.gn
22
+++ b/build/config/clang/BUILD.gn
3-
@@ -292,8 +292,6 @@ clang_lib("compiler_builtins") {
3+
@@ -248,8 +248,6 @@ clang_lib("compiler_builtins") {
44
} else {
55
assert(false, "unsupported target_platform=$target_platform")
66
}
@@ -126,15 +126,15 @@
126126
+++ b/tools/rust/build_bindgen.py
127127
@@ -29,8 +29,7 @@ from update import (RmTree)
128128
# The git hash to use. See https://github.com/rust-lang/rust-bindgen/tags.
129-
# The current hash below corresponds to version 0.72.0
130-
BINDGEN_GIT_VERSION = 'd0e7d6b5b763e93dd38f9ece05230979ede95a0a'
129+
# The current hash below corresponds to something between 0.72.0 and 0.73.0.
130+
BINDGEN_GIT_VERSION = '2426dd68cd12e0ac022bca18efb9c7d0acd27e12'
131131
-BINDGEN_GIT_REPO = ('https://chromium.googlesource.com/external/' +
132132
- 'github.com/rust-lang/rust-bindgen')
133133
+BINDGEN_GIT_REPO = ('https://github.com/rust-lang/rust-bindgen')
134134

135135
BINDGEN_SRC_DIR = os.path.join(THIRD_PARTY_DIR, 'rust-toolchain-intermediate',
136136
'bindgen-src')
137-
@@ -103,15 +102,8 @@ def RunCargo(cargo_args):
137+
@@ -96,15 +95,8 @@ def RunCargo(cargo_args):
138138
f'the build_rust.py script builds rustc that is needed here.')
139139
sys.exit(1)
140140

@@ -152,15 +152,15 @@
152152

153153
env = collections.defaultdict(str, os.environ)
154154
# Cargo normally stores files in $HOME. Override this.
155-
@@ -121,7 +113,6 @@ def RunCargo(cargo_args):
155+
@@ -114,7 +106,6 @@ def RunCargo(cargo_args):
156156
env['RUSTC'] = rustc_bin
157157

158158
# Use the LLVM libs and clang compiler from the rustc build.
159159
- env['LLVM_CONFIG_PATH'] = os.path.join(llvm_dir, 'bin', 'llvm-config')
160160
if sys.platform == 'win32':
161161
env['LIBCLANG_PATH'] = os.path.join(llvm_dir, 'bin')
162162
else:
163-
@@ -209,7 +200,7 @@ def main():
163+
@@ -205,7 +196,7 @@ def main():
164164
install_dir = os.path.join(RUST_TOOLCHAIN_OUT_DIR)
165165
print(f'Installing bindgen to {install_dir} ...')
166166

‎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-
@@ -5076,7 +5076,6 @@ std::wstring ChromeContentBrowserClient:
20+
@@ -5226,7 +5226,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-
@@ -5173,7 +5172,6 @@ bool ChromeContentBrowserClient::PreSpaw
28+
@@ -5323,7 +5322,6 @@ bool ChromeContentBrowserClient::PreSpaw
2929
case sandbox::mojom::Sandbox::kPrintBackend:
3030
#endif
3131
case sandbox::mojom::Sandbox::kPrintCompositor:
@@ -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-
@@ -285,12 +285,6 @@ bool IsGCPWUsedInOtherProfile(Profile* p
54+
@@ -295,12 +295,6 @@ bool IsGCPWUsedInOtherProfile(Profile* p
5555
}
5656

5757
void SigninWithCredentialProviderIfPossible(Profile* profile) {
@@ -66,7 +66,7 @@
6666

6767
--- a/components/safe_browsing/buildflags.gni
6868
+++ b/components/safe_browsing/buildflags.gni
69-
@@ -19,6 +19,7 @@ declare_args() {
69+
@@ -20,6 +20,7 @@ declare_args() {
7070
} else {
7171
safe_browsing_mode = 1
7272
}

‎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-
@@ -91,7 +91,7 @@
22+
@@ -92,7 +92,7 @@
2323
#define IDC_WEB_APP_MENU_APP_INFO 34063
2424
#define IDC_WEB_APP_UPGRADE_DIALOG 34064
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-
@@ -500,7 +500,7 @@
31+
@@ -502,7 +502,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-
@@ -537,7 +537,7 @@
40+
@@ -539,7 +539,7 @@
4141
#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
4242
#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
4343

‎patches/ungoogled-chromium/windows/windows-fix-missing-includes.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
+#include <cstdlib>
88

99
#include "base/check.h"
10-
10+
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"

0 commit comments

Comments
 (0)