Merge pull request #348 from teeminus/update

ungoogled-software · May 17, 2024 · 709e95b · 709e95b
2 parents 74f79a9 + dbba587
commit 709e95b
Show file tree

Hide file tree

Showing 21 changed files with 342 additions and 309 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 `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. Current revision is `ab71ee7a9214c2793108a41efb065aa77aeb7326`
+1. Get date for nightly rust build from rust github page: `https://github.com/rust-lang/rust/commit/ab71ee7a9214c2793108a41efb065aa77aeb7326`
+	1. In this case, the corresponding nightly build date is `2024-04-12`
 	1. Adapt `downloads.ini` accordingly
-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. Download nightly rust build from: https://static.rust-lang.org/dist/2024-04-12/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 (bb594538f 2024-02-20)')
+            f.write('rustc 1.79.0-nightly (a07f3eb43 2024-04-11)')
             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-21
+version = 2024-04-12
 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-21
+version = 2024-04-12
 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/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
-@@ -1582,7 +1582,7 @@ config("compiler_deterministic") {
+@@ -1600,7 +1600,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
-@@ -2451,7 +2451,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2450,7 +2450,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-encryption.patch b/patches/ungoogled-chromium/windows/windows-disable-encryption.patch
@@ -35,15 +35,15 @@
    input.cbData = static_cast<DWORD>(ciphertext.size());
 --- a/components/os_crypt/sync/os_crypt_win.cc
 +++ b/components/os_crypt/sync/os_crypt_win.cc
-@@ -5,6 +5,7 @@
+@@ -7,6 +7,7 @@
  #include <windows.h>
 
  #include "base/base64.h"
 +#include "base/command_line.h"
  #include "base/containers/span.h"
  #include "base/feature_list.h"
  #include "base/logging.h"
-@@ -46,6 +47,10 @@ constexpr char kDPAPIKeyPrefix[] = "DPAP
+@@ -47,6 +48,10 @@ constexpr char kDPAPIKeyPrefix[] = "DPAP
 
  bool EncryptStringWithDPAPI(const std::string& plaintext,
                              std::string* ciphertext) {
@@ -54,7 +54,7 @@
    DATA_BLOB input;
    input.pbData =
        const_cast<BYTE*>(reinterpret_cast<const BYTE*>(plaintext.data()));
-@@ -80,6 +85,11 @@ bool EncryptStringWithDPAPI(const std::s
+@@ -81,6 +86,11 @@ bool EncryptStringWithDPAPI(const std::s
 
  bool DecryptStringWithDPAPI(const std::string& ciphertext,
                              std::string* plaintext) {

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
-@@ -426,7 +426,6 @@ static_library("common_lib") {
+@@ -425,7 +425,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",
@@ -33,3 +33,36 @@
  #endif
 
    base::StatisticsRecorder::InitLogOnShutdown();
+--- a/chrome/elevation_service/BUILD.gn
++++ b/chrome/elevation_service/BUILD.gn
+@@ -53,7 +53,6 @@ executable("elevation_service") {
+     ":version_resources",
+     "//base",
+     "//build/win:default_exe_manifest",
+-    "//chrome/common/win:eventlog_provider",
+     "//chrome/install_static:install_static_util",
+     "//chrome/install_static:primary_module",
+     "//components/crx_file",
+--- a/chrome/elevation_service/elevation_service.cc
++++ b/chrome/elevation_service/elevation_service.cc
+@@ -12,7 +12,6 @@
+ #include "base/syslog_logging.h"
+ #include "base/win/process_startup_helper.h"
+ #include "base/win/scoped_com_initializer.h"
+-#include "chrome/common/win/eventlog_messages.h"
+ #include "chrome/elevation_service/service_main.h"
+ #include "chrome/install_static/install_details.h"
+ #include "chrome/install_static/product_install_details.h"
+@@ -34,12 +33,6 @@ extern "C" int WINAPI wWinMain(HINSTANCE
+
+   install_static::InitializeProductDetailsForPrimaryModule();
+
+-  // Enable logging to the Windows Event Log.
+-  logging::SetEventSource(
+-      base::WideToUTF8(
+-          install_static::InstallDetails::Get().install_full_name()),
+-      ELEVATION_SERVICE_CATEGORY, MSG_ELEVATION_SERVICE_LOG_MESSAGE);
+-
+   // Make sure the process exits cleanly on unexpected errors.
+   base::EnableTerminationOnHeapCorruption();
+   base::EnableTerminationOnOutOfMemory();
diff --git a/patches/ungoogled-chromium/windows/windows-disable-machine-id.patch b/patches/ungoogled-chromium/windows/windows-disable-machine-id.patch
@@ -14,15 +14,15 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_ENTRIES_H_
 --- a/components/metrics/machine_id_provider_win.cc
 +++ b/components/metrics/machine_id_provider_win.cc
-@@ -9,6 +9,7 @@
+@@ -10,6 +10,7 @@
  #include <winioctl.h>
 
  #include "base/base_paths.h"
 +#include "base/command_line.h"
  #include "base/files/file_path.h"
  #include "base/notreached.h"
  #include "base/path_service.h"
-@@ -19,6 +20,9 @@ namespace metrics {
+@@ -20,6 +21,9 @@ namespace metrics {
 
  // static
  bool MachineIdProvider::HasId() {
@@ -32,7 +32,7 @@
    return true;
  }
 
-@@ -26,6 +30,10 @@ bool MachineIdProvider::HasId() {
+@@ -27,6 +31,10 @@ bool MachineIdProvider::HasId() {
  // is running from.
  // static
  std::string MachineIdProvider::GetMachineId() {

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
-@@ -1124,7 +1124,7 @@ component("base") {
+@@ -1134,7 +1134,7 @@ component("base") {
      public_deps += [ "//build/rust:cxx_cppdeps" ]
    }
 

diff --git a/patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch b/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
-@@ -482,11 +482,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" ]
    }

diff --git a/patches/ungoogled-chromium/windows/windows-disable-rlz.patch b/patches/ungoogled-chromium/windows/windows-disable-rlz.patch
@@ -10,7 +10,7 @@
 
 --- a/chrome/installer/setup/uninstall.cc
 +++ b/chrome/installer/setup/uninstall.cc
-@@ -60,8 +60,6 @@
+@@ -61,8 +61,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;
 
-@@ -104,22 +102,6 @@ void ProcessChromeWorkItems(const Instal
+@@ -105,22 +103,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) {
-@@ -843,11 +825,6 @@ InstallStatus UninstallProduct(const Mod
+@@ -844,11 +826,6 @@ InstallStatus UninstallProduct(const Mod
      }
    }
 

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
-@@ -218,8 +218,6 @@ clang_lib("compiler_builtins") {
+@@ -227,8 +227,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 (bb594538f 2024-02-20)"
++  rustc_version = "rustc 1.79.0-nightly (a07f3eb43 2024-04-11)"
 
    # 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
@@ -15,6 +15,18 @@
 
      deps += [
        "//build:branding_buildflags",
+--- a/chrome/browser/net/profile_network_context_service.cc
++++ b/chrome/browser/net/profile_network_context_service.cc
+@@ -952,8 +952,7 @@ ProfileNetworkContextService::CreateClie
+
+   return store;
+ #elif BUILDFLAG(IS_WIN)
+-  return GetWrappedCertStore(profile_,
+-                             std::make_unique<net::ClientCertStoreWin>());
++  return nullptr;
+ #elif BUILDFLAG(IS_MAC)
+   return GetWrappedCertStore(profile_,
+                              std::make_unique<net::ClientCertStoreMac>());
 --- 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
@@ -37,7 +37,7 @@
  // Page-related commands
  #define IDC_BOOKMARK_THIS_TAB           35000
  #define IDC_BOOKMARK_ALL_TABS           35001
-@@ -250,7 +240,7 @@
+@@ -251,7 +241,7 @@
  #define IDC_CHROME_TIPS                40263
  #define IDC_CHROME_WHATS_NEW           40264
 
@@ -46,7 +46,7 @@
  #define IDC_LACROS_DATA_MIGRATION      40265
  #endif
 
-@@ -464,7 +454,7 @@
+@@ -465,7 +455,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
-@@ -501,7 +491,7 @@
+@@ -502,7 +492,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-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
-@@ -49,7 +49,7 @@
+@@ -51,7 +51,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
@@ -13,7 +13,7 @@
  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
+@@ -1646,9 +1646,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },
@@ -23,7 +23,7 @@
    { key::kBrowserLegacyExtensionPointsBlocked,
      prefs::kBlockBrowserLegacyExtensionPoints,
      base::Value::Type::BOOLEAN },
-@@ -2112,12 +2109,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -2118,12 +2115,6 @@ const PolicyToPreferenceMapEntry kSimple
      prefs::kCAPlatformIntegrationEnabled,
      base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(CHROME_CERTIFICATE_POLICIES_SUPPORTED)

diff --git a/patches/ungoogled-chromium/windows/windows-fix-showIncludes.patch b/patches/ungoogled-chromium/windows/windows-fix-showIncludes.patch
@@ -1,16 +1,6 @@
 --- a/build/toolchain/win/toolchain.gni
 +++ b/build/toolchain/win/toolchain.gni
-@@ -53,6 +53,9 @@ template("msvc_toolchain") {
-       toolchain_is_clang = is_clang
-     }
-
-+    # Suppress unread variable error
-+    toolchain_is_clang = toolchain_is_clang
-+
-     # When the invoker has explicitly overridden use_goma or cc_wrapper in the
-     # toolchain args, use those values, otherwise default to the global one.
-     # This works because the only reasonable override that toolchains might
-@@ -216,15 +219,11 @@ template("msvc_toolchain") {
+@@ -204,15 +204,11 @@ template("msvc_toolchain") {
 
      # Disabled with cc_wrapper because of
      # https://github.com/mozilla/sccache/issues/1013

diff --git a/patches/ungoogled-chromium/windows/windows-no-unknown-warnings.patch b/patches/ungoogled-chromium/windows/windows-no-unknown-warnings.patch
@@ -3,7 +3,7 @@
 
 --- a/build/config/win/BUILD.gn
 +++ b/build/config/win/BUILD.gn
-@@ -70,6 +70,7 @@ config("compiler") {
+@@ -69,6 +69,7 @@ config("compiler") {
    if (is_clang) {
      cflags += [
        "/Zc:twoPhase",