Merge pull request #399 from teeminus/update

build.py

@@ -177,24 +177,6 @@ def main():
             # Clone sources
             subprocess.run([sys.executable, str(Path('ungoogled-chromium', 'utils', 'clone.py')), '-o', 'build\\src', '-p', 'win32' if args.x86 else 'win64'], check=True)
 
-            # Setup GN
-            get_logger().info('Setting up GN...')
-            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', '20806f79c6b4ba295274e3a589d85db41a02fdaa'], 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():
-                if not item.is_dir():
-                    shutil.copy(item, source_tree / 'tools' / 'gn')
-                elif item.name != '.git' and item.name != 'out':
-                    shutil.copytree(item, source_tree / 'tools' / 'gn' / item.name, dirs_exist_ok=True)
-            last_commit_position = source_tree / 'tools' / 'gn' / 'bootstrap' / 'last_commit_position.h'
-            if last_commit_position.exists():
-                last_commit_position.unlink()
-            shutil.move(str(gnpath / 'out' / 'last_commit_position.h'), str(last_commit_position))
-
         # Retrieve windows downloads
         get_logger().info('Downloading required files...')
         download_info_win = downloads.DownloadInfo([_ROOT_DIR / 'downloads.ini'])
@@ -275,7 +257,7 @@ def main():
 
         # Generate version file
         with open(RUST_FLAG_FILE, 'w') as f:
-            f.write('rustc 1.83.0-nightly (4ac7bcbaa 2024-09-04)')
+            f.write('rustc 1.83.0-nightly (7042c269c 2024-09-23)')
             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-09-05
+version = 2024-09-24
 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-05
+version = 2024-09-24
 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
-@@ -1625,8 +1625,7 @@ config("compiler_deterministic") {
+@@ -1628,8 +1628,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
-@@ -2494,7 +2494,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2493,7 +2493,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }

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

@@ -11,7 +11,7 @@
    ]
    sources = [
      "all_messages.h",
-@@ -380,7 +379,6 @@ static_library("common_lib") {
+@@ -378,7 +377,6 @@ static_library("common_lib") {
        "conflicts/remote_module_watcher_win.cc",
        "conflicts/remote_module_watcher_win.h",
      ]

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
-@@ -479,11 +479,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" ]
    }

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) {
-@@ -886,11 +868,6 @@ InstallStatus UninstallProduct(const Mod
+@@ -894,11 +876,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
-@@ -2896,7 +2896,6 @@ source_set("browser") {
+@@ -2885,7 +2885,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
-@@ -246,8 +246,6 @@ clang_lib("compiler_builtins") {
+@@ -220,8 +220,6 @@ clang_lib("compiler_builtins") {
      } else {
        libname = "ios"
      }

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
-@@ -5061,7 +5061,6 @@ std::wstring ChromeContentBrowserClient:
+@@ -5051,7 +5051,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:
-     case sandbox::mojom::Sandbox::kSpeechRecognition:
-     case sandbox::mojom::Sandbox::kPdfConversion:
-@@ -5163,7 +5162,6 @@ bool ChromeContentBrowserClient::PreSpaw
+ #endif
+@@ -5155,7 +5154,6 @@ bool ChromeContentBrowserClient::PreSpaw
  #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:
 --- 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-command-ids.patch

@@ -37,7 +37,7 @@
  // Page-related commands
  #define IDC_BOOKMARK_THIS_TAB           35000
  #define IDC_BOOKMARK_ALL_TABS           35001
-@@ -468,7 +458,7 @@
+@@ -469,7 +459,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
-@@ -505,7 +495,7 @@
+@@ -506,7 +496,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
-@@ -1722,9 +1722,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1737,9 +1737,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },