Merge pull request #360 from teeminus/update

ungoogled-software · Jun 15, 2024 · 2e55dc5 · 2e55dc5
2 parents 661800f + fa6fe1e
commit 2e55dc5
Show file tree

Hide file tree

Showing 15 changed files with 58,010 additions and 119 deletions.
diff --git a/build.py b/build.py
@@ -252,7 +252,7 @@ def main():
 
         # Generate version file
         with open(RUST_FLAG_FILE, 'w') as f:
-            f.write('rustc 1.79.0-nightly (a07f3eb43 2024-04-11)')
+            f.write('rustc 1.79.0-nightly (ef8b9dcf2 2024-04-24)')
             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
@@ -21,7 +21,7 @@
 #   `http://prereleases.llvm.org/win-snapshots/LLVM-9.8.7-r123456-win64.exe`
 #   (link derived from [LLVM Snapshot Builds](http://llvm.org/builds/))
 [llvm]
-version = 18.1.1
+version = 18.1.6
 #Uncomment when pre-release version is used.
 #url = https://prereleases.llvm.org/win-snapshots/LLVM-%(version)s-win64.exe
 #Uncomment the below instead when a new enough stable version of LLVM comes around
@@ -104,13 +104,13 @@ strip_leading_dirs=package
 
 # Rust
 [rust-x64]
-version = 2024-04-12
+version = 2024-04-25
 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-04-12
+version = 2024-04-25
 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,3 +22,4 @@ ungoogled-chromium/windows/windows-disable-nodebug_assertion.patch
 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
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
-@@ -1600,7 +1600,7 @@ config("compiler_deterministic") {
+@@ -1575,7 +1575,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_revision") {

diff --git a/patches/ungoogled-chromium/windows/windows-disable-event-log.patch b/patches/ungoogled-chromium/windows/windows-disable-event-log.patch
@@ -3,7 +3,7 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -425,7 +425,6 @@ static_library("common_lib") {
+@@ -423,7 +423,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",
@@ -21,7 +21,7 @@
  #include "chrome/install_static/install_details.h"
  #include "sandbox/policy/switches.h"
  #endif
-@@ -543,11 +542,6 @@ void InitChromeLogging(const base::Comma
+@@ -537,11 +536,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-nodebug_assertion.patch b/patches/ungoogled-chromium/windows/windows-disable-nodebug_assertion.patch
@@ -1,7 +1,7 @@
 # Windows does not support weak symbols
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1134,7 +1134,7 @@ component("base") {
+@@ -1135,7 +1135,7 @@ component("base") {
      public_deps += [ "//build/rust:cxx_cppdeps" ]
    }
 

diff --git a/patches/ungoogled-chromium/windows/windows-fix-building-gn.patch b/patches/ungoogled-chromium/windows/windows-fix-building-gn.patch
@@ -16,8 +16,8 @@
 
    shutil.copy2(
        os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)
--  cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn']
-+  cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn.exe']
+-  cmd = [ninja_binary, '-C', gn_build_dir, 'gn']
++  cmd = [ninja_binary, '-C', gn_build_dir, 'gn.exe']
    if options.jobs:
      cmd += ['-j', str(options.jobs)]
    subprocess.check_call(cmd)

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
-@@ -227,8 +227,6 @@ clang_lib("compiler_builtins") {
+@@ -229,8 +229,6 @@ clang_lib("compiler_builtins") {
      } else {
        libname = "ios"
      }
@@ -23,7 +23,7 @@
    # Rust targets to be rebuilt, which allows you to update your toolchain and
    # not break incremental builds.
 -  rustc_version = ""
-+  rustc_version = "rustc 1.79.0-nightly (a07f3eb43 2024-04-11)"
++  rustc_version = "rustc 1.79.0-nightly (ef8b9dcf2 2024-04-24)"
 
    # If you're using a Rust toolchain as specified by rust_sysroot_absolute,
    # you can specify whether it supports nacl here.
diff --git a/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch b/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch
@@ -3,7 +3,7 @@
 
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
-@@ -44,10 +44,7 @@ source_set("chrome_dll_resources") {
+@@ -42,10 +42,7 @@ source_set("chrome_dll_resources") {
    deps = [ ":command_ids" ]
 
    if (is_win) {

diff --git a/patches/ungoogled-chromium/windows/windows-fix-command-ids.patch b/patches/ungoogled-chromium/windows/windows-fix-command-ids.patch
@@ -14,7 +14,7 @@
  #define IDC_USE_SYSTEM_TITLE_BAR        34051
  #endif
 
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete.
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if (0)
  #define IDC_RESTORE_WINDOW              34052
@@ -37,7 +37,7 @@
  // Page-related commands
  #define IDC_BOOKMARK_THIS_TAB           35000
  #define IDC_BOOKMARK_ALL_TABS           35001
-@@ -251,7 +241,7 @@
+@@ -250,7 +240,7 @@
  #define IDC_CHROME_TIPS                40263
  #define IDC_CHROME_WHATS_NEW           40264
 
@@ -46,7 +46,7 @@
  #define IDC_LACROS_DATA_MIGRATION      40265
  #endif
 
-@@ -465,7 +455,7 @@
+@@ -469,7 +459,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -55,7 +55,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -502,7 +492,7 @@
+@@ -506,7 +496,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-missing-includes.patch b/patches/ungoogled-chromium/windows/windows-fix-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/third_party/blink/renderer/core/xml/xslt_extensions.cc
++++ b/third_party/blink/renderer/core/xml/xslt_extensions.cc
+@@ -30,6 +30,7 @@
+ #include <libxslt/extensions.h>
+ #include <libxslt/extra.h>
+ #include <libxslt/xsltutils.h>
++#include <cstdlib>
+
+ #include "base/check.h"
+
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,19 +1,6 @@
---- a/chrome/browser/enterprise/connectors/connectors_prefs.cc
-+++ b/chrome/browser/enterprise/connectors/connectors_prefs.cc
-@@ -69,10 +69,6 @@ void RegisterProfilePrefs(PrefRegistrySi
- #endif
-   registry->RegisterIntegerPref(kOnSecurityEventScopePref, 0);
-   RegisterDeviceTrustConnectorProfilePrefs(registry);
--
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
--  client_certificates::RegisterProfilePrefs(registry);
--#endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
- }
-
- void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -1646,9 +1646,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1648,9 +1648,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },
@@ -23,16 +10,3 @@
    { key::kBrowserLegacyExtensionPointsBlocked,
      prefs::kBlockBrowserLegacyExtensionPoints,
      base::Value::Type::BOOLEAN },
-@@ -2118,12 +2115,6 @@ const PolicyToPreferenceMapEntry kSimple
-     prefs::kCAPlatformIntegrationEnabled,
-     base::Value::Type::BOOLEAN },
- #endif // BUILDFLAG(CHROME_CERTIFICATE_POLICIES_SUPPORTED)
--
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
--  { key::kProvisionManagedClientCertificateForUser,
--    client_certificates::prefs::kProvisionManagedClientCertificateForUserPrefs,
--    base::Value::Type::INTEGER },
--#endif  //
- };
- // clang-format on
-