Skip to content

Commit d360424

Browse files
teeminusteeminus
authored
Merge pull request #394 from teeminus/update
2 parents 2261e91 + 3f417e4 commit d360424

17 files changed

+424
-199
lines changed

‎build.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def main():
182182
gnpath = source_tree / 'uc_staging' / 'gn_win'
183183
gnpath.mkdir(parents=True, exist_ok=True)
184184
subprocess.run(['git', 'clone', 'https://gn.googlesource.com/gn', str(gnpath)], check=True)
185-
subprocess.run(['git', 'reset', '--hard', 'd010e218ca7077928ad7c9e9cc02fe43b5a8a0ad'], cwd=gnpath, check=True)
185+
subprocess.run(['git', 'reset', '--hard', '20806f79c6b4ba295274e3a589d85db41a02fdaa'], cwd=gnpath, check=True)
186186
subprocess.run(['git', 'clean', '-ffdx'], cwd=gnpath, check=True)
187187
subprocess.run([sys.executable, str(gnpath / 'build' / 'gen.py')], check=True)
188188
for item in gnpath.iterdir():
@@ -275,7 +275,7 @@ def main():
275275

276276
# Generate version file
277277
with open(RUST_FLAG_FILE, 'w') as f:
278-
f.write('rustc 1.82.0-nightly (612a33f20 2024-07-29)')
278+
f.write('rustc 1.83.0-nightly (4ac7bcbaa 2024-09-04)')
279279
f.write('\n')
280280

281281
if not args.ci or not (source_tree / 'out/Default').exists():

‎domain_substitution.list

Lines changed: 364 additions & 149 deletions
Large diffs are not rendered by default.

‎downloads.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
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 = 18.1.8
24+
version = 19.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
@@ -113,13 +113,13 @@ strip_leading_dirs=DirectX-Headers-%(version)s
113113

114114
# Rust
115115
[rust-x64]
116-
version = 2024-07-30
116+
version = 2024-09-05
117117
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-pc-windows-msvc.tar.gz
118118
download_filename = rust-nightly-%(version)s-x86_64-pc-windows-msvc.tar.gz
119119
output_path = third_party/rust-toolchain-x64
120120
strip_leading_dirs=rust-nightly-x86_64-pc-windows-msvc
121121
[rust-x86]
122-
version = 2024-07-30
122+
version = 2024-09-05
123123
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-i686-pc-windows-msvc.tar.gz
124124
download_filename = rust-nightly-%(version)s-i686-pc-windows-msvc.tar.gz
125125
output_path = third_party/rust-toolchain-x86

