Merge pull request #413 from teeminus/update

teeminus · web-flow · commit dcd3e214e058 · 2025-01-20T07:51:55.000+01:00
diff --git a/build.py b/build.py
@@ -257,7 +257,7 @@ def main():
 
         # Generate version file
         with open(RUST_FLAG_FILE, 'w') as f:
-            f.write('rustc 1.83.0-nightly (7042c269c 2024-09-23)')
+            f.write('rustc 1.84.0-nightly (439284741 2024-10-21)')
             f.write('\n')
 
     if not args.ci or not (source_tree / 'out/Default').exists():
diff --git a/domain_substitution.list b/domain_substitution.list
diff --git a/downloads.ini b/downloads.ini
@@ -113,13 +113,13 @@ strip_leading_dirs=DirectX-Headers-%(version)s
 
 # Rust
 [rust-x64]
-version = 2024-09-24
+version = 2024-10-22
 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-09-24
+version = 2024-10-22
 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
diff --git a/patches/series b/patches/series
@@ -22,4 +22,3 @@ 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
diff --git a/patches/ungoogled-chromium/windows/windows-disable-clang-version-check.patch b/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
-@@ -1628,8 +1628,7 @@ config("compiler_deterministic") {
+@@ -1648,8 +1648,7 @@ config("compiler_deterministic") {
  }
  
  config("clang_revision") {
diff --git a/patches/ungoogled-chromium/windows/windows-disable-download-warning-prompt.patch b/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
-@@ -2493,7 +2493,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2486,7 +2486,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }
diff --git a/patches/ungoogled-chromium/windows/windows-disable-event-log.patch b/patches/ungoogled-chromium/windows/windows-disable-event-log.patch
@@ -29,7 +29,7 @@
  #include "chrome/install_static/install_details.h"
  #include "sandbox/policy/switches.h"
  #endif
-@@ -537,11 +536,6 @@ void InitChromeLogging(const base::Comma
+@@ -538,11 +537,6 @@ void InitChromeLogging(const base::Comma
  #if BUILDFLAG(IS_WIN)
    // Enable trace control and transport through event tracing for Windows.
    LogEventProvider::Initialize(kChromeTraceProviderName);
diff --git a/patches/ungoogled-chromium/windows/windows-disable-machine-id.patch b/patches/ungoogled-chromium/windows/windows-disable-machine-id.patch
@@ -45,12 +45,13 @@
  
 --- a/services/preferences/tracked/device_id_win.cc
 +++ b/services/preferences/tracked/device_id_win.cc
-@@ -10,11 +10,16 @@
+@@ -10,12 +10,17 @@
  
  #include <memory>
  
 +#include "base/command_line.h"
  #include "base/check.h"
+ #include "base/containers/heap_array.h"
  
  MachineIdStatus GetDeterministicMachineSpecificId(std::string* machine_id) {
    DCHECK(machine_id);
diff --git a/patches/ungoogled-chromium/windows/windows-disable-rlz.patch b/patches/ungoogled-chromium/windows/windows-disable-rlz.patch
@@ -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) {
-@@ -894,11 +876,6 @@ InstallStatus UninstallProduct(const Mod
+@@ -893,11 +875,6 @@ InstallStatus UninstallProduct(const Mod
      }
    }
  
diff --git a/patches/ungoogled-chromium/windows/windows-fix-building-with-prunned-binaries.patch b/patches/ungoogled-chromium/windows/windows-fix-building-with-prunned-binaries.patch
diff --git a/patches/ungoogled-chromium/windows/windows-fix-building-with-rust.patch b/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
-@@ -220,8 +220,6 @@ clang_lib("compiler_builtins") {
+@@ -223,8 +223,6 @@ clang_lib("compiler_builtins") {
      } else {
        libname = "ios"
      }
@@ -11,7 +11,7 @@
  
 --- a/build/config/rust.gni
 +++ b/build/config/rust.gni
-@@ -54,7 +54,7 @@ declare_args() {
+@@ -59,7 +59,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).
-@@ -64,7 +64,7 @@ declare_args() {
+@@ -69,7 +69,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.
diff --git a/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch b/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch
@@ -17,22 +17,22 @@
        "//build:branding_buildflags",
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5051,7 +5051,6 @@ std::wstring ChromeContentBrowserClient:
+@@ -5079,7 +5079,6 @@ std::wstring ChromeContentBrowserClient:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
      case sandbox::mojom::Sandbox::kAudio:
 -    case sandbox::mojom::Sandbox::kScreenAI:
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-     case sandbox::mojom::Sandbox::kVideoEffects:
- #endif
-@@ -5155,7 +5154,6 @@ bool ChromeContentBrowserClient::PreSpaw
+     case sandbox::mojom::Sandbox::kSpeechRecognition:
+     case sandbox::mojom::Sandbox::kPdfConversion:
+     case sandbox::mojom::Sandbox::kService:
+@@ -5176,7 +5175,6 @@ bool ChromeContentBrowserClient::PreSpaw
+     case sandbox::mojom::Sandbox::kPrintBackend:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
- #if !BUILDFLAG(IS_ANDROID)
 -    case sandbox::mojom::Sandbox::kScreenAI:
- #endif
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-     case sandbox::mojom::Sandbox::kVideoEffects:
+     case sandbox::mojom::Sandbox::kAudio:
+     case sandbox::mojom::Sandbox::kOnDeviceModelExecution:
+     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
@@ -51,7 +51,7 @@
 +#endif
 --- a/chrome/browser/signin/signin_util_win.cc
 +++ b/chrome/browser/signin/signin_util_win.cc
-@@ -275,12 +275,6 @@ bool IsGCPWUsedInOtherProfile(Profile* p
+@@ -276,12 +276,6 @@ bool IsGCPWUsedInOtherProfile(Profile* p
  }
  
  void SigninWithCredentialProviderIfPossible(Profile* profile) {
diff --git a/patches/ungoogled-chromium/windows/windows-fix-command-ids.patch b/patches/ungoogled-chromium/windows/windows-fix-command-ids.patch
@@ -37,7 +37,7 @@
  // Page-related commands
  #define IDC_BOOKMARK_THIS_TAB           35000
  #define IDC_BOOKMARK_ALL_TABS           35001
-@@ -469,7 +459,7 @@
+@@ -470,7 +460,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
  
  // Context menu items for media toolbar button
@@ -46,7 +46,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -506,7 +496,7 @@
+@@ -507,7 +497,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
  
diff --git a/patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch b/patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch
@@ -1,6 +1,6 @@
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -811,7 +811,7 @@ def _GnBinary():
+@@ -812,7 +812,7 @@ def _GnBinary():
    elif sys.platform == 'darwin':
      subdir = 'mac'
    elif sys.platform == 'win32':
diff --git a/patches/ungoogled-chromium/windows/windows-fix-rc-terminating-error.patch b/patches/ungoogled-chromium/windows/windows-fix-rc-terminating-error.patch
@@ -2,7 +2,7 @@
 
 --- a/build/build_config.h
 +++ b/build/build_config.h
-@@ -51,7 +51,7 @@
+@@ -49,7 +49,7 @@
  //    ARCH_CPU_31_BITS / ARCH_CPU_32_BITS / ARCH_CPU_64_BITS
  //    ARCH_CPU_BIG_ENDIAN / ARCH_CPU_LITTLE_ENDIAN
  
diff --git a/patches/ungoogled-chromium/windows/windows-fix-remove-unused-preferences-fields.patch b/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
-@@ -1737,9 +1737,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1757,9 +1757,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },
diff --git a/pruning.list b/pruning.list
diff --git a/ungoogled-chromium b/ungoogled-chromium

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`--- a/build/config/compiler/BUILD.gn`
`2`	`2`	`+++ b/build/config/compiler/BUILD.gn`
`3`		`-@@ -1628,8 +1628,7 @@ config("compiler_deterministic") {`
	`3`	`+@@ -1648,8 +1648,7 @@ config("compiler_deterministic") {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`config("clang_revision") {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`--- a/components/download/internal/common/download_item_impl.cc`
`2`	`2`	`+++ b/components/download/internal/common/download_item_impl.cc`
`3`		`-@@ -2493,7 +2493,7 @@ void DownloadItemImpl::SetDangerType(Dow`
	`3`	`+@@ -2486,7 +2486,7 @@ void DownloadItemImpl::SetDangerType(Dow`
`4`	`4`	`TRACE_EVENT_SCOPE_THREAD, "danger_type",`
`5`	`5`	`GetDownloadDangerNames(danger_type).c_str());`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`// Removes all files from the installer directory. Returns false in case of an`
`43`	`43`	`// error.`
`44`	`44`	`bool RemoveInstallerFiles(const base::FilePath& installer_directory) {`
`45`		`-@@ -894,11 +876,6 @@ InstallStatus UninstallProduct(const Mod`
	`45`	`+@@ -893,11 +875,6 @@ InstallStatus UninstallProduct(const Mod`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`