Skip to content

Commit

Permalink
Upgrade to Chromium 96.0.4664.45
Browse files Browse the repository at this point in the history
  • Loading branch information
Nifury committed Nov 19, 2021
1 parent a277ab4 commit 9b03462
Show file tree
Hide file tree
Showing 7 changed files with 286 additions and 299 deletions.
10 changes: 5 additions & 5 deletions downloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# `http://prereleases.llvm.org/win-snapshots/LLVM-9.8.7-r123456-win64.exe`
# (link derived from [LLVM Snapshot Builds](http://llvm.org/builds/))
[llvm]
version = 12.0.0
version = 13.0.0
#Uncomment when pre-release version is used.
#url = https://prereleases.llvm.org/win-snapshots/LLVM-%(version)s-win64.exe
#Uncomment the below instead when a new enough stable version of LLVM comes around
Expand Down Expand Up @@ -77,19 +77,19 @@ output_path = third_party/ninja

# Pre-built git
[git]
version = 2.30.1
version = 2.33.0
url = https://github.com/git-for-windows/git/releases/download/v%(version)s.windows.1/PortableGit-%(version)s-64-bit.7z.exe
download_filename = PortableGit-%(version)s-64-bit.7z.exe
sha256 = 54bb3a0035bad71148fb6c771942a880d46a8dc6f3a0cb42eda88ca1374f1570
sha256 = 12c10fad2c2db17d9867dbbacff1adc8be50868b793a73d451c2b878914bb32d
extractor = 7z
output_path = third_party/git

# Pre-built Node.JS (LTS)
[nodejs]
version = 12.16.1
version = 14.17.6
url = https://nodejs.org/dist/v%(version)s/node-v%(version)s-win-x64.zip
download_filename = node-v%(version)s-win-x64.zip
sha256 = b93b73572c5e495154a9823d494de5729c77d1c83b041171154c4b5f3f76b590
sha256 = b83e9ce542fda7fc519cec6eb24a2575a84862ea4227dedc171a8e0b5b614ac0
extractor = 7z
output_path = third_party/node/win
strip_leading_dirs=node-v%(version)s-win-x64
4 changes: 4 additions & 0 deletions package.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ def main():
os.remove('build/src/out/Default/mini_installer.exe')
os.remove('build/src/out/Default/mini_installer_exe_version.rc')
os.remove('build/src/out/Default/setup.exe')
try:
os.remove('build/src/out/Default/chrome.packed.7z')
except FileNotFoundError:
pass

build_outputs = Path('build/src/out/Default')
output = Path('build/ungoogled-chromium_{}-{}.{}_windows.zip'.format(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/components/download/internal/common/download_item_impl.cc
+++ b/components/download/internal/common/download_item_impl.cc
@@ -2519,7 +2519,7 @@ void DownloadItemImpl::SetDangerType(Dow
@@ -2555,7 +2555,7 @@ void DownloadItemImpl::SetDangerType(Dow
TRACE_EVENT_SCOPE_THREAD, "danger_type",
GetDownloadDangerNames(danger_type).c_str());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -431,7 +431,6 @@ static_library("common") {
@@ -433,7 +433,6 @@ static_library("common") {
]
deps += [
"//chrome/chrome_elf:chrome_elf_main_include",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -65,29 +65,6 @@ if (enable_resource_allowlist_generation
chrome_resource_whitelist = "$target_gen_dir/chrome_resource_whitelist.txt"
@@ -65,29 +65,6 @@ if (is_win && enable_resource_allowlist_
_chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt"
}

-if (is_win) {
Expand Down Expand Up @@ -32,7 +32,7 @@
# This target exists above chrome and it's main components in the dependency
# tree as a central place to put assert_no_deps annotations. Since this depends
# on Chrome and the main DLLs it uses, it will transitively assert that those
@@ -123,20 +100,12 @@ if (!is_android && !is_mac) {
@@ -127,20 +104,12 @@ if (!is_android && !is_mac) {
# Windows-only deps are OK because chrome_initial uses initialexe/chrome as
# the output name for that platform.
# See crbug.com/1146571.
Expand All @@ -56,7 +56,7 @@
# each platform lists its own files rather than relying on filtering or
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -353,11 +353,6 @@ python_library("chromedriver_py_tests")
@@ -354,11 +354,6 @@ python_library("chromedriver_py_tests")
if (is_component_build && is_mac) {
data_deps += [ "//chrome:chrome_framework" ]
}
Expand All @@ -70,7 +70,7 @@
python_library("chromedriver_replay_unittests") {
--- a/tools/perf/chrome_telemetry_build/BUILD.gn
+++ b/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -40,10 +40,6 @@ group("telemetry_chrome_test") {
@@ -41,10 +41,6 @@ group("telemetry_chrome_test") {
data_deps += [ "//chrome" ]
}

Expand Down
Loading

0 comments on commit 9b03462

Please sign in to comment.