Update ungoogled-chromium to 80.0.3987.87-1

README.md

@@ -18,6 +18,7 @@ macOS packaging for [ungoogled-chromium](//github.com/Eloston/ungoogled-chromium
 * Perl (for creating a `.dmg` package)
 * Python 2, specifically 2.7.13 or newer, as `python` in PATH
 * Python 3.5 or newer as `python3` in PATH
+* Node.js
 
 ### Setting up the build environment
 
@@ -35,7 +36,8 @@ macOS packaging for [ungoogled-chromium](//github.com/Eloston/ungoogled-chromium
 echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> ~/.bash_profile
 ```
 8. Set global `python` command to use Python 2.7.13: `pyenv global 2.7.13`.
-9. Restart your Terminal
+9. Install Node.js: `brew install node`
+10. Restart your Terminal
 
 ### Build
 

flags.macos.gn

@@ -9,5 +9,4 @@ is_official_build=true
 proprietary_codecs=true
 symbol_level=0
 use_gnome_keyring=false
-use_jumbo_build=true
 use_sysroot=false

patches/debian_buster/disable/installer.patch

@@ -3,7 +3,7 @@ author: Michael Gilbert <[email protected]>
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -67,8 +67,6 @@ group("gn_all") {
+@@ -68,8 +68,6 @@ group("gn_all") {
      "//base:base_perftests",
      "//base:base_unittests",
      "//base/util:base_util_unittests",

patches/debian_buster/fixes/as-needed.patch

@@ -3,7 +3,7 @@ author: Michael Gilbert <[email protected]>
 
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -401,7 +401,7 @@ config("compiler") {
+@@ -406,7 +406,7 @@ config("compiler") {
      if (!using_sanitizer) {
        ldflags += [
          "-Wl,-z,defs",

patches/debian_buster/fixes/mojo.patch

@@ -3,19 +3,18 @@ author: Michael Gilbert <[email protected]>
 
 --- a/content/shell/BUILD.gn
 +++ b/content/shell/BUILD.gn
-@@ -297,11 +297,7 @@ jumbo_static_library("content_shell_lib"
+@@ -300,10 +300,7 @@ jumbo_static_library("content_shell_lib"
      "//content/public/common",
      "//content/public/common:service_names",
      "//content/shell/test_runner:test_runner",
 -    "//content/test:content_test_mojo_bindings",
 -    "//content/test:mojo_web_test_bindings",
--    "//content/test:mojo_web_test_old_names_bindings",
      "//content/test:test_support",
 -    "//content/test:web_test_support",
      "//device/bluetooth",
      "//device/bluetooth:fake_bluetooth",
      "//device/bluetooth:mocks",
-@@ -361,7 +357,7 @@ jumbo_static_library("content_shell_lib"
+@@ -363,7 +360,7 @@ jumbo_static_library("content_shell_lib"
    }
 
    # Annoyingly, this target and web_test_support have circular includes.

patches/debian_buster/fixes/namespace.patch

@@ -15,30 +15,3 @@ author: Michael Gilbert <[email protected]>
 +}
 
  #endif  // CHROME_BROWSER_APPS_PLATFORM_APPS_API_SYNC_FILE_SYSTEM_EXTENSION_SYNC_EVENT_OBSERVER_H_
---- a/chrome/browser/ui/views/confirm_bubble_views.cc
-+++ b/chrome/browser/ui/views/confirm_bubble_views.cc
-@@ -25,6 +25,7 @@
- #include "ui/views/style/typography.h"
- #include "ui/views/widget/widget.h"
-
-+namespace confirm_bubble_views {
- namespace {
-
- std::unique_ptr<views::View> CreateExtraView(views::ButtonListener* listener) {
-@@ -36,6 +37,7 @@ std::unique_ptr<views::View> CreateExtra
- }
-
- }  // namespace
-+}  // namespace confirm_bubble_views
-
- ConfirmBubbleViews::ConfirmBubbleViews(
-     std::unique_ptr<ConfirmBubbleModel> model)
-@@ -46,7 +48,7 @@ ConfirmBubbleViews::ConfirmBubbleViews(
-   DialogDelegate::set_button_label(
-       ui::DIALOG_BUTTON_CANCEL,
-       model_->GetButtonLabel(ConfirmBubbleModel::BUTTON_CANCEL));
--  help_button_ = DialogDelegate::SetExtraView(::CreateExtraView(this));
-+  help_button_ = DialogDelegate::SetExtraView(confirm_bubble_views::CreateExtraView(this));
-
-   set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
-       views::TEXT, views::TEXT));

patches/debian_buster/warnings/int-in-bool-context.patch

@@ -14,7 +14,7 @@ author: Michael Gilbert <[email protected]>
          filter_->CopyMem16x16(mb_src, stride_src, mb_dst, stride_dst);
 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
 +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
-@@ -16052,7 +16052,8 @@ bool GLES2DecoderImpl::GetUniformSetup(G
+@@ -16381,7 +16381,8 @@ bool GLES2DecoderImpl::GetUniformSetup(G
    }
    uint32_t checked_size = 0;
    if (!SizedResult<T>::ComputeSize(num_elements).AssignIfValid(&checked_size)) {
@@ -26,7 +26,7 @@ author: Michael Gilbert <[email protected]>
    if (!result) {
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -308,15 +308,16 @@ void RenderWidgetHostViewBase::SetBackgr
+@@ -307,15 +307,16 @@ void RenderWidgetHostViewBase::SetBackgr
    if (default_background_color_ == color)
      return;
 
@@ -51,10 +51,10 @@ author: Michael Gilbert <[email protected]>
  }
 --- a/third_party/blink/renderer/core/html/parser/html_tree_builder.cc
 +++ b/third_party/blink/renderer/core/html/parser/html_tree_builder.cc
-@@ -939,7 +939,7 @@ void HTMLTreeBuilder::ProcessStartTagFor
+@@ -978,7 +978,7 @@ void HTMLTreeBuilder::ProcessStartTagFor
    }
-   if (token->GetName() == kColTag) {
-     ProcessFakeStartTag(kColgroupTag);
+   if (token->GetName() == html_names::kColTag) {
+     ProcessFakeStartTag(html_names::kColgroupTag);
 -    DCHECK(kInColumnGroupMode);
 +    DCHECK_EQ(GetInsertionMode(), kInColumnGroupMode);
      ProcessStartTag(token);

patches/debian_buster/warnings/printf.patch

@@ -14,7 +14,7 @@ author: Michael Gilbert <[email protected]>
  }  // namespace IPC
 --- a/content/browser/web_package/signed_exchange_handler.cc
 +++ b/content/browser/web_package/signed_exchange_handler.cc
-@@ -611,7 +611,7 @@ void SignedExchangeHandler::OnVerifyCert
+@@ -607,7 +607,7 @@ void SignedExchangeHandler::OnVerifyCert
        error_message = base::StringPrintf(
            "CT verification failed. result: %s, policy compliance: %d",
            net::ErrorToShortString(error_code).c_str(),
@@ -25,7 +25,7 @@ author: Michael Gilbert <[email protected]>
        error_message =
 --- a/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc
 +++ b/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc
-@@ -450,7 +450,7 @@ class CachedResponseFileReaderLoaderClie
+@@ -453,7 +453,7 @@ class CachedResponseFileReaderLoaderClie
 
    void DidFail(FileErrorCode error) override {
      callback_->sendFailure(ProtocolResponse::Error(String::Format(
@@ -34,14 +34,3 @@ author: Michael Gilbert <[email protected]>
      dispose();
    }
 
---- a/net/proxy_resolution/proxy_resolver_v8_tracing.cc
-+++ b/net/proxy_resolution/proxy_resolver_v8_tracing.cc
-@@ -837,7 +837,7 @@ void Job::SaveDnsToLocalCache(const std:
-
- std::string Job::MakeDnsCacheKey(const std::string& host,
-                                  ProxyResolveDnsOperation op) {
--  return base::StringPrintf("%d:%s", op, host.c_str());
-+  return base::StringPrintf("%d:%s", static_cast<int>(op), host.c_str());
- }
-
- void Job::HandleAlertOrError(bool is_alert,

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
-@@ -139,11 +139,11 @@ class PendingStartElementNSCallback fina
+@@ -137,11 +137,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.
-@@ -158,12 +158,12 @@ class PendingStartElementNSCallback fina
+@@ -156,12 +156,12 @@ class PendingStartElementNSCallback fina
 
    ~PendingStartElementNSCallback() override {
      for (int i = 0; i < namespace_count_ * 2; ++i)
@@ -31,7 +31,7 @@
    }
 
    void Call(XMLDocumentParser* parser) override {
-@@ -205,7 +205,7 @@ class PendingCharactersCallback final
+@@ -203,7 +203,7 @@ class PendingCharactersCallback final
    PendingCharactersCallback(const xmlChar* chars, int length)
        : chars_(xmlStrndup(chars, length)), length_(length) {}
 
@@ -40,7 +40,7 @@
 
    void Call(XMLDocumentParser* parser) override {
      parser->Characters(chars_, length_);
-@@ -281,7 +281,7 @@ class PendingErrorCallback final : publi
+@@ -279,7 +279,7 @@ class PendingErrorCallback final : publi
          line_number_(line_number),
          column_number_(column_number) {}
 
@@ -126,14 +126,3 @@
      }
    }
 
---- a/third_party/libxml/chromium/libxml_utils.cc
-+++ b/third_party/libxml/chromium/libxml_utils.cc
-@@ -23,7 +23,7 @@ std::string XmlStringToStdString(const x
- // Same as XmlStringToStdString but also frees |xmlstring|.
- std::string XmlStringToStdStringWithDelete(xmlChar* xmlstring) {
-   std::string result = XmlStringToStdString(xmlstring);
--  xmlFree(xmlstring);
-+  free(xmlstring);
-   return result;
- }
-

patches/series

@@ -17,3 +17,4 @@ ungoogled-chromium/macos/fix-visibility.patch
 ungoogled-chromium/macos/fix-older-sdk-declarations.patch
 ungoogled-chromium/macos/fix-ignored-pragma-optimize.patch
 ungoogled-chromium/macos/fix-dsymutil.patch
+ungoogled-chromium/fix-node-path.patch

patches/ungoogled-chromium/fix-node-path.patch

@@ -0,0 +1,20 @@
+--- a/third_party/node/node.py
++++ b/third_party/node/node.py
+@@ -10,11 +10,12 @@ import sys
+
+
+ def GetBinaryPath():
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return subprocess.check_output(["which", "node"]).strip()
++#  return os_path.join(os_path.dirname(__file__), *{
++#    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++#    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++#    'Windows': ('win', 'node.exe'),
++#  }[platform.system()])
+
+
+ def RunNode(cmd_parts, stdout=None):

patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1238,7 +1238,7 @@ if (is_win) {
+@@ -1246,7 +1246,7 @@ if (is_win) {
    assert(_framework_binary_path != "",
           "Ignore configuration-dependent unused variable warning")