Merge pull request #72 from kramred/release/v88.0.4324.146-1.1

update macOS patches for v88.0.4324.146
ungoogled-software · Feb 7, 2021 · c11d3b0 · c11d3b0
2 parents 2aaf164 + 66a6f13
commit c11d3b0
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 46 deletions.
diff --git a/.github/scripts/force_build.txt b/.github/scripts/force_build.txt
@@ -1 +1 @@
-1607082001
+1612356482
diff --git a/.github/scripts/github_prepare_artifacts.sh b/.github/scripts/github_prepare_artifacts.sh
@@ -51,7 +51,7 @@ else
 
   hdiutil compact ./build_src.sparsebundle
   # Needs to be compressed to stay below GitHub's upload limit 2 GB (?!) 2020-11-24; used to be  5-8GB (?)
-  tar -c -f - build_src.sparsebundle/ | zstd -7 -T0 -o build_src.sparsebundle.tar.zst
+  tar -c -f - build_src.sparsebundle/ | zstd -11 -T0 -o build_src.sparsebundle.tar.zst
 
   sha256sum ./build_src.sparsebundle.tar.zst | tee ./sums.txt
 fi

diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 build/
+.DS_Store
diff --git a/patches/debian_buster/disable/installer.patch b/patches/debian_buster/disable/installer.patch
@@ -3,12 +3,12 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -71,8 +71,6 @@ group("gn_all") {
+@@ -72,8 +72,6 @@ group("gn_all") {
      "//base:base_perftests",
      "//base:base_unittests",
      "//base/util:base_util_unittests",
 -    "//chrome/installer",
 -    "//chrome/updater",
+     "//codelabs",
      "//components:components_unittests",
      "//components/gwp_asan:gwp_asan_unittests",
-     "//net:net_unittests",
diff --git a/patches/debian_buster/fixes/as-needed.patch b/patches/debian_buster/fixes/as-needed.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -392,7 +392,7 @@ config("compiler") {
+@@ -390,7 +390,7 @@ config("compiler") {
      if (!using_sanitizer) {
        ldflags += [
          "-Wl,-z,defs",

diff --git a/patches/debian_buster/fixes/mojo.patch b/patches/debian_buster/fixes/mojo.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/content/shell/BUILD.gn
 +++ b/content/shell/BUILD.gn
-@@ -226,7 +226,6 @@ static_library("content_shell_lib") {
+@@ -239,7 +239,6 @@ static_library("content_shell_lib") {
      "//content/app/resources",
      "//content/public/common",
      "//content/public/common:service_names",

diff --git a/patches/debian_buster/warnings/int-in-bool-context.patch b/patches/debian_buster/warnings/int-in-bool-context.patch
@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org>
          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
-@@ -16519,7 +16519,8 @@ bool GLES2DecoderImpl::GetUniformSetup(G
+@@ -16511,7 +16511,8 @@ bool GLES2DecoderImpl::GetUniformSetup(G
    }
    uint32_t checked_size = 0;
    if (!SizedResult<T>::ComputeSize(num_elements).AssignIfValid(&checked_size)) {
@@ -51,7 +51,7 @@ author: Michael Gilbert <mgilbert@debian.org>
  }
 --- a/third_party/blink/renderer/core/html/parser/html_tree_builder.cc
 +++ b/third_party/blink/renderer/core/html/parser/html_tree_builder.cc
-@@ -1049,7 +1049,7 @@ void HTMLTreeBuilder::ProcessStartTagFor
+@@ -1054,7 +1054,7 @@ void HTMLTreeBuilder::ProcessStartTagFor
    }
    if (token->GetName() == html_names::kColTag) {
      ProcessFakeStartTag(html_names::kColgroupTag);

diff --git a/patches/debian_buster/warnings/multichar.patch b/patches/debian_buster/warnings/multichar.patch
@@ -3,8 +3,8 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/third_party/crashpad/crashpad/BUILD.gn
 +++ b/third_party/crashpad/crashpad/BUILD.gn
-@@ -22,6 +22,7 @@ if (crashpad_is_in_chromium) {
- }
+@@ -17,6 +17,7 @@ import("build/test.gni")
+ import("util/net/tls.gni")
 
  config("crashpad_config") {
 +  cflags = [ "-Wno-multichar" ]

diff --git a/patches/debian_buster/warnings/printf.patch b/patches/debian_buster/warnings/printf.patch
@@ -14,12 +14,12 @@ author: Michael Gilbert <mgilbert@debian.org>
  }  // namespace IPC
 --- a/content/browser/web_package/signed_exchange_handler.cc
 +++ b/content/browser/web_package/signed_exchange_handler.cc
-@@ -614,7 +614,7 @@ void SignedExchangeHandler::OnVerifyCert
+@@ -615,7 +615,7 @@ void SignedExchangeHandler::OnVerifyCert
        error_message = base::StringPrintf(
            "CT verification failed. result: %s, policy compliance: %d",
            net::ErrorToShortString(error_code).c_str(),
--          ct_result.policy_compliance);
-+          static_cast<int>(ct_result.policy_compliance));
+-          cv_result.policy_compliance);
++          static_cast<int>(cv_result.policy_compliance));
        result = SignedExchangeLoadResult::kCTVerificationError;
      } else {
        error_message =

diff --git a/patches/inox-patchset/chromium-skia-harmony.patch b/patches/inox-patchset/chromium-skia-harmony.patch
@@ -1,6 +1,6 @@
 --- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp
 +++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp
-@@ -131,9 +131,9 @@ public:
+@@ -132,9 +132,9 @@ public:
          : fGetVarDesignCoordinates(nullptr)
          , fGetVarAxisFlags(nullptr)
          , fLibrary(nullptr)

diff --git a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch
@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1044,7 +1044,7 @@ if (is_win) {
+@@ -1057,7 +1057,7 @@ if (is_win) {
    assert(_framework_binary_path != "",
           "Ignore configuration-dependent unused variable warning")
 

diff --git a/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch b/patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch
@@ -2,23 +2,23 @@
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1838,7 +1838,6 @@ static_library("browser") {
+@@ -1875,7 +1875,6 @@ static_library("browser") {
    allow_circular_includes_from = [
      "//chrome/browser/ui",
      "//chrome/browser/ui/webui/bluetooth_internals",
 -    "//chrome/browser/safe_browsing",
    ]
 
    public_deps = [
-@@ -1913,7 +1912,6 @@ static_library("browser") {
-     "//chrome/browser/reputation:proto",
+@@ -1950,7 +1949,6 @@ static_library("browser") {
+     "//chrome/browser/push_messaging:budget_proto",
      "//chrome/browser/resource_coordinator:mojo_bindings",
      "//chrome/browser/resource_coordinator:tab_manager_features",
 -    "//chrome/browser/safe_browsing",
      "//chrome/browser/safe_browsing:advanced_protection",
      "//chrome/browser/safe_browsing:url_lookup_service_factory",
-     "//chrome/browser/search/shopping_tasks:mojo_bindings",
-@@ -5012,13 +5010,6 @@ static_library("browser") {
+     "//chrome/browser/search/task_module:mojo_bindings",
+@@ -5172,13 +5170,6 @@ static_library("browser") {
      ]
    }
 
@@ -34,7 +34,7 @@
        "crash_upload_list/crash_upload_list_crashpad.cc",
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -728,9 +728,6 @@ static_library("extensions") {
+@@ -736,9 +736,6 @@ static_library("extensions") {
 
      # TODO(crbug.com/1065748): Remove this circular dependency.
      "//chrome/browser/web_applications/extensions",
@@ -44,25 +44,24 @@
    ]
 
    # Since browser and browser_extensions actually depend on each other,
-@@ -743,9 +740,7 @@ static_library("extensions") {
+@@ -751,8 +748,6 @@ static_library("extensions") {
      "//chrome/common",
      "//chrome/common/extensions/api",
      "//components/omnibox/browser",
 -    "//components/safe_browsing/core:csd_proto",
-     "//components/safe_browsing/core:webprotect_proto",
 -    "//components/safe_browsing/core/db:util",
      "//components/signin/core/browser",
      "//components/translate/content/browser",
      "//content/public/browser",
-@@ -773,7 +768,6 @@ static_library("extensions") {
+@@ -779,7 +774,6 @@ static_library("extensions") {
      "//chrome/browser/media/router/discovery",
      "//chrome/browser/resource_coordinator:intervention_policy_database_proto",
      "//chrome/browser/resource_coordinator:mojo_bindings",
 -    "//chrome/browser/safe_browsing",
      "//chrome/browser/web_applications",
      "//chrome/browser/web_applications/components",
-
-@@ -827,12 +821,6 @@ static_library("extensions") {
+     "//components/site_engagement/core/mojom:mojo_bindings",
+@@ -834,12 +828,6 @@ static_library("extensions") {
      "//components/proxy_config",
      "//components/rappor",
      "//components/resources",
@@ -77,9 +76,9 @@
      "//components/services/patch/content",
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -313,15 +313,9 @@ static_library("ui") {
-     ]
-   }
+@@ -306,15 +306,9 @@ static_library("ui") {
+     "webui/webui_util.h",
+   ]
 
 -  if (safe_browsing_mode == 1) {
 -    sources += [
@@ -94,24 +93,24 @@
    defines = []
    libs = []
 
-@@ -338,7 +332,6 @@ static_library("ui") {
+@@ -331,7 +325,6 @@ static_library("ui") {
    public_deps = [
      "//chrome/services/machine_learning:machine_learning_tflite_buildflags",
      "//components/dom_distiller/core",
 -    "//components/safe_browsing:buildflags",
      "//components/sync",
      "//components/sync_user_events",
      "//components/translate/content/browser",
-@@ -375,7 +368,6 @@ static_library("ui") {
+@@ -367,7 +360,6 @@ static_library("ui") {
      "//chrome/browser/resources/omnibox:resources",
      "//chrome/browser/resources/quota_internals:quota_internals_resources",
      "//chrome/browser/resources/usb_internals:resources",
 -    "//chrome/browser/safe_browsing",
      "//chrome/browser/ui/webui/bluetooth_internals",
      "//chrome/browser/ui/webui/downloads:mojo_bindings",
      "//chrome/browser/ui/webui/interventions_internals:mojo_bindings",
-@@ -477,17 +469,7 @@ static_library("ui") {
-     "//components/reading_list/core",
+@@ -470,17 +462,7 @@ static_library("ui") {
+     "//components/reading_list/features:flags",
      "//components/renderer_context_menu",
      "//components/resources",
 -    "//components/safe_browsing/content/password_protection",
@@ -128,23 +127,23 @@
      "//components/schema_org/common:improved_mojom",
      "//components/search",
      "//components/search_engines",
-@@ -1510,7 +1492,6 @@ static_library("ui") {
+@@ -1514,7 +1496,6 @@ static_library("ui") {
        "//chrome/browser/promo_browser_command:mojo_bindings",
        "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
        "//chrome/browser/resource_coordinator/tab_ranker",
 -      "//chrome/browser/safe_browsing:advanced_protection",
-       "//chrome/browser/search/shopping_tasks:mojo_bindings",
+       "//chrome/browser/search/task_module:mojo_bindings",
        "//chrome/browser/ui/color:color_headers",
        "//chrome/browser/ui/color:mixers",
-@@ -3142,7 +3123,6 @@ static_library("ui") {
+@@ -3189,7 +3170,6 @@ static_library("ui") {
        "//ui/views/controls/webview",
      ]
      deps += [
 -      "//chrome/browser/safe_browsing/chrome_cleaner:public",
        "//chrome/browser/ui/startup:buildflags",
        "//chrome/browser/win/conflicts:module_info",
        "//chrome/credential_provider/common:common_constants",
-@@ -4462,15 +4442,6 @@ static_library("ui") {
+@@ -4507,15 +4487,6 @@ static_library("ui") {
      }
    }
 
@@ -162,7 +161,7 @@
    }
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1475,10 +1475,10 @@ void Browser::OnDidBlockNavigation(
+@@ -1438,10 +1438,10 @@ void Browser::OnDidBlockNavigation(
        framebust_helper->AddBlockedUrl(blocked_url, base::BindOnce(on_click));
      }
    }
@@ -233,9 +232,9 @@
  #include "content/public/browser/download_manager.h"
  #include "content/public/browser/url_data_source.h"
  #include "content/public/browser/web_contents.h"
-@@ -72,10 +73,12 @@ content::WebUIDataSource* CreateDownload
-       kGeneratedPath, IDR_DOWNLOADS_DOWNLOADS_HTML);
- #endif
+@@ -60,10 +61,12 @@ content::WebUIDataSource* CreateDownload
+       source, base::make_span(kDownloadsResources, kDownloadsResourcesSize), "",
+       IDR_DOWNLOADS_DOWNLOADS_HTML);
 
 -  bool requests_ap_verdicts =
 -      safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
@@ -250,7 +249,7 @@
    static constexpr webui::LocalizedString kStrings[] = {
 --- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc
 +++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
-@@ -205,17 +205,18 @@ base::string16 DownloadDangerPromptViews
+@@ -200,17 +200,18 @@ base::string16 DownloadDangerPromptViews
              download_->GetFileNameToReportUser().LossyDisplayName());
        }
        case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: {
@@ -273,7 +272,7 @@
          return l10n_util::GetStringFUTF16(
 --- a/chrome/browser/ui/views/download/download_item_view.cc
 +++ b/chrome/browser/ui/views/download/download_item_view.cc
-@@ -975,11 +975,13 @@ ui::ImageModel DownloadItemView::GetIcon
+@@ -974,11 +974,13 @@ ui::ImageModel DownloadItemView::GetIcon
    const auto danger_type = model_->GetDangerType();
    switch (danger_type) {
      case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
@@ -289,7 +288,7 @@
      case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5207,10 +5207,12 @@ ChromeContentBrowserClient::GetUrlLookup
+@@ -5185,10 +5185,12 @@ ChromeContentBrowserClient::GetUrlLookup
    }
  #endif
 

diff --git a/patches/ungoogled-chromium/macos/fix-dsymutil.patch b/patches/ungoogled-chromium/macos/fix-dsymutil.patch
@@ -11,7 +11,7 @@
      file_match = dsymutil_file_re.search(line)
 --- a/build/toolchain/mac/BUILD.gn
 +++ b/build/toolchain/mac/BUILD.gn
-@@ -198,8 +198,7 @@ template("mac_toolchain") {
+@@ -199,8 +199,7 @@ template("mac_toolchain") {
      if (_enable_dsyms) {
        dsym_switch = " -Wcrl,dsym,{{root_out_dir}} "
        dsym_switch += "-Wcrl,dsymutilpath," +

diff --git a/ungoogled-chromium b/ungoogled-chromium