Merge pull request #338 from teeminus/update

ungoogled-software · Apr 22, 2024 · 6571e55 · 6571e55
2 parents c1eba51 + b2a50d3
commit 6571e55
Show file tree

Hide file tree

Showing 18 changed files with 446 additions and 472 deletions.
diff --git a/README.md b/README.md
@@ -128,11 +128,11 @@ ln -s /usr/bin/vim /usr/bin/vi
 
 ### Update rust
 1. Check `RUST_REVISION` constant in file `tools/rust/update_rust.py` in build root.
-	1. Current revision is `340bb19fea20fd5f9357bbfac542fad84fc7ea2b`
-1. Get date for nightly rust build from rust github page: `https://github.com/rust-lang/rust/commit/340bb19fea20fd5f9357bbfac542fad84fc7ea2b`
-	1. In this case, the corresponding nightly build date is `2024-02-14`
+	1. Current revision is `7168c13579a550f2c47f7eea22f5e226a436cd00`
+1. Get date for nightly rust build from rust github page: `https://github.com/rust-lang/rust/commit/7168c13579a550f2c47f7eea22f5e226a436cd00`
+	1. In this case, the corresponding nightly build date is `2024-02-21`
 	1. Adapt `downloads.ini` accordingly
-1. Download nightly rust build from: https://static.rust-lang.org/dist/2024-02-14/rust-nightly-x86_64-pc-windows-msvc.tar.gz
+1. Download nightly rust build from: https://static.rust-lang.org/dist/2024-02-21/rust-nightly-x86_64-pc-windows-msvc.tar.gz
 	1. Extract archive
 	1. Execute `rustc\bin\rustc.exe -V` to get rust version string
 	1. Adapt `build.py` accordingly

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.78.0-nightly (a84bb95a1 2024-02-13)')
+            f.write('rustc 1.78.0-nightly (bb594538f 2024-02-20)')
             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
@@ -104,13 +104,13 @@ strip_leading_dirs=package
 
 # Rust
 [rust-x64]
-version = 2024-02-14
+version = 2024-02-21
 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-02-14
+version = 2024-02-21
 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
@@ -21,3 +21,4 @@ ungoogled-chromium/windows/windows-disable-clang-version-check.patch
 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
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
-@@ -1576,7 +1576,7 @@ config("compiler_deterministic") {
+@@ -1582,7 +1582,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
-@@ -2450,7 +2450,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2451,7 +2451,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
@@ -3,7 +3,7 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -429,7 +429,6 @@ static_library("common_lib") {
+@@ -426,7 +426,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",
@@ -13,15 +13,15 @@
 
 --- a/chrome/common/logging_chrome.cc
 +++ b/chrome/common/logging_chrome.cc
-@@ -70,7 +70,6 @@
- #include "base/logging_win.h"
- #include "base/process/process_info.h"
+@@ -72,7 +72,6 @@
  #include "base/syslog_logging.h"
+ #include "base/win/scoped_handle.h"
+ #include "base/win/win_util.h"
 -#include "chrome/common/win/eventlog_messages.h"
  #include "chrome/install_static/install_details.h"
+ #include "sandbox/policy/switches.h"
  #endif
-
-@@ -468,11 +467,6 @@ void InitChromeLogging(const base::Comma
+@@ -543,11 +542,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,12 +1,12 @@
 # Windows does not support weak symbols
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1119,7 +1119,7 @@ component("base") {
+@@ -1124,7 +1124,7 @@ component("base") {
      public_deps += [ "//build/rust:cxx_cppdeps" ]
    }
 
--  if (use_custom_libcxx && enable_safe_libcxx && !is_debug) {
-+  if (!is_win && use_custom_libcxx && enable_safe_libcxx && !is_debug) {
+-  if (use_nodebug_assertion) {
++  if (!is_win && use_nodebug_assertion) {
      public_deps += [ ":nodebug_assertion" ]
    }
 
diff --git a/patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch b/patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch
@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -70,29 +70,6 @@ if (is_win && enable_resource_allowlist_
+@@ -71,29 +71,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
-@@ -130,10 +107,6 @@ if (!is_android && !is_mac) {
+@@ -131,10 +108,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") {
-@@ -145,11 +118,7 @@ if (!is_android && !is_mac) {
+@@ -146,11 +119,7 @@ if (!is_android && !is_mac) {
      target(_type, target_name) {
        configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
        configs += [ "//build/config/compiler:thinlto_optimize_max" ]
@@ -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
-@@ -473,11 +473,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" ]
    }

diff --git a/patches/ungoogled-chromium/windows/windows-disable-win-build-output.patch b/patches/ungoogled-chromium/windows/windows-disable-win-build-output.patch
@@ -58,7 +58,7 @@
 
 --- a/build/win/message_compiler.py
 +++ b/build/win/message_compiler.py
-@@ -118,24 +118,6 @@ def main():
+@@ -121,24 +121,6 @@ def main():
          header_contents += sorted(define_block, key=lambda s: s.split()[-1])
        with open(header_file, 'wb') as f:
          f.write(''.join(header_contents))
@@ -85,7 +85,7 @@
      sys.exit(e.returncode)
 --- a/third_party/dawn/third_party/gn/dxc/build/message_compiler.py
 +++ b/third_party/dawn/third_party/gn/dxc/build/message_compiler.py
-@@ -137,24 +137,6 @@ def main():
+@@ -140,24 +140,6 @@ def main():
                                            key=lambda s: s.split()[-1])
              with open(header_file, 'w') as f:
                  f.write(''.join(header_contents))

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
-@@ -209,8 +209,6 @@ clang_lib("compiler_builtins") {
+@@ -218,8 +218,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.78.0-nightly (a84bb95a1 2024-02-13)"
++  rustc_version = "rustc 1.78.0-nightly (bb594538f 2024-02-20)"
 
    # 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
-@@ -43,10 +43,7 @@ source_set("chrome_dll_resources") {
+@@ -44,10 +44,7 @@ source_set("chrome_dll_resources") {
    deps = [ ":command_ids" ]
 
    if (is_win) {
@@ -15,34 +15,6 @@
 
      deps += [
        "//build:branding_buildflags",
---- 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
-@@ -2083,12 +2083,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
-
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
 @@ -7,6 +7,7 @@ import("//components/safe_browsing/build

diff --git a/patches/ungoogled-chromium/windows/windows-fix-command-ids.patch b/patches/ungoogled-chromium/windows/windows-fix-command-ids.patch
@@ -46,7 +46,7 @@
  #define IDC_LACROS_DATA_MIGRATION      40265
  #endif
 
-@@ -463,7 +453,7 @@
+@@ -464,7 +454,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
-@@ -500,7 +490,7 @@
+@@ -501,7 +491,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
-@@ -819,7 +819,7 @@ def _GnBinary():
+@@ -824,7 +824,7 @@ def _GnBinary():
    elif sys.platform == 'darwin':
      subdir = 'mac'
    elif sys.platform == 'win32':

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
@@ -0,0 +1,38 @@
+--- 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
+@@ -1641,9 +1641,6 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kRendererAppContainerEnabled,
+     prefs::kRendererAppContainerEnabled,
+     base::Value::Type::BOOLEAN },
+-  { key::kBoundSessionCredentialsEnabled,
+-    prefs::kBoundSessionCredentialsEnabled,
+-    base::Value::Type::BOOLEAN },
+   { key::kBrowserLegacyExtensionPointsBlocked,
+     prefs::kBlockBrowserLegacyExtensionPoints,
+     base::Value::Type::BOOLEAN },
+@@ -2112,12 +2109,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
+