Merge pull request #375 from teeminus/update

build.py

@@ -275,7 +275,7 @@ def main():
 
         # Generate version file
         with open(RUST_FLAG_FILE, 'w') as f:
-            f.write('rustc 1.80.0-nightly (faefc618c 2024-05-07)')
+            f.write('rustc 1.81.0-nightly (f8e566053 2024-06-14)')
             f.write('\n')
 
     if not args.ci or not (source_tree / 'out/Default').exists():

downloads.ini

@@ -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 = 18.1.6
+version = 18.1.8
 #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
@@ -104,7 +104,7 @@ strip_leading_dirs=package
 
 # DirectX-Headers
 [directx-headers]
-version = 83bb9ef2a6893a4214e5d6c45c6bbd9607d1c308
+version = 9be295b3b81ce1d0ff2b44f18d0eb86ea54c5122
 url = https://github.com/microsoft/DirectX-Headers/archive/%(version)s.zip
 download_filename = directx-headers-%(version)s.zip
 extractor = 7z
@@ -113,13 +113,13 @@ strip_leading_dirs=DirectX-Headers-%(version)s
 
 # Rust
 [rust-x64]
-version = 2024-05-08
+version = 2024-06-15
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-pc-windows-msvc.tar.gz
 download_filename = rust-nightly-%(version)s-x86_64-pc-windows-msvc.tar.gz
 output_path = third_party/rust-toolchain-x64
 strip_leading_dirs=rust-nightly-x86_64-pc-windows-msvc
 [rust-x86]