‎patches/inox-patchset/fix-cfi-failures-with-unbundled-libxml.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
22
+++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
3-
@@ -148,11 +148,11 @@ class PendingStartElementNSCallback fina
3+
@@ -149,11 +149,11 @@ class PendingStartElementNSCallback fina
44
attribute_count_(attribute_count),
55
defaulted_count_(defaulted_count) {
66
namespaces_ = static_cast<xmlChar**>(
@@ -14,7 +14,7 @@
1414
for (int i = 0; i < attribute_count; ++i) {
1515
// Each attribute has 5 elements in the array:
1616
// name, prefix, uri, value and an end pointer.
17-
@@ -167,12 +167,12 @@ class PendingStartElementNSCallback fina
17+
@@ -168,12 +168,12 @@ class PendingStartElementNSCallback fina
1818

1919
~PendingStartElementNSCallback() override {
2020
for (int i = 0; i < namespace_count_ * 2; ++i)
@@ -31,7 +31,7 @@
3131
}
3232

3333
void Call(XMLDocumentParser* parser) override {
34-
@@ -220,7 +220,7 @@ class PendingCharactersCallback final
34+
@@ -221,7 +221,7 @@ class PendingCharactersCallback final
3535
chars_(xmlStrndup(chars, length)),
3636
length_(length) {}
3737

@@ -40,7 +40,7 @@
4040

4141
void Call(XMLDocumentParser* parser) override {
4242
parser->Characters(chars_, length_);
43-
@@ -304,7 +304,7 @@ class PendingErrorCallback final : publi
43+
@@ -305,7 +305,7 @@ class PendingErrorCallback final : publi
4444
type_(type),
4545
message_(xmlStrdup(message)) {}
4646

@@ -104,7 +104,7 @@
104104
fetch_options.initiator_info.name = fetch_initiator_type_names::kXml;
105105
--- a/third_party/blink/renderer/core/xml/xslt_unicode_sort.cc
106106
+++ b/third_party/blink/renderer/core/xml/xslt_unicode_sort.cc
107-
@@ -332,18 +332,18 @@ void XsltUnicodeSortFunction(xsltTransfo
107+
@@ -335,18 +335,18 @@ void XsltUnicodeSortFunction(xsltTransfo
108108
comp = static_cast<xsltStylePreComp*>(sorts[j]->psvi);
109109
if (tempstype[j] == 1) {
110110
// The data-type needs to be recomputed each time.

‎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-
@@ -1620,8 +1620,7 @@ config("compiler_deterministic") {
3+
@@ -1625,8 +1625,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-
@@ -2505,7 +2505,7 @@ void DownloadItemImpl::SetDangerType(Dow
3+
@@ -2494,7 +2494,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: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,22 @@
33

44
--- a/chrome/common/BUILD.gn
55
+++ b/chrome/common/BUILD.gn
6-
@@ -380,7 +380,6 @@ static_library("common_lib") {
7-
]
8-
deps += [
9-
"//chrome/chrome_elf:chrome_elf_main_include",
10-
- "//chrome/common/win:eventlog_messages",
11-
"//components/crash/core/app:crash_export_thunk_include",
6+
@@ -129,7 +129,6 @@ source_set("request_code_constants") {
7+
static_library("common_lib") {
8+
visibility = [
9+
":*",
10+
- "//chrome/common/win:eventlog_messages",
11+
]
12+
sources = [
13+
"all_messages.h",
14+
@@ -380,7 +379,6 @@ static_library("common_lib") {
15+
"conflicts/remote_module_watcher_win.cc",
16+
"conflicts/remote_module_watcher_win.h",
1217
]
18+
- deps += [ "//chrome/common/win:eventlog_messages" ]
1319

20+
public_deps += [
21+
"//components/dom_distiller/core", # Needed by chrome_content_client.cc.
1422
--- a/chrome/common/logging_chrome.cc
1523
+++ b/chrome/common/logging_chrome.cc
1624
@@ -72,7 +72,6 @@

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

Lines changed: 4 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-
@@ -75,29 +75,6 @@ if (is_win && enable_resource_allowlist_
5+
@@ -80,29 +80,6 @@ if (is_win && enable_resource_allowlist_
66
_chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt"
77
}
88

@@ -32,7 +32,7 @@
3232
# This does not currently work. See crbug.com/1311822.
3333
# This target exists above chrome and it's main components in the dependency
3434
# tree as a central place to put assert_no_deps annotations. Since this depends
35-
@@ -135,10 +112,6 @@ if (!is_android && !is_mac) {
35+
@@ -140,10 +117,6 @@ if (!is_android && !is_mac) {
3636
# Windows-only deps are OK because chrome_initial uses initialexe/chrome as
3737
# the output name for that platform.
3838
# See crbug.com/1146571.
@@ -43,7 +43,7 @@
4343
}
4444

4545
template("_chrome_exe") {
46-
@@ -150,11 +123,7 @@ if (!is_android && !is_mac) {
46+
@@ -155,11 +128,7 @@ if (!is_android && !is_mac) {
4747
target(_type, target_name) {
4848
configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
4949
configs += [ "//build/config/compiler:thinlto_optimize_max" ]
@@ -58,7 +58,7 @@
5858
# each platform lists its own files rather than relying on filtering or
5959
--- a/chrome/test/chromedriver/BUILD.gn
6060
+++ b/chrome/test/chromedriver/BUILD.gn
61-
@@ -480,11 +480,6 @@ python_library("chromedriver_py_tests")
61+
@@ -479,11 +479,6 @@ python_library("chromedriver_py_tests")
6262
if (is_component_build && is_mac) {
6363
data_deps += [ "//chrome:chrome_framework" ]
6464
}

‎patches/ungoogled-chromium/windows/windows-disable-win-build-output.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
@@ -121,24 +121,6 @@ def main():
6262
header_contents += sorted(define_block, key=lambda s: s.split()[-1])
6363
with open(header_file, 'wb') as f:
64-
f.write(''.join(header_contents))
64+
f.write(b''.join(header_contents))
6565
-
6666
- # mc.exe invocation and post-processing are complete, now compare the output
6767
- # in tmp_dir to the checked-in outputs.
@@ -76,8 +76,8 @@
7676
- tofile = os.path.join(tmp_dir, f)
7777
- print(''.join(
7878
- difflib.unified_diff(
79-
- open(fromfile, 'U').readlines(),
80-
- open(tofile, 'U').readlines(), fromfile, tofile)))
79+
- open(fromfile).readlines(),
80+
- open(tofile).readlines(), fromfile, tofile)))
8181
- delete_tmp_dir = False
8282
- sys.exit(1)
8383
except subprocess.CalledProcessError as e:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/content/browser/BUILD.gn
22
+++ b/content/browser/BUILD.gn
3-
@@ -2908,7 +2908,6 @@ source_set("browser") {
3+
@@ -2896,7 +2896,6 @@ source_set("browser") {
44
deps += [
55
"//components/app_launch_prefetch",
66
"//content/utility:delegate_data",

0 commit comments

Comments
 (0)