Skip to content

Commit

Permalink
Update to Chromium 97.0.4692.71
Browse files Browse the repository at this point in the history
  • Loading branch information
Nifury committed Jan 8, 2022
1 parent 0ddca98 commit 23baab7
Show file tree
Hide file tree
Showing 11 changed files with 532 additions and 375 deletions.
1 change: 0 additions & 1 deletion patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ ungoogled-chromium/windows/windows-fix-clang-format-exe.patch
ungoogled-chromium/windows/windows-disable-rlz.patch
ungoogled-chromium/windows/windows-fix-command-ids.patch
ungoogled-chromium/windows/windows-disable-download-warning-prompt.patch
ungoogled-chromium/windows/windows-fix-python-error.patch
ungoogled-chromium/windows/windows-fix-rc-terminating-error.patch
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") {
@@ -434,7 +434,6 @@ static_library("common") {
]
deps += [
"//chrome/chrome_elf:chrome_elf_main_include",
Expand All @@ -13,15 +13,15 @@

--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -63,7 +63,6 @@
@@ -64,7 +64,6 @@
#include <initguid.h>
#include "base/logging_win.h"
#include "base/syslog_logging.h"
-#include "chrome/common/win/eventlog_messages.h"
#include "chrome/install_static/install_details.h"
#endif

@@ -368,11 +367,6 @@ void InitChromeLogging(const base::Comma
@@ -376,11 +375,6 @@ void InitChromeLogging(const base::Comma
#if defined(OS_WIN)
// Enable trace control and transport through event tracing for Windows.
LogEventProvider::Initialize(kChromeTraceProviderName);
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
4 changes: 2 additions & 2 deletions patches/ungoogled-chromium/windows/windows-disable-rlz.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
--- a/chrome/installer/setup/BUILD.gn
+++ b/chrome/installer/setup/BUILD.gn
@@ -45,7 +45,6 @@ if (is_win) {
@@ -46,7 +46,6 @@ if (is_win) {
"//components/crash/core/app:crash_export_thunks",
"//components/crash/core/app:run_as_crashpad_handler",
"//content/public/common:static_switches",
- "//rlz:rlz_lib_no_network",
"//url",
]

libs = [ "netapi32.lib" ]
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -60,8 +60,6 @@
Expand Down
Loading

0 comments on commit 23baab7

Please sign in to comment.