-version = 2024-05-08
+version = 2024-06-15
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-i686-pc-windows-msvc.tar.gz
 download_filename = rust-nightly-%(version)s-i686-pc-windows-msvc.tar.gz
 output_path = third_party/rust-toolchain-x86

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
-@@ -143,11 +143,11 @@ class PendingStartElementNSCallback fina
+@@ -148,11 +148,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.
-@@ -162,12 +162,12 @@ class PendingStartElementNSCallback fina
+@@ -167,12 +167,12 @@ class PendingStartElementNSCallback fina
 
    ~PendingStartElementNSCallback() override {
      for (int i = 0; i < namespace_count_ * 2; ++i)
@@ -31,7 +31,7 @@
    }
 
    void Call(XMLDocumentParser* parser) override {
-@@ -215,7 +215,7 @@ class PendingCharactersCallback final
+@@ -220,7 +220,7 @@ class PendingCharactersCallback final
          chars_(xmlStrndup(chars, length)),
          length_(length) {}
 
@@ -40,7 +40,7 @@
 
    void Call(XMLDocumentParser* parser) override {
      parser->Characters(chars_, length_);
-@@ -299,7 +299,7 @@ class PendingErrorCallback final : publi
+@@ -304,7 +304,7 @@ class PendingErrorCallback final : publi
          type_(type),
          message_(xmlStrdup(message)) {}
 
@@ -93,7 +93,7 @@
  }
 --- a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
 +++ b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-@@ -114,7 +114,7 @@ static xmlDocPtr DocLoaderFunc(const xml
+@@ -119,7 +119,7 @@ static xmlDocPtr DocLoaderFunc(const xml
        xmlChar* base = xmlNodeGetBase(context->document->doc, context->node);
        KURL url(KURL(reinterpret_cast<const char*>(base)),
                 reinterpret_cast<const char*>(uri));
@@ -104,7 +104,7 @@
        fetch_options.initiator_info.name = fetch_initiator_type_names::kXml;
 --- a/third_party/blink/renderer/core/xml/xslt_unicode_sort.cc
 +++ b/third_party/blink/renderer/core/xml/xslt_unicode_sort.cc
-@@ -327,18 +327,18 @@ void XsltUnicodeSortFunction(xsltTransfo
+@@ -332,18 +332,18 @@ void XsltUnicodeSortFunction(xsltTransfo
      comp = static_cast<xsltStylePreComp*>(sorts[j]->psvi);
      if (tempstype[j] == 1) {
        // The data-type needs to be recomputed each time.

patches/series

@@ -22,3 +22,4 @@ ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch
 ungoogled-chromium/windows/windows-fix-building-with-rust.patch
 ungoogled-chromium/windows/windows-fix-remove-unused-preferences-fields.patch
 ungoogled-chromium/windows/windows-fix-missing-includes.patch
+ungoogled-chromium/windows/windows-fix-building-with-prunned-binaries.patch

patches/ungoogled-chromium/windows/windows-disable-clang-version-check.patch

@@ -1,10 +1,11 @@
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1597,7 +1597,7 @@ config("compiler_deterministic") {
+@@ -1605,8 +1605,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_revision") {
--  if (is_clang && clang_base_path == default_clang_base_path) {
+-  if (is_clang && clang_base_path == default_clang_base_path &&
+-      current_os != "zos") {
 +  if (false) {
      update_args = [
        "--print-revision",

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
-@@ -2462,7 +2462,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2481,7 +2481,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }

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

@@ -35,15 +35,15 @@
    input.cbData = static_cast<DWORD>(ciphertext.size());
 --- a/components/os_crypt/sync/os_crypt_win.cc
 +++ b/components/os_crypt/sync/os_crypt_win.cc
-@@ -7,6 +7,7 @@
- #include <windows.h>
-
+@@ -9,6 +9,7 @@
  #include "base/base64.h"
+ #include "base/check.h"
+ #include "base/check_op.h"
 +#include "base/command_line.h"
  #include "base/containers/span.h"
  #include "base/feature_list.h"
  #include "base/logging.h"
-@@ -47,6 +48,10 @@ constexpr char kDPAPIKeyPrefix[] = "DPAP
+@@ -49,6 +50,10 @@ constexpr char kDPAPIKeyPrefix[] = "DPAP
 
  bool EncryptStringWithDPAPI(const std::string& plaintext,
                              std::string* ciphertext) {
@@ -54,7 +54,7 @@
    DATA_BLOB input;
    input.pbData =
        const_cast<BYTE*>(reinterpret_cast<const BYTE*>(plaintext.data()));
-@@ -81,6 +86,11 @@ bool EncryptStringWithDPAPI(const std::s
+@@ -83,6 +88,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
-@@ -420,7 +420,6 @@ static_library("common_lib") {
+@@ -427,7 +427,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",

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

@@ -58,7 +58,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
-@@ -478,11 +478,6 @@ python_library("chromedriver_py_tests")
+@@ -480,11 +480,6 @@ python_library("chromedriver_py_tests")
    if (is_component_build && is_mac) {
      data_deps += [ "//chrome:chrome_framework" ]
    }
@@ -81,5 +81,5 @@
 -  }
 -
    if (is_linux || is_chromeos) {
-     data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
+     data_deps += [ "//third_party/breakpad:dump_syms" ]
 

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

@@ -10,7 +10,7 @@
 
 --- a/chrome/installer/setup/uninstall.cc
 +++ b/chrome/installer/setup/uninstall.cc
-@@ -61,8 +61,6 @@
+@@ -62,8 +62,6 @@
  #include "chrome/installer/util/util_constants.h"
  #include "chrome/installer/util/work_item.h"
  #include "content/public/common/result_codes.h"
@@ -19,7 +19,7 @@
 
  using base::win::RegKey;
 
-@@ -105,22 +103,6 @@ void ProcessChromeWorkItems(const Instal
+@@ -106,22 +104,6 @@ void ProcessChromeWorkItems(const Instal
    work_item_list->Do();
  }
 
@@ -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) {
-@@ -844,11 +826,6 @@ InstallStatus UninstallProduct(const Mod
+@@ -845,11 +827,6 @@ InstallStatus UninstallProduct(const Mod
      }
    }
 

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

@@ -0,0 +1,10 @@
+--- a/content/browser/BUILD.gn
++++ b/content/browser/BUILD.gn
+@@ -2873,7 +2873,6 @@ source_set("browser") {
+     deps += [
+       "//components/app_launch_prefetch",
+       "//content/utility:delegate_data",
+-      "//services/screen_ai/public/cpp:utilities",
+       "//third_party/blink/public/common:font_unique_name_table_proto",
+       "//third_party/iaccessible2",
+       "//third_party/isimpledom",

patches/ungoogled-chromium/windows/windows-fix-building-with-rust.patch

@@ -1,6 +1,6 @@
 --- a/build/config/clang/BUILD.gn
 +++ b/build/config/clang/BUILD.gn
-@@ -245,8 +245,6 @@ clang_lib("compiler_builtins") {
+@@ -252,8 +252,6 @@ clang_lib("compiler_builtins") {
      } else {
        libname = "ios"
      }
@@ -35,15 +35,15 @@
    crate_name = "windows_i686_msvc"
    epoch = "0.52"
    crate_type = "rlib"
--  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.5/src/lib.rs"
--  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.5/src/lib.rs" ]
+-  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/src/lib.rs"
+-  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/src/lib.rs" ]
 +  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/src/lib.rs"
 +  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/src/lib.rs" ]
    inputs = []
 
    build_native_rust_unit_tests = false
    edition = "2021"
--  cargo_pkg_version = "0.52.5"
+-  cargo_pkg_version = "0.52.6"
 +  cargo_pkg_version = "0.52.0"
    cargo_pkg_authors = "Microsoft"
    cargo_pkg_name = "windows_i686_msvc"
@@ -52,9 +52,9 @@
    executable_configs += [ "//build/config/compiler:no_chromium_code" ]
    proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
    proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
--  build_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.5/build.rs"
--  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.5/build.rs" ]
--  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.5/src/../lib/windows.0.52.0.lib" ]
+-  build_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/build.rs"
+-  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/build.rs" ]
+-  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/src/../lib/windows.0.52.0.lib" ]
 +  build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/build.rs"
 +  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/build.rs" ]
 +  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/lib/windows.0.52.0.lib" ]
@@ -67,15 +67,15 @@
    crate_name = "windows_x86_64_msvc"
    epoch = "0.52"
    crate_type = "rlib"
--  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.5/src/lib.rs"
--  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.5/src/lib.rs" ]
+-  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/src/lib.rs"
+-  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/src/lib.rs" ]
 +  crate_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/src/lib.rs"
 +  sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/src/lib.rs" ]
    inputs = []
 
    build_native_rust_unit_tests = false
    edition = "2021"
--  cargo_pkg_version = "0.52.5"
+-  cargo_pkg_version = "0.52.6"
 +  cargo_pkg_version = "0.52.0"
    cargo_pkg_authors = "Microsoft"
    cargo_pkg_name = "windows_x86_64_msvc"
@@ -84,9 +84,9 @@
    executable_configs += [ "//build/config/compiler:no_chromium_code" ]
    proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
    proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
--  build_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.5/build.rs"
--  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.5/build.rs" ]
--  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.5/src/../lib/windows.0.52.0.lib" ]
+-  build_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/build.rs"
+-  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/build.rs" ]
+-  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/src/../lib/windows.0.52.0.lib" ]
 +  build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/build.rs"
 +  build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/build.rs" ]
 +  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/lib/windows.0.52.0.lib" ]

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

@@ -48,9 +48,11 @@
 
 --- a/components/safe_browsing/buildflags.gni
 +++ b/components/safe_browsing/buildflags.gni
-@@ -19,4 +19,5 @@ declare_args() {
+@@ -19,6 +19,7 @@ declare_args() {
    } else {
      safe_browsing_mode = 1
    }
 +  safe_browsing_mode = 0
- }
+
+   # Allows building without //third_party/unrar included, for license reasons
+   safe_browsing_use_unrar = true

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

@@ -46,7 +46,7 @@
  #define IDC_LACROS_DATA_MIGRATION      40265
  #endif
 
-@@ -471,7 +461,7 @@
+@@ -473,7 +463,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -55,7 +55,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -508,7 +498,7 @@
+@@ -510,7 +500,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch

@@ -1,6 +1,6 @@
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -814,7 +814,7 @@ def _GnBinary():
+@@ -813,7 +813,7 @@ def _GnBinary():
    elif sys.platform == 'darwin':
      subdir = 'mac'
    elif sys.platform == 'win32':

patches/ungoogled-chromium/windows/windows-fix-remove-unused-preferences-fields.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -1679,9 +1679,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1705,9 +1705,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },