Merge pull request #427 from teeminus/update

build.py

@@ -199,7 +199,7 @@ def main():
 
         # Unpack downloads
         get_logger().info('Unpacking downloads...')
-        downloads.unpack_downloads(download_info_win, downloads_cache, None, source_tree, False, None, extractors)
+        downloads.unpack_downloads(download_info_win, downloads_cache, None, source_tree, extractors)
 
         # Apply patches
         # First, ungoogled-chromium-patches
@@ -257,7 +257,7 @@ def main():
 
         # Generate version file
         with open(RUST_FLAG_FILE, 'w') as f:
-            f.write('rustc 1.85.0-nightly (9e136a30a 2024-12-19)')
+            f.write('rustc 1.86.0-nightly (243d2ca4d 2025-01-06)')
             f.write('\n')
 
     if not args.ci or not (source_tree / 'out/Default').exists():

downloads.ini

@@ -113,13 +113,13 @@ strip_leading_dirs=DirectX-Headers-%(version)s
 
 # Rust
 [rust-x64]
-version = 2024-12-20
+version = 2025-01-07
 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-12-20
+version = 2025-01-07
 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/ungoogled-chromium/windows/windows-disable-clang-version-check.patch

@@ -1,6 +1,6 @@
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1647,8 +1647,7 @@ config("compiler_deterministic") {
+@@ -1641,8 +1641,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_revision") {

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

@@ -43,7 +43,7 @@
  #include "base/containers/span.h"
  #include "base/feature_list.h"
  #include "base/logging.h"
-@@ -49,6 +50,10 @@ constexpr char kDPAPIKeyPrefix[] = "DPAP
+@@ -50,6 +51,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()));
-@@ -83,6 +88,11 @@ bool EncryptStringWithDPAPI(const std::s
+@@ -88,6 +93,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,15 +3,15 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -131,7 +131,6 @@ source_set("request_code_constants") {
+@@ -128,7 +128,6 @@ source_set("request_code_constants") {
  static_library("common_lib") {
    visibility = [
      ":*",
 -    "//chrome/common/win:eventlog_messages",
    ]
    sources = [
      "all_messages.h",
-@@ -379,7 +378,6 @@ static_library("common_lib") {
+@@ -375,7 +374,6 @@ static_library("common_lib") {
        "conflicts/remote_module_watcher_win.cc",
        "conflicts/remote_module_watcher_win.h",
      ]
@@ -77,7 +77,7 @@
  base::expected<base::HeapArray<FactoryAndClsid>, HRESULT>
 --- a/chrome/windows_services/elevated_tracing_service/BUILD.gn
 +++ b/chrome/windows_services/elevated_tracing_service/BUILD.gn
-@@ -77,7 +77,6 @@ source_set("service_lib") {
+@@ -94,7 +94,6 @@ source_set("service_lib") {
    ]
    deps = [
      ":lib",

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
-@@ -140,10 +117,6 @@ if (!is_android && !is_mac) {
+@@ -140,17 +117,9 @@ 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.
@@ -42,23 +42,18 @@
 -    }
    }
 
-   template("_chrome_exe") {
-@@ -155,11 +128,7 @@ if (!is_android && !is_mac) {
-     target(_type, target_name) {
-       configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
-       configs += [ "//build/config/compiler:thinlto_optimize_max" ]
--      if (is_win) {
--        output_name = "initialexe/chrome"
--      } else {
--        output_name = "chrome"
--      }
-+      output_name = "chrome"
+-  if (is_win) {
+-    _chrome_output_name = "initialexe/chrome"
+-  } else {
+-    _chrome_output_name = "chrome"
+-  }
++  _chrome_output_name = "chrome"
 
-       # Because the sources list varies so significantly per-platform, generally
-       # each platform lists its own files rather than relying on filtering or
+   executable("chrome_initial") {
+     configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
 --- a/chrome/test/chromedriver/BUILD.gn
 +++ b/chrome/test/chromedriver/BUILD.gn
-@@ -482,11 +482,6 @@ python_library("chromedriver_py_tests")
+@@ -502,11 +502,6 @@ python_library("chromedriver_py_tests")
    if (is_component_build && is_mac) {
      data_deps += [ "//chrome:chrome_framework" ]
    }
@@ -72,7 +67,7 @@
  python_library("chromedriver_py_tests_headless_shell") {
 --- a/tools/perf/chrome_telemetry_build/BUILD.gn
 +++ b/tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -37,10 +37,6 @@ group("telemetry_chrome_test") {
+@@ -57,10 +57,6 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome" ]
    }
 

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

@@ -1,6 +1,6 @@
 --- a/chrome/installer/setup/BUILD.gn
 +++ b/chrome/installer/setup/BUILD.gn
-@@ -41,7 +41,6 @@ if (is_win) {
+@@ -42,7 +42,6 @@ if (is_win) {
        "//components/crash/core/app:crash_export_thunks",
        "//components/crash/core/app:run_as_crashpad_handler",
        "//content/public/common:static_switches",
@@ -10,16 +10,16 @@
 
 --- a/chrome/installer/setup/uninstall.cc
 +++ b/chrome/installer/setup/uninstall.cc
-@@ -68,8 +68,6 @@
- #include "chrome/installer/util/util_constants.h"
+@@ -69,8 +69,6 @@
  #include "chrome/installer/util/work_item.h"
+ #include "chrome/windows_services/elevated_tracing_service/service_integration.h"
  #include "content/public/common/result_codes.h"
 -#include "rlz/lib/rlz_lib_clear.h"
 -#include "rlz/lib/supplementary_branding.h"
 
  using base::win::RegKey;
 
-@@ -112,22 +110,6 @@ void ProcessChromeWorkItems(const Instal
+@@ -113,22 +111,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) {
-@@ -893,11 +875,6 @@ InstallStatus UninstallProduct(const Mod
+@@ -906,11 +888,6 @@ InstallStatus UninstallProduct(const Mod
      }
    }
 

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

@@ -3,7 +3,7 @@
 
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
-@@ -42,10 +42,7 @@ source_set("chrome_dll_resources") {
+@@ -41,10 +41,7 @@ source_set("chrome_dll_resources") {
    deps = [ ":command_ids" ]
 
    if (is_win) {
@@ -17,15 +17,15 @@
        "//build:branding_buildflags",
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -4949,7 +4949,6 @@ std::wstring ChromeContentBrowserClient:
+@@ -4954,7 +4954,6 @@ std::wstring ChromeContentBrowserClient:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
      case sandbox::mojom::Sandbox::kAudio:
 -    case sandbox::mojom::Sandbox::kScreenAI:
      case sandbox::mojom::Sandbox::kSpeechRecognition:
      case sandbox::mojom::Sandbox::kPdfConversion:
      case sandbox::mojom::Sandbox::kService:
-@@ -5045,7 +5044,6 @@ bool ChromeContentBrowserClient::PreSpaw
+@@ -5050,7 +5049,6 @@ bool ChromeContentBrowserClient::PreSpaw
      case sandbox::mojom::Sandbox::kPrintBackend:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
@@ -35,7 +35,7 @@
      case sandbox::mojom::Sandbox::kSpeechRecognition:
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
+@@ -8,6 +8,7 @@ import("//components/safe_browsing/build
  import("//extensions/buildflags/buildflags.gni")
 
  static_library("safe_browsing") {

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

@@ -1,6 +1,6 @@
 --- a/chrome/app/chrome_command_ids.h
 +++ b/chrome/app/chrome_command_ids.h
-@@ -64,15 +64,15 @@
+@@ -68,15 +68,15 @@
  #define IDC_MAXIMIZE_WINDOW             34047
  #define IDC_ALL_WINDOWS_FRONT           34048
  #define IDC_NAME_WINDOW                 34049
@@ -19,7 +19,7 @@
  #define IDC_RESTORE_WINDOW              34052
  #endif
 
-@@ -85,7 +85,7 @@
+@@ -89,7 +89,7 @@
  #define IDC_WEB_APP_SETTINGS            34062
  #define IDC_WEB_APP_MENU_APP_INFO    34063
 
@@ -28,7 +28,7 @@
  // Move window to other user commands
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34080
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34081
-@@ -473,7 +473,7 @@
+@@ -482,7 +482,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -37,7 +37,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -510,7 +510,7 @@
+@@ -519,7 +519,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

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
-@@ -1772,9 +1772,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1794,9 +1794,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },