Merge remote-tracking branch 'origin/update' into github_action

README.md

@@ -10,7 +10,7 @@ Windows packaging for [ungoogled-chromium](//github.com/Eloston/ungoogled-chromi
 
 ## Building
 
-Google only supports [Windows 7 x64 or newer](https://chromium.googlesource.com/chromium/src/+/refs/tags/89.0.4389.82/docs/windows_build_instructions.md#system-requirements). These instructions are tested on Windows 7 Professional x64.
+Google only supports [Windows 10 x64 or newer](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/windows_build_instructions.md#system-requirements). These instructions are tested on Windows 10 Pro x64.
 
 NOTE: The default configuration will build 64-bit binaries for maximum security (TODO: Link some explanation). This can be changed to 32-bit by setting `target_cpu` to `"x86"` in `flags.windows.gn`.
 
@@ -20,7 +20,7 @@ NOTE: The default configuration will build 64-bit binaries for maximum security
 
 #### Setting up Visual Studio
 
-[Follow the "Visual Studio" section of the official Windows build instructions](https://chromium.googlesource.com/chromium/src/+/refs/tags/89.0.4389.82/docs/windows_build_instructions.md#visual-studio).
+[Follow the "Visual Studio" section of the official Windows build instructions](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/windows_build_instructions.md#visual-studio).
 
 * Make sure to read through the entire section and install/configure all the required components.
 * If your Visual Studio is installed in a directory other than the default, you'll need to set a few environment variables to point the toolchains to your installation path. (Copied from [instructions for Electron](https://electronjs.org/docs/development/build-instructions-windows))

patches/series

@@ -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

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

@@ -3,7 +3,7 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -433,7 +433,6 @@ static_library("common") {
+@@ -434,7 +434,6 @@ static_library("common") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",
@@ -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);

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

@@ -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 @@