Merge pull request #418 from teeminus/update

build.py

@@ -257,7 +257,7 @@ def main():
 
         # Generate version file
         with open(RUST_FLAG_FILE, 'w') as f:
-            f.write('rustc 1.84.0-nightly (439284741 2024-10-21)')
+            f.write('rustc 1.85.0-nightly (9e136a30a 2024-12-19)')
             f.write('\n')
 
     if not args.ci or not (source_tree / 'out/Default').exists():

downloads.ini

@@ -104,7 +104,7 @@ strip_leading_dirs=package
 
 # DirectX-Headers
 [directx-headers]
-version = 9be295b3b81ce1d0ff2b44f18d0eb86ea54c5122
+version = d9020edfc69b789653e04fa2d8d10ee3317ffa56
 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-10-22
+version = 2024-12-20
 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-10-22
+version = 2024-12-20
 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/series

@@ -1,4 +1,3 @@
-inox-patchset/fix-cfi-failures-with-unbundled-libxml.patch
 ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch
 ungoogled-chromium/windows/windows-disable-win-build-output.patch
 ungoogled-chromium/windows/windows-disable-rcpy.patch

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
-@@ -1648,8 +1648,7 @@ config("compiler_deterministic") {
+@@ -1647,8 +1647,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_revision") {

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

@@ -3,15 +3,15 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -129,7 +129,6 @@ source_set("request_code_constants") {
+@@ -131,7 +131,6 @@ source_set("request_code_constants") {
  static_library("common_lib") {
    visibility = [
      ":*",
 -    "//chrome/common/win:eventlog_messages",
    ]
    sources = [
      "all_messages.h",
-@@ -378,7 +377,6 @@ static_library("common_lib") {
+@@ -379,7 +378,6 @@ static_library("common_lib") {
        "conflicts/remote_module_watcher_win.cc",
        "conflicts/remote_module_watcher_win.h",
      ]
@@ -43,34 +43,69 @@
    base::StatisticsRecorder::InitLogOnShutdown();
 --- a/chrome/elevation_service/BUILD.gn
 +++ b/chrome/elevation_service/BUILD.gn
-@@ -53,7 +53,6 @@ executable("elevation_service") {
-     ":version_resources",
+@@ -95,7 +95,6 @@ source_set("service_lib") {
+   deps = [
+     ":lib",
      "//base",
-     "//build/win:default_exe_manifest",
 -    "//chrome/common/win:eventlog_provider",
      "//chrome/install_static:install_static_util",
-     "//chrome/install_static:primary_module",
-     "//components/crx_file",
---- a/chrome/elevation_service/elevation_service.cc
-+++ b/chrome/elevation_service/elevation_service.cc
+   ]
+ }
+--- a/chrome/elevation_service/elevation_service_delegate.cc
++++ b/chrome/elevation_service/elevation_service_delegate.cc
 @@ -12,7 +12,6 @@
- #include "base/syslog_logging.h"
- #include "base/win/process_startup_helper.h"
- #include "base/win/scoped_com_initializer.h"
+ #include "base/containers/heap_array.h"
+ #include "base/logging.h"
+ #include "base/types/expected.h"
 -#include "chrome/common/win/eventlog_messages.h"
- #include "chrome/elevation_service/service_main.h"
- #include "chrome/install_static/install_details.h"
- #include "chrome/install_static/product_install_details.h"
-@@ -34,12 +33,6 @@ extern "C" int WINAPI wWinMain(HINSTANCE
+ #include "chrome/elevation_service/elevated_recovery_impl.h"
+ #include "chrome/elevation_service/elevator.h"
+ #include "chrome/install_static/install_util.h"
+@@ -20,11 +19,11 @@
+ namespace elevation_service {
 
-   install_static::InitializeProductDetailsForPrimaryModule();
+ uint16_t Delegate::GetLogEventCategory() {
+-  return ELEVATION_SERVICE_CATEGORY;
++  return 0;
+ }
 
--  // Enable logging to the Windows Event Log.
--  logging::SetEventSource(
--      base::WideToUTF8(
--          install_static::InstallDetails::Get().install_full_name()),
--      ELEVATION_SERVICE_CATEGORY, MSG_ELEVATION_SERVICE_LOG_MESSAGE);
--
-   // Make sure the process exits cleanly on unexpected errors.
-   base::EnableTerminationOnHeapCorruption();
-   base::EnableTerminationOnOutOfMemory();
+ uint32_t Delegate::GetLogEventMessageId() {
+-  return MSG_ELEVATION_SERVICE_LOG_MESSAGE;
++  return 0;
+ }
+
+ 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") {
+   ]
+   deps = [
+     ":lib",
+-    "//chrome/common/win:eventlog_provider",
+     "//chrome/install_static:install_static_util",
+     "//services/tracing/public/cpp",
+   ]
+--- a/chrome/windows_services/elevated_tracing_service/elevated_tracing_service_delegate.cc
++++ b/chrome/windows_services/elevated_tracing_service/elevated_tracing_service_delegate.cc
+@@ -15,7 +15,6 @@
+ #include "base/task/sequenced_task_runner.h"
+ #include "base/task/thread_pool.h"
+ #include "base/task/thread_pool/thread_pool_instance.h"
+-#include "chrome/common/win/eventlog_messages.h"
+ #include "chrome/install_static/install_util.h"
+ #include "chrome/windows_services/elevated_tracing_service/session_registry.h"
+ #include "chrome/windows_services/elevated_tracing_service/system_tracing_session.h"
+@@ -79,11 +78,11 @@ Delegate::Delegate() = default;
+ Delegate::~Delegate() = default;
+
+ uint16_t Delegate::GetLogEventCategory() {
+-  return TRACING_SERVICE_CATEGORY;
++  return 0;
+ }
+
+ uint32_t Delegate::GetLogEventMessageId() {
+-  return MSG_TRACING_SERVICE_LOG_MESSAGE;
++  return 0;
+ }
+
+ base::expected<base::HeapArray<FactoryAndClsid>, HRESULT>

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
-@@ -480,11 +480,6 @@ python_library("chromedriver_py_tests")
+@@ -482,11 +482,6 @@ python_library("chromedriver_py_tests")
    if (is_component_build && is_mac) {
      data_deps += [ "//chrome:chrome_framework" ]
    }
@@ -72,7 +72,7 @@
  python_library("chromedriver_py_tests_headless_shell") {
 --- a/tools/perf/chrome_telemetry_build/BUILD.gn
 +++ b/tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -43,10 +43,6 @@ group("telemetry_chrome_test") {
+@@ -37,10 +37,6 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome" ]
    }
 

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

@@ -11,7 +11,7 @@
 
 --- a/build/config/rust.gni
 +++ b/build/config/rust.gni
-@@ -59,7 +59,7 @@ declare_args() {
+@@ -58,7 +58,7 @@ declare_args() {
    # To use a custom toolchain instead, specify an absolute path to the root of
    # a Rust sysroot, which will have a 'bin' directory and others. Commonly
    # <home dir>/.rustup/toolchains/nightly-<something>-<something>
@@ -20,7 +20,7 @@
 
    # Directory under which to find `bin/bindgen` (a `bin` directory containing
    # the bindgen exectuable).
-@@ -69,7 +69,7 @@ declare_args() {
+@@ -68,7 +68,7 @@ declare_args() {
    # set this to the output of `rustc -V`. Changing this string will cause all
    # Rust targets to be rebuilt, which allows you to update your toolchain and
    # not break incremental builds.
@@ -48,15 +48,18 @@
    cargo_pkg_authors = "Microsoft"
    cargo_pkg_name = "windows_i686_msvc"
    cargo_pkg_description = "Import lib for Windows"
-@@ -28,9 +28,9 @@ cargo_crate("lib") {
+@@ -28,12 +28,12 @@ cargo_crate("lib") {
    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.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" ]
+   rustflags = [
+     "--cap-lints=allow",  # Suppress all warnings in crates.io crates
+   ]
+-  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/src/../lib/windows.0.52.0.lib" ]
 +  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/lib/windows.0.52.0.lib" ]
 
    # Only for usage from third-party crates. Add the crate to
@@ -80,15 +83,18 @@
    cargo_pkg_authors = "Microsoft"
    cargo_pkg_name = "windows_x86_64_msvc"
    cargo_pkg_description = "Import lib for Windows"
-@@ -28,9 +28,9 @@ cargo_crate("lib") {
+@@ -28,12 +28,12 @@ cargo_crate("lib") {
    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.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" ]
+   rustflags = [
+     "--cap-lints=allow",  # Suppress all warnings in crates.io crates
+   ]
+-  native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/src/../lib/windows.0.52.0.lib" ]
 +  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" ]
 
    # Only for usage from third-party crates. Add the crate to