From 1cf8f6fd9a83fd941afcf0c14b75426a69eb51fd Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Wed, 11 Dec 2019 11:30:31 -0500 Subject: [PATCH] chromium: update to 79.0.3945.79. [ci skip] - Built for x86_64, i686, and x86_64-musl. - Tested on x86_64. --- .../patches/chromium-system-harfbuzz.patch | 19 ++++ .../patches/chromium-widevine-revision.patch | 26 ------ .../chromium/patches/chromium-widevine.patch | 13 +++ .../create-extra-view-redefinition.patch | 20 +++++ ...remove-unsupported-compiler-warnings.patch | 51 ++++++----- ...m-add-missing-include-for-unique_ptr.patch | 30 ------- ..._util-make-DohUpgradeEntry-non-const.patch | 86 ------------------- ...fix-shutdown-crash-in-ProfileManager.patch | 45 ---------- srcpkgs/chromium/template | 4 +- 9 files changed, 85 insertions(+), 209 deletions(-) create mode 100644 srcpkgs/chromium/patches/chromium-system-harfbuzz.patch delete mode 100644 srcpkgs/chromium/patches/chromium-widevine-revision.patch create mode 100644 srcpkgs/chromium/patches/chromium-widevine.patch create mode 100644 srcpkgs/chromium/patches/create-extra-view-redefinition.patch delete mode 100644 srcpkgs/chromium/patches/upstream-add-missing-include-for-unique_ptr.patch delete mode 100644 srcpkgs/chromium/patches/upstream-dns_util-make-DohUpgradeEntry-non-const.patch delete mode 100644 srcpkgs/chromium/patches/upstream-fix-shutdown-crash-in-ProfileManager.patch diff --git a/srcpkgs/chromium/patches/chromium-system-harfbuzz.patch b/srcpkgs/chromium/patches/chromium-system-harfbuzz.patch new file mode 100644 index 0000000000..a2064cf75b --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-system-harfbuzz.patch @@ -0,0 +1,19 @@ +diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc +index a218d63..6a5bdae 100644 +--- components/paint_preview/common/subset_font.cc ++++ components/paint_preview/common/subset_font.cc +@@ -10,11 +10,12 @@ + #include "base/bind.h" + #include "base/callback.h" + #include "base/macros.h" +-#include "third_party/harfbuzz-ng/src/src/hb-subset.h" +-#include "third_party/harfbuzz-ng/src/src/hb.h" + #include "third_party/skia/include/core/SkStream.h" + #include "third_party/skia/include/core/SkTypeface.h" + ++#include ++#include ++ + namespace paint_preview { + + namespace { diff --git a/srcpkgs/chromium/patches/chromium-widevine-revision.patch b/srcpkgs/chromium/patches/chromium-widevine-revision.patch deleted file mode 100644 index c702a9dae5..0000000000 --- a/srcpkgs/chromium/patches/chromium-widevine-revision.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -upr chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc ---- chrome/common/chrome_content_client.cc 2018-12-21 20:16:43.000000000 +0000 -+++ chrome/common/chrome_content_client.cc 2018-12-21 21:34:28.658206942 +0000 -@@ -99,7 +99,7 @@ - // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is - // bundled and not a component. When the Widevine CDM is a component, it is - // registered in widevine_cdm_component_installer.cc. --#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) -+#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) - #define REGISTER_BUNDLED_WIDEVINE_CDM - #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck - // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support - -diff -upr a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h ---- third_party/widevine/cdm/widevine_cdm_version.h -+++ third_party/widevine/cdm/widevine_cdm_version.h -@@ -11,5 +11,6 @@ - // If the Widevine CDM is available define the following: - // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available - // as a string, e.g., "1.0.123.456"). -+#define WIDEVINE_CDM_VERSION_STRING "unknown" - - #endif // WIDEVINE_CDM_VERSION_H_ --- -2.19.1 - diff --git a/srcpkgs/chromium/patches/chromium-widevine.patch b/srcpkgs/chromium/patches/chromium-widevine.patch new file mode 100644 index 0000000000..478898ea84 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-widevine.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn +index ed0e2f5208b..5b431a030d5 100644 +--- third_party/widevine/cdm/BUILD.gn ++++ third_party/widevine/cdm/BUILD.gn +@@ -14,7 +14,7 @@ buildflag_header("buildflags") { + + flags = [ + "ENABLE_WIDEVINE=$enable_widevine", +- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", ++ "BUNDLE_WIDEVINE_CDM=true", + "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", + ] + } diff --git a/srcpkgs/chromium/patches/create-extra-view-redefinition.patch b/srcpkgs/chromium/patches/create-extra-view-redefinition.patch new file mode 100644 index 0000000000..d17a594164 --- /dev/null +++ b/srcpkgs/chromium/patches/create-extra-view-redefinition.patch @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/accessibility/invert_bubble_view.cc.orig 2019-12-11 10:41:00.069472967 -0500 ++++ chrome/browser/ui/views/accessibility/invert_bubble_view.cc 2019-12-11 10:41:48.254466283 -0500 +@@ -47,7 +47,7 @@ + // Tag value used to uniquely identify the "learn more" (?) button. + constexpr int kLearnMoreButton = 100; + +-std::unique_ptr CreateExtraView(views::ButtonListener* listener) { ++std::unique_ptr CreateExtraViewInternal(views::ButtonListener* listener) { + auto learn_more = views::CreateVectorImageButton(listener); + views::SetImageFromVectorIcon(learn_more.get(), + vector_icons::kHelpOutlineIcon); +@@ -95,7 +95,7 @@ + dark_theme_(nullptr) { + DialogDelegate::set_button_label(ui::DIALOG_BUTTON_OK, + l10n_util::GetStringUTF16(IDS_DONE)); +- DialogDelegate::SetExtraView(::CreateExtraView(this)); ++ DialogDelegate::SetExtraView(::CreateExtraViewInternal(this)); + set_margins(gfx::Insets()); + chrome::RecordDialogCreation(chrome::DialogIdentifier::INVERT); + } diff --git a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch index 4de8aea9f5..df8aed86d9 100644 --- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch +++ b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch @@ -1,13 +1,29 @@ ---- build/config/compiler/BUILD.gn 2019-10-24 11:01:40.459910040 -0400 -+++ build/config/compiler/BUILD.gn 2019-10-24 11:04:19.690063743 -0400 -@@ -1492,37 +1492,6 @@ - # Currently goma can not handle case sensitiveness for windows well. - cflags += [ "-Wno-nonportable-include-path" ] - } +Author: Olivier Tilloy +Description: Do not use warning flags that require a newer Clang + +Index: dev/build/config/compiler/BUILD.gn +=================================================================== +--- build/config/compiler/BUILD.gn ++++ build/config/compiler/BUILD.gn +@@ -693,14 +693,6 @@ config("compiler") { + ldflags += [ "-Wl,--no-rosegment" ] + } + +- # This flag enforces that member pointer base types are complete. It helps +- # prevent us from running into problems in the Microsoft C++ ABI (see +- # https://crbug.com/847724). +- if (is_clang && !is_nacl && target_os != "chromeos" && !use_xcode_clang && +- (is_win || use_custom_libcxx)) { +- cflags += [ "-fcomplete-member-pointers" ] +- } - -- if (current_toolchain == host_toolchain || !use_xcode_clang) { -- # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not -- # recognize. + # Pass the same C/C++ flags to the objective C/C++ compiler. + cflags_objc += cflags_c + cflags_objcc += cflags_cc +@@ -1501,28 +1493,6 @@ config("default_warnings") { + if (current_toolchain == host_toolchain || !use_xcode_clang) { + # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not + # recognize. - cflags += [ - # Ignore warnings about MSVC optimization pragmas. - # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662 @@ -16,9 +32,6 @@ - # TODO(https://crbug.com/989932): Evaluate and possibly enable. - "-Wno-implicit-int-float-conversion", - -- # TODO(https://crbug.com/995200): Clean up and enable. -- "-Wno-xor-used-as-pow", -- - # TODO(https://crbug.com/999871): Decide if we want to clean up the - # codebase or just disable this. Doesn't seem super useful, but - # also fires in only 4 files. @@ -29,12 +42,10 @@ - - # TODO(https://crbug.com/999886): Clean up, enable. - "-Wno-final-dtor-non-final-class", +- +- # TODO(https://crbug.com/1002945): Evaluate and possibly enable. +- "-Wno-sizeof-array-div", - ] -- cflags_c += [ -- # TODO(https://crbug.com/995993): Clean up and enable. -- "-Wno-implicit-fallthrough", -- ] -- } - } - } - } + + cflags_c += [ + # TODO(https://crbug.com/995993): Clean up and enable. diff --git a/srcpkgs/chromium/patches/upstream-add-missing-include-for-unique_ptr.patch b/srcpkgs/chromium/patches/upstream-add-missing-include-for-unique_ptr.patch deleted file mode 100644 index 3b9455f386..0000000000 --- a/srcpkgs/chromium/patches/upstream-add-missing-include-for-unique_ptr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bbfe2665923225b4a7c436ba2b6c7e5f695f2e52 Mon Sep 17 00:00:00 2001 -From: David Landell -Date: Fri, 13 Sep 2019 12:24:13 +0000 -Subject: [PATCH] Add missing include for unique_ptr -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I614d2f42868d563eb6a92dfb2aae08286e20d687 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803137 -Reviewed-by: Henrik Boström -Commit-Queue: Henrik Boström -Cr-Commit-Position: refs/heads/master@{#696355} ---- - third_party/blink/public/platform/web_rtc_rtp_source.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/third_party/blink/public/platform/web_rtc_rtp_source.h b/third_party/blink/public/platform/web_rtc_rtp_source.h -index 959440f7a5..c3fd5421aa 100644 ---- third_party/blink/public/platform/web_rtc_rtp_source.h -+++ third_party/blink/public/platform/web_rtc_rtp_source.h -@@ -5,6 +5,8 @@ - #ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_ - #define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_ - -+#include -+ - #include "base/optional.h" - #include "third_party/blink/public/platform/web_common.h" - diff --git a/srcpkgs/chromium/patches/upstream-dns_util-make-DohUpgradeEntry-non-const.patch b/srcpkgs/chromium/patches/upstream-dns_util-make-DohUpgradeEntry-non-const.patch deleted file mode 100644 index 4fa4bedc1f..0000000000 --- a/srcpkgs/chromium/patches/upstream-dns_util-make-DohUpgradeEntry-non-const.patch +++ /dev/null @@ -1,86 +0,0 @@ -From f4c3c329588b78af63aad8b401da767242b86709 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Mon, 16 Sep 2019 17:05:42 +0000 -Subject: [PATCH] dns_util: Make DohUpgradeEntry non-const when used with - std::vector<> - -This fixes the build with libstdc++ (with most other standard libraries -other than libc++, in fact) after commit f93a48e3 ("Allow upgrade to DoH -during automatic mode"): - -../../../../../../usr/bin/../lib/gcc/x86_64-redhat-linux/8/../../../../include/c++/8/bits/stl_vector.h:351:7: error: static_assert failed due to requirement 'is_same::type, const DohUpgradeEntry>::value' "std::vector must have a non-const, non-volatile value_type" - static_assert(is_same::type, _Tp>::value, - ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -../../base/no_destructor.h:77:28: note: in instantiation of template class 'std::vector >' requested here - alignas(T) char storage_[sizeof(T)]; - ^ -../../net/dns/dns_util.cc:147:7: note: in instantiation of template class 'base::NoDestructor > >' requested here - upgradable_servers({ - ^ -../../net/dns/dns_util.cc:230:36: error: invalid range expression of type 'const std::vector >'; no viable 'begin' function available - for (const auto& upgrade_entry : upgradable_servers) { - ^ ~~~~~~~~~~~~~~~~~~ - -The C++ standard forbids containers of const elements. Callers of -GetDohUpgradeList() use it in a safe way anyway, and most of -DohUpgradeEntry's members are const. - -Bug: 957519 -Change-Id: I826a51823edb1184c0fae27105101e2894efe568 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1805636 -Auto-Submit: Raphael Kubo da Costa -Commit-Queue: Eric Orth -Reviewed-by: Eric Orth -Cr-Commit-Position: refs/heads/master@{#696834} ---- - net/dns/dns_util.cc | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc -index d83ff7c150..14997c48b2 100644 ---- net/dns/dns_util.cc -+++ net/dns/dns_util.cc -@@ -139,11 +139,11 @@ struct DohUpgradeEntry { - const DnsConfig::DnsOverHttpsServerConfig dns_over_https_config; - }; - --const std::vector& GetDohUpgradeList() { -+const std::vector& GetDohUpgradeList() { - // The provider names in these entries should be kept in sync with the - // DohProviderId histogram suffix list in - // tools/metrics/histograms/histograms.xml. -- static const base::NoDestructor> -+ static const base::NoDestructor> - upgradable_servers({ - DohUpgradeEntry( - "CleanBrowsingAdult", -@@ -222,8 +222,7 @@ const std::vector& GetDohUpgradeList() { - std::vector GetDohUpgradeEntriesFromNameservers( - const std::vector& dns_servers, - const std::vector& excluded_providers) { -- const std::vector& upgradable_servers = -- GetDohUpgradeList(); -+ const std::vector& upgradable_servers = GetDohUpgradeList(); - std::vector entries; - - for (const auto& server : dns_servers) { -@@ -417,8 +416,7 @@ std::vector - GetDohUpgradeServersFromDotHostname( - const std::string& dot_server, - const std::vector& excluded_providers) { -- const std::vector& upgradable_servers = -- GetDohUpgradeList(); -+ const std::vector& upgradable_servers = GetDohUpgradeList(); - std::vector doh_servers; - - if (dot_server.empty()) -@@ -451,8 +449,7 @@ GetDohUpgradeServersFromNameservers( - - std::string GetDohProviderIdForHistogramFromDohConfig( - const DnsConfig::DnsOverHttpsServerConfig& doh_server) { -- const std::vector& upgradable_servers = -- GetDohUpgradeList(); -+ const std::vector& upgradable_servers = GetDohUpgradeList(); - for (const auto& upgrade_entry : upgradable_servers) { - if (doh_server.server_template == - upgrade_entry.dns_over_https_config.server_template) { diff --git a/srcpkgs/chromium/patches/upstream-fix-shutdown-crash-in-ProfileManager.patch b/srcpkgs/chromium/patches/upstream-fix-shutdown-crash-in-ProfileManager.patch deleted file mode 100644 index 553ca34a7d..0000000000 --- a/srcpkgs/chromium/patches/upstream-fix-shutdown-crash-in-ProfileManager.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e73aed9a5ef15102f29ac31b70290faf5c90f9fe Mon Sep 17 00:00:00 2001 -From: Evan Stade -Date: Wed, 16 Oct 2019 16:01:32 +0000 -Subject: [PATCH] Fix shutdown crash in ProfileManager. - -OnProfileMarkedForPermanentDeletion should move from -ProfileManagerObserver to ProfileObserver, which would also -fix this bug. However, changing the order of members is the -quickest and most cherry-pick-able way to avoid the crash. - -Bug: 1005244 -Change-Id: If2db68c846dd418cd02864b57b9b543687fa1e03 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863518 -Auto-Submit: Evan Stade -Reviewed-by: David Roger -Commit-Queue: Evan Stade -Cr-Commit-Position: refs/heads/master@{#706467} ---- - chrome/browser/profiles/profile_manager.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index b60df76d59..7d02af7f8f 100644 ---- chrome/browser/profiles/profile_manager.h -+++ chrome/browser/profiles/profile_manager.h -@@ -410,6 +410,10 @@ class ProfileManager : public content::NotificationObserver, - const base::FilePath& profile_dir); - #endif // !defined(OS_ANDROID) - -+ // Destroy after |profile_info_cache_| since Profile destruction may trigger -+ // some observers to unregister themselves. -+ base::ObserverList observers_; -+ - // Object to cache various information about profiles. Contains information - // about every profile which has been created for this instance of Chrome, - // if it has not been explicitly deleted. It must be destroyed after -@@ -451,8 +455,6 @@ class ProfileManager : public content::NotificationObserver, - // Controls whether to initialize some services. Only disabled for testing. - bool do_final_services_init_ = true; - -- base::ObserverList observers_; -- - // TODO(chrome/browser/profiles/OWNERS): Usage of this in profile_manager.cc - // should likely be turned into DCHECK_CURRENTLY_ON(BrowserThread::UI) for - // consistency with surrounding code in the same file but that wasn't trivial diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 8f304a271e..a376a0a154 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=78.0.3904.108 +version=79.0.3945.79 revision=1 archs="i686 x86_64*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=f9c53839f306d2973de27723360024f7904101d426b9e7e9cdb56e8bcc775b0e +checksum=e1a7362d396b0f72e6ad8c1d53cae67db201e0eeaa2a96dbe9214d080925bcf3 lib32disabled=yes nodebug=yes