Merge pull request #385 from teeminus/update

build.py

@@ -182,7 +182,7 @@ def main():
             gnpath = source_tree / 'uc_staging' / 'gn_win'
             gnpath.mkdir(parents=True, exist_ok=True)
             subprocess.run(['git', 'clone', 'https://gn.googlesource.com/gn', str(gnpath)], check=True)
-            subprocess.run(['git', 'reset', '--hard', 'b2afae122eeb6ce09c52d63f67dc53fc517dbdc8'], cwd=gnpath, check=True)
+            subprocess.run(['git', 'reset', '--hard', 'd010e218ca7077928ad7c9e9cc02fe43b5a8a0ad'], cwd=gnpath, check=True)
             subprocess.run(['git', 'clean', '-ffdx'], cwd=gnpath, check=True)
             subprocess.run([sys.executable, str(gnpath / 'build' / 'gen.py')], check=True)
             for item in gnpath.iterdir():
@@ -275,7 +275,7 @@ def main():
 
         # Generate version file
         with open(RUST_FLAG_FILE, 'w') as f:
-            f.write('rustc 1.81.0-nightly (f8e566053 2024-06-14)')
+            f.write('rustc 1.82.0-nightly (612a33f20 2024-07-29)')
             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-06-15
+version = 2024-07-30
 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-06-15
+version = 2024-07-30
 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-compile-mini-installer.patch

@@ -9,8 +9,8 @@
      "//chrome/browser/extensions/default_extensions",
 -    "//chrome/common/win:eventlog_provider",
      "//chrome/installer/setup",
-     "//mojo/core:shared_library",
      "//third_party/icu:icudata",
+   ]
 --- a/chrome/tools/build/win/create_installer_archive.py
 +++ b/chrome/tools/build/win/create_installer_archive.py
 @@ -224,12 +224,14 @@ def GenerateDiffPatch(options, orig_file

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
-@@ -1605,8 +1605,7 @@ config("compiler_deterministic") {
+@@ -1620,8 +1620,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_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
-@@ -2481,7 +2481,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2505,7 +2505,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }

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

@@ -15,15 +15,15 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_ENTRIES_H_
 --- a/components/os_crypt/async/browser/dpapi_key_provider.cc
 +++ b/components/os_crypt/async/browser/dpapi_key_provider.cc
-@@ -9,6 +9,7 @@
+@@ -14,6 +14,7 @@
  #include <wincrypt.h>
 
  #include "base/base64.h"
 +#include "base/command_line.h"
  #include "base/logging.h"
  #include "base/metrics/histogram_functions.h"
  #include "base/types/expected.h"
-@@ -35,6 +36,9 @@ constexpr uint8_t kDPAPIKeyPrefix[] = {'
+@@ -40,6 +41,9 @@ constexpr uint8_t kDPAPIKeyPrefix[] = {'
 
  std::optional<std::vector<uint8_t>> DecryptKeyWithDPAPI(
      base::span<const uint8_t> ciphertext) {

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

@@ -3,7 +3,7 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -429,7 +429,6 @@ static_library("common_lib") {
+@@ -380,7 +380,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",

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

@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -71,29 +71,6 @@ if (is_win && enable_resource_allowlist_
+@@ -75,29 +75,6 @@ if (is_win && enable_resource_allowlist_
    _chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt"
  }
 
@@ -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
-@@ -131,10 +108,6 @@ if (!is_android && !is_mac) {
+@@ -135,10 +112,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,7 +43,7 @@
    }
 
    template("_chrome_exe") {
-@@ -146,11 +119,7 @@ if (!is_android && !is_mac) {
+@@ -150,11 +123,7 @@ if (!is_android && !is_mac) {
      target(_type, target_name) {
        configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
        configs += [ "//build/config/compiler:thinlto_optimize_max" ]

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

@@ -10,7 +10,7 @@
 
 --- a/chrome/installer/setup/uninstall.cc
 +++ b/chrome/installer/setup/uninstall.cc
-@@ -62,8 +62,6 @@
+@@ -68,8 +68,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;
 
-@@ -106,22 +104,6 @@ void ProcessChromeWorkItems(const Instal
+@@ -112,22 +110,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) {
-@@ -845,11 +827,6 @@ InstallStatus UninstallProduct(const Mod
+@@ -886,11 +868,6 @@ InstallStatus UninstallProduct(const Mod
      }
    }
 

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

@@ -1,6 +1,6 @@
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2873,7 +2873,6 @@ source_set("browser") {
+@@ -2908,7 +2908,6 @@ source_set("browser") {
      deps += [
        "//components/app_launch_prefetch",
        "//content/utility:delegate_data",

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
-@@ -252,8 +252,6 @@ clang_lib("compiler_builtins") {
+@@ -247,8 +247,6 @@ clang_lib("compiler_builtins") {
      } else {
        libname = "ios"
      }

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

@@ -15,6 +15,24 @@
 
      deps += [
        "//build:branding_buildflags",
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -5048,7 +5048,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:
+@@ -5149,7 +5148,6 @@ bool ChromeContentBrowserClient::PreSpaw
+ #endif
+     case sandbox::mojom::Sandbox::kPrintCompositor:
+ #if !BUILDFLAG(IS_ANDROID)
+-    case sandbox::mojom::Sandbox::kScreenAI:
+ #endif
+     case sandbox::mojom::Sandbox::kAudio:
+     case sandbox::mojom::Sandbox::kOnDeviceModelExecution:
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
 @@ -7,6 +7,7 @@ import("//components/safe_browsing/build

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

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

patches/ungoogled-chromium/windows/windows-fix-missing-includes.patch

@@ -8,3 +8,14 @@
 
  #include "base/check.h"
 
+--- a/third_party/re2/src/re2/re2.h
++++ b/third_party/re2/src/re2/re2.h
+@@ -220,7 +220,7 @@
+ #include "absl/base/call_once.h"
+ #include "absl/strings/string_view.h"
+ #include "absl/types/optional.h"
+-#include "re2/stringpiece.h"
++#include "stringpiece.h"
+
+ #if defined(__APPLE__)
+ #include <TargetConditionals.h>

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