Merge pull request #170 from teeminus/update

downloads.ini

@@ -86,10 +86,10 @@ output_path = third_party/git
 
 # Pre-built Node.JS (LTS)
 [nodejs]
-version = 12.16.1
+version = 16.17.0
 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 = c1a3be05342166cb9304d01da7ff8b23df6d4b16f9c98ae33b9b4fff79d8d0e2
 extractor = 7z
 output_path = third_party/node/win
 strip_leading_dirs=node-v%(version)s-win-x64

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

@@ -1,6 +1,6 @@
 --- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
 +++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-@@ -140,11 +140,11 @@ class PendingStartElementNSCallback fina
+@@ -142,11 +142,11 @@ class PendingStartElementNSCallback fina
          attribute_count_(attribute_count),
          defaulted_count_(defaulted_count) {
      namespaces_ = static_cast<xmlChar**>(
@@ -14,7 +14,7 @@
      for (int i = 0; i < attribute_count; ++i) {
        // Each attribute has 5 elements in the array:
        // name, prefix, uri, value and an end pointer.
-@@ -159,12 +159,12 @@ class PendingStartElementNSCallback fina
+@@ -161,12 +161,12 @@ class PendingStartElementNSCallback fina
 
    ~PendingStartElementNSCallback() override {
      for (int i = 0; i < namespace_count_ * 2; ++i)
@@ -31,7 +31,7 @@
    }
 
    void Call(XMLDocumentParser* parser) override {
-@@ -212,7 +212,7 @@ class PendingCharactersCallback final
+@@ -214,7 +214,7 @@ class PendingCharactersCallback final
          chars_(xmlStrndup(chars, length)),
          length_(length) {}
 
@@ -40,7 +40,7 @@
 
    void Call(XMLDocumentParser* parser) override {
      parser->Characters(chars_, length_);
-@@ -296,7 +296,7 @@ class PendingErrorCallback final : publi
+@@ -298,7 +298,7 @@ class PendingErrorCallback final : publi
          type_(type),
          message_(xmlStrdup(message)) {}
 

patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch

@@ -18,7 +18,7 @@
  def GetLZMAExec(build_dir):
    if sys.platform == 'win32':
 -    lzma_exec = os.path.join(build_dir, "..", "..", "third_party",
--                             "lzma_sdk", "Executable", "7za.exe")
+-                             "lzma_sdk", "bin", "7za.exe")
 +    # Taken from ungoogled-chromium's _extraction.py file, modified for Python 2
 +    import winreg
 +    sub_key_7zfm = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\7zFM.exe'

patches/ungoogled-chromium/windows/windows-disable-download-warning-prompt.patch

@@ -1,6 +1,6 @@
 --- a/components/download/internal/common/download_item_impl.cc
 +++ b/components/download/internal/common/download_item_impl.cc
-@@ -2526,7 +2526,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2523,7 +2523,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }

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

@@ -23,7 +23,7 @@
  #include "base/logging.h"
  #include "base/memory/singleton.h"
  #include "base/metrics/histogram_functions.h"
-@@ -37,6 +38,10 @@ constexpr char kDPAPIKeyPrefix[] = "DPAP
+@@ -38,6 +39,10 @@ constexpr char kDPAPIKeyPrefix[] = "DPAP
 
  bool EncryptStringWithDPAPI(const std::string& plaintext,
                              std::string* ciphertext) {
@@ -34,7 +34,7 @@
    DATA_BLOB input;
    input.pbData =
        const_cast<BYTE*>(reinterpret_cast<const BYTE*>(plaintext.data()));
-@@ -60,6 +65,11 @@ bool EncryptStringWithDPAPI(const std::s
+@@ -66,6 +71,11 @@ bool EncryptStringWithDPAPI(const std::s
 
  bool DecryptStringWithDPAPI(const std::string& ciphertext,
                              std::string* plaintext) {

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

@@ -3,7 +3,7 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -415,7 +415,6 @@ static_library("common_lib") {
+@@ -419,7 +419,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",
@@ -21,7 +21,7 @@
  #include "chrome/install_static/install_details.h"
  #endif
 
-@@ -460,11 +459,6 @@ void InitChromeLogging(const base::Comma
+@@ -442,11 +441,6 @@ void InitChromeLogging(const base::Comma
  #if BUILDFLAG(IS_WIN)
    // Enable trace control and transport through event tracing for Windows.
    LogEventProvider::Initialize(kChromeTraceProviderName);

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

@@ -3,7 +3,7 @@
 
 --- a/build/toolchain/win/tool_wrapper.py
 +++ b/build/toolchain/win/tool_wrapper.py
-@@ -167,10 +167,12 @@ class WinTool(object):
+@@ -168,10 +168,12 @@ class WinTool(object):
      """Converts .rc files to .res files."""
      env = self._GetEnv(arch)
      args = list(args)

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

@@ -32,7 +32,7 @@
  # This does not currently work. See crbug.com/1311822.
  # 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
-@@ -126,20 +103,12 @@ if (!is_android && !is_mac) {
+@@ -136,10 +113,6 @@ 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.
@@ -43,8 +43,10 @@
    }
 
    executable("chrome_initial") {
-     configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
-     configs += [ "//build/config/compiler:thinlto_optimize_max" ]
+@@ -150,11 +123,7 @@ if (!is_android && !is_mac) {
+     # the limit on the bots raised.
+     configs += [ ":disable_thinlto_cache_flags" ]
+
 -    if (is_win) {
 -      output_name = "initialexe/chrome"
 -    } else {

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

@@ -1,6 +1,6 @@
 --- a/chrome/installer/setup/BUILD.gn
 +++ b/chrome/installer/setup/BUILD.gn
-@@ -47,7 +47,6 @@ if (is_win) {
+@@ -48,7 +48,6 @@ if (is_win) {
        "//components/crash/core/app:crash_export_thunks",
        "//components/crash/core/app:run_as_crashpad_handler",
        "//content/public/common:static_switches",
@@ -42,7 +42,7 @@
  // Removes all files from the installer directory. Returns false in case of an
  // error.
  bool RemoveInstallerFiles(const base::FilePath& installer_directory) {
-@@ -826,11 +808,6 @@ InstallStatus UninstallProduct(const Mod
+@@ -836,11 +818,6 @@ InstallStatus UninstallProduct(const Mod
      }
    }
 

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

@@ -4,16 +4,15 @@
 
 --- a/build/toolchain/win/midl.py
 +++ b/build/toolchain/win/midl.py
-@@ -7,7 +7,7 @@ from __future__ import print_function
+@@ -7,6 +7,7 @@ from __future__ import print_function
 
  import array
  import difflib
--import distutils.dir_util
 +import distutils.file_util
  import filecmp
  import io
  import operator
-@@ -446,41 +446,13 @@ def main(arch, gendir, outdir, dynamic_g
+@@ -445,41 +446,13 @@ def main(arch, gendir, outdir, dynamic_g
    if returncode != 0:
      return returncode
 

patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch

@@ -17,7 +17,7 @@
        "//build:branding_buildflags",
 --- a/chrome/browser/chrome_browser_main_win.cc
 +++ b/chrome/browser/chrome_browser_main_win.cc
-@@ -394,15 +394,6 @@ void ShowCloseBrowserFirstMessageBox() {
+@@ -395,15 +395,6 @@ void ShowCloseBrowserFirstMessageBox() {
        l10n_util::GetStringUTF16(IDS_UNINSTALL_CLOSE_APP));
  }
 
@@ -33,7 +33,7 @@
  // Updates all Progressive Web App launchers in |profile_dir| to the latest
  // version.
  void UpdatePwaLaunchersForProfile(const base::FilePath& profile_dir) {
-@@ -642,23 +633,6 @@ void ChromeBrowserMainPartsWin::PostBrow
+@@ -631,23 +622,6 @@ void ChromeBrowserMainPartsWin::PostBrow
 
    InitializeChromeElf();
 
@@ -59,16 +59,16 @@
    content::GetUIThreadTaskRunner({})->PostDelayedTask(
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1208,8 +1208,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1232,8 +1232,6 @@ void RegisterLocalState(PrefRegistrySimp
                                  true);
    registry->RegisterBooleanPref(
        policy::policy_prefs::kNativeWindowOcclusionEnabled, true);
 -  component_updater::RegisterPrefsForSwReporter(registry);
 -  safe_browsing::RegisterChromeCleanerScanCompletionTimePref(registry);
    MediaFoundationServiceMonitor::RegisterPrefs(registry);
+   os_crypt::RegisterLocalStatePrefs(registry);
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-   IncompatibleApplicationsUpdater::RegisterLocalStatePrefs(registry);
-@@ -1527,12 +1525,8 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1551,12 +1549,8 @@ void RegisterProfilePrefs(user_prefs::Pr
 
  #if BUILDFLAG(IS_WIN)
    CdmPrefServiceHelper::RegisterProfilePrefs(registry);
@@ -83,7 +83,7 @@
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -6,6 +6,7 @@ import("//components/safe_browsing/build
+@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
  import("//extensions/buildflags/buildflags.gni")
 
  static_library("safe_browsing") {

patches/ungoogled-chromium/windows/windows-fix-command-ids.patch

@@ -30,7 +30,7 @@
  // Page-related commands
  #define IDC_BOOKMARK_THIS_TAB           35000
  #define IDC_BOOKMARK_ALL_TABS           35001
-@@ -224,10 +208,6 @@
+@@ -223,10 +207,6 @@
  #define IDC_CHROME_TIPS                40263
  #define IDC_CHROME_WHATS_NEW           40264
 
@@ -41,7 +41,7 @@
  // Spell-check
  // Insert any additional suggestions before _LAST; these have to be consecutive.
  #define IDC_SPELLCHECK_SUGGESTION_0     41000
-@@ -442,12 +422,6 @@
+@@ -441,12 +421,6 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 
@@ -52,5 +52,5 @@
 -#endif
 -
  #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
- // Screen AI Visual Annotations
+ // Screen AI Visual Annotations.
  #define IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS 52420

patches/ungoogled-chromium/windows/windows-fix-rc-terminating-error.patch

@@ -10,19 +10,10 @@
 +#if !defined(BUILD_BUILD_CONFIG_H_) && !defined(RC_INVOKED)
  #define BUILD_BUILD_CONFIG_H_
 
- #include "build/buildflag.h"
+ #include "build/buildflag.h"  // IWYU pragma: export
 --- a/chrome/app/chrome_command_ids.h
 +++ b/chrome/app/chrome_command_ids.h
-@@ -379,7 +379,7 @@
- #define IDC_MEDIA_ROUTER_ABOUT 51200
- #define IDC_MEDIA_ROUTER_HELP 51201
- #define IDC_MEDIA_ROUTER_LEARN_MORE 51202
--#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-+#if (0)
- #define IDC_MEDIA_ROUTER_REPORT_ISSUE 51203
- #endif
- #define IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION 51204
-@@ -388,7 +388,7 @@
+@@ -387,7 +387,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -31,12 +22,12 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -422,7 +422,7 @@
+@@ -421,7 +421,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 
 -#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
 +#if (0)
- // Screen AI Visual Annotations
+ // Screen AI Visual Annotations.
  #define IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS 52420
  #endif

patches/ungoogled-chromium/windows/windows-fix-unknown-clang-parameters.patch

@@ -1,4 +1,4 @@
-# The "-no-opaque-pointers" and "-ffile-reproducible" commandline parameters has been added by clang-15. Once clang-15 is available for windows, this patch can be removed.
+# The "-ffile-reproducible" commandline parameter has been added by clang-15. Once clang-15 is available for windows, this patch can be removed.
 
 --- a/base/location.cc
 +++ b/base/location.cc
@@ -13,7 +13,7 @@
  #else
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1420,10 +1420,6 @@ config("default_warnings") {
+@@ -1419,10 +1419,6 @@ config("default_warnings") {
      if (treat_warnings_as_errors) {
        cflags += [ "/WX" ]
      }
@@ -24,15 +24,6 @@
      defines = [
        # Without this, Windows headers warn that functions like wcsnicmp
        # should be spelled _wcsnicmp. But all other platforms keep spelling
-@@ -1544,8 +1540,6 @@ config("default_warnings") {
-                         default_toolchain == "//build/toolchain/cros:target")) {
-         # TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated.
-         cflags += [
--          "-Xclang",
--          "-no-opaque-pointers",
-         ]
-       }
-
 --- a/build/config/win/BUILD.gn
 +++ b/build/config/win/BUILD.gn
 @@ -78,7 +78,7 @@ config("compiler") {