Merge pull request #321 from teeminus/update

ungoogled-software · Feb 22, 2024 · aa63ebc · aa63ebc
2 parents 3d9c780 + b4d4c78
commit aa63ebc
Show file tree

Hide file tree

Showing 15 changed files with 331 additions and 245 deletions.
diff --git a/domain_substitution.list b/domain_substitution.list
diff --git a/patches/inox-patchset/fix-cfi-failures-with-unbundled-libxml.patch b/patches/inox-patchset/fix-cfi-failures-with-unbundled-libxml.patch
@@ -1,6 +1,6 @@
 --- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
 +++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-@@ -138,11 +138,11 @@ class PendingStartElementNSCallback fina
+@@ -142,11 +142,11 @@ class PendingStartElementNSCallback fina
          attribute_count_(attribute_count),
          defaulted_count_(defaulted_count) {
      namespaces_ = static_cast<xmlChar**>(
@@ -14,7 +14,7 @@
      for (int i = 0; i < attribute_count; ++i) {
        // Each attribute has 5 elements in the array:
        // name, prefix, uri, value and an end pointer.
-@@ -157,12 +157,12 @@ class PendingStartElementNSCallback fina
+@@ -161,12 +161,12 @@ class PendingStartElementNSCallback fina
 
    ~PendingStartElementNSCallback() override {
      for (int i = 0; i < namespace_count_ * 2; ++i)
@@ -31,7 +31,7 @@
    }
 
    void Call(XMLDocumentParser* parser) override {
-@@ -210,7 +210,7 @@ class PendingCharactersCallback final
+@@ -214,7 +214,7 @@ class PendingCharactersCallback final
          chars_(xmlStrndup(chars, length)),
          length_(length) {}
 
@@ -40,7 +40,7 @@
 
    void Call(XMLDocumentParser* parser) override {
      parser->Characters(chars_, length_);
-@@ -294,7 +294,7 @@ class PendingErrorCallback final : publi
+@@ -298,7 +298,7 @@ class PendingErrorCallback final : publi
          type_(type),
          message_(xmlStrdup(message)) {}
 

diff --git a/patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch b/patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch
@@ -13,23 +13,23 @@
      "//third_party/icu:icudata",
 --- a/chrome/tools/build/win/create_installer_archive.py
 +++ b/chrome/tools/build/win/create_installer_archive.py
-@@ -210,12 +210,14 @@ def GenerateDiffPatch(options, orig_file
-   RunSystemCommand(cmd, options.verbose)
+@@ -224,12 +224,14 @@ def GenerateDiffPatch(options, orig_file
+
 
  def GetLZMAExec(build_dir):
--  executable = '7za'
--  if sys.platform == 'win32':
--    executable += '.exe'
-+  # Taken from ungoogled-chromium's _extraction.py file, modified for Python 2
-+  import winreg
-+  sub_key_7zfm = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\7zFM.exe'
+-    executable = '7za'
+-    if sys.platform == 'win32':
+-        executable += '.exe'
++    # Taken from ungoogled-chromium's _extraction.py file, modified for Python 2
++    import winreg
++    sub_key_7zfm = 'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\7zFM.exe'
 
--  return os.path.join(build_dir, "..", "..", "third_party", "lzma_sdk", "bin",
--                      "host_platform", executable)
-+  with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, sub_key_7zfm) as key_handle:
-+    sevenzipfm_dir = winreg.QueryValueEx(key_handle, 'Path')[0]
+-    return os.path.join(build_dir, "..", "..", "third_party", "lzma_sdk", "bin",
+-                        "host_platform", executable)
++    with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, sub_key_7zfm) as key_handle:
++        sevenzipfm_dir = winreg.QueryValueEx(key_handle, 'Path')[0]
 +
-+  return os.path.join(sevenzipfm_dir, "7z.exe")
++    return os.path.join(sevenzipfm_dir, "7z.exe")
+
 
  def GetPrevVersion(build_dir, temp_dir, last_chrome_installer, output_name):
-   if not last_chrome_installer:
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
-@@ -1577,7 +1577,7 @@ config("compiler_deterministic") {
+@@ -1576,7 +1576,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
-@@ -2426,7 +2426,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2441,7 +2441,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
-@@ -428,7 +428,6 @@ static_library("common_lib") {
+@@ -432,7 +432,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",

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
-@@ -1091,7 +1091,7 @@ component("base") {
+@@ -1111,7 +1111,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
@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -73,29 +73,6 @@ if (is_win && enable_resource_allowlist_
+@@ -68,29 +68,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
-@@ -142,10 +119,6 @@ if (!is_android && !is_mac) {
+@@ -137,10 +114,6 @@ if (!is_android && !is_mac && !is_fuchsi
      # 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") {
-@@ -157,11 +130,7 @@ if (!is_android && !is_mac) {
+@@ -152,11 +125,7 @@ if (!is_android && !is_mac && !is_fuchsi
      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
-@@ -474,11 +474,6 @@ python_library("chromedriver_py_tests")
+@@ -472,11 +472,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-fix-building-without-rust.patch b/patches/ungoogled-chromium/windows/windows-fix-building-without-rust.patch
@@ -1,6 +1,6 @@
 --- a/components/qr_code_generator/BUILD.gn
 +++ b/components/qr_code_generator/BUILD.gn
-@@ -39,21 +39,11 @@ source_set("qr_code_generator") {
+@@ -40,21 +40,11 @@ source_set("qr_code_generator") {
    ]
    deps = [
      ":qr_code_generator_features",
@@ -69,14 +69,13 @@
  }  // namespace
 
  QRCodeGenerator::QRCodeGenerator() = default;
-@@ -617,10 +590,6 @@ absl::optional<QRCodeGenerator::Generate
-     return absl::nullopt;
-   }
-
+@@ -613,9 +586,6 @@ QRCodeGenerator::GeneratedCode::~Generat
+ absl::optional<QRCodeGenerator::GeneratedCode> QRCodeGenerator::Generate(
+     base::span<const uint8_t> in,
+     absl::optional<int> min_version) {
 -  if (IsRustyQrCodeGeneratorFeatureEnabled()) {
 -    return GenerateQrCodeUsingRust(in, min_version);
 -  }
--
-   std::vector<Segment> segments;
-   const QRVersionInfo* version_info = nullptr;
 
+   if (in.size() > kMaxInputSize) {
+     return absl::nullopt;
diff --git a/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch b/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch
@@ -33,7 +33,7 @@
 +#endif
 --- a/chrome/browser/signin/signin_util_win.cc
 +++ b/chrome/browser/signin/signin_util_win.cc
-@@ -276,12 +276,6 @@ bool IsGCPWUsedInOtherProfile(Profile* p
+@@ -274,12 +274,6 @@ bool IsGCPWUsedInOtherProfile(Profile* p
  }
 
  void SigninWithCredentialProviderIfPossible(Profile* profile) {

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
-@@ -880,7 +880,7 @@ def _GnBinary():
+@@ -819,7 +819,7 @@ def _GnBinary():
    elif sys.platform == 'darwin':
      subdir = 'mac'
    elif sys.platform == 'win32':

diff --git a/patches/ungoogled-chromium/windows/windows-fix-missing-clang-features.patch b/patches/ungoogled-chromium/windows/windows-fix-missing-clang-features.patch
@@ -1,6 +1,6 @@
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -616,24 +616,6 @@ config("compiler") {
+@@ -618,24 +618,6 @@ config("compiler") {
        }
      }