From ba9d82dc689fcc2a3095349eafcfaaea5fb2dcac Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 30 Oct 2019 09:32:24 -0400 Subject: [PATCH] update el7-noexcept patch --- ...> chromium-78.0.3904.70-el7-noexcept.patch | 97 ++++++++----------- chromium.spec | 2 +- 2 files changed, 41 insertions(+), 58 deletions(-) rename chromium-77.0.3865.90-el7-noexcept.patch => chromium-78.0.3904.70-el7-noexcept.patch (52%) diff --git a/chromium-77.0.3865.90-el7-noexcept.patch b/chromium-78.0.3904.70-el7-noexcept.patch similarity index 52% rename from chromium-77.0.3865.90-el7-noexcept.patch rename to chromium-78.0.3904.70-el7-noexcept.patch index 1b7ac61..b4905be 100644 --- a/chromium-77.0.3865.90-el7-noexcept.patch +++ b/chromium-78.0.3904.70-el7-noexcept.patch @@ -1,6 +1,6 @@ -diff -up chromium-77.0.3865.90/chrome/common/media_router/media_sink.cc.el7-noexcept chromium-77.0.3865.90/chrome/common/media_router/media_sink.cc ---- chromium-77.0.3865.90/chrome/common/media_router/media_sink.cc.el7-noexcept 2019-09-19 22:40:27.933863751 +0200 -+++ chromium-77.0.3865.90/chrome/common/media_router/media_sink.cc 2019-09-19 22:40:27.939863796 +0200 +diff -up chromium-78.0.3904.70/chrome/common/media_router/media_sink.cc.el7-noexcept chromium-78.0.3904.70/chrome/common/media_router/media_sink.cc +--- chromium-78.0.3904.70/chrome/common/media_router/media_sink.cc.el7-noexcept 2019-10-21 15:06:26.000000000 -0400 ++++ chromium-78.0.3904.70/chrome/common/media_router/media_sink.cc 2019-10-30 09:26:51.339057055 -0400 @@ -19,12 +19,12 @@ MediaSink::MediaSink(const MediaSink::Id provider_id_(provider_id) {} @@ -16,9 +16,9 @@ diff -up chromium-77.0.3865.90/chrome/common/media_router/media_sink.cc.el7-noex bool MediaSink::IsMaybeCloudSink() const { switch (icon_type_) { -diff -up chromium-77.0.3865.90/components/history/core/browser/history_types.cc.el7-noexcept chromium-77.0.3865.90/components/history/core/browser/history_types.cc ---- chromium-77.0.3865.90/components/history/core/browser/history_types.cc.el7-noexcept 2019-09-19 22:39:59.299649596 +0200 -+++ chromium-77.0.3865.90/components/history/core/browser/history_types.cc 2019-09-19 22:39:59.268649364 +0200 +diff -up chromium-78.0.3904.70/components/history/core/browser/history_types.cc.el7-noexcept chromium-78.0.3904.70/components/history/core/browser/history_types.cc +--- chromium-78.0.3904.70/components/history/core/browser/history_types.cc.el7-noexcept 2019-10-21 15:06:29.000000000 -0400 ++++ chromium-78.0.3904.70/components/history/core/browser/history_types.cc 2019-10-30 09:26:51.358056614 -0400 @@ -42,7 +42,7 @@ QueryResults::QueryResults(QueryResults& Swap(&other); } @@ -37,9 +37,9 @@ diff -up chromium-77.0.3865.90/components/history/core/browser/history_types.cc. // MostVisitedURL -------------------------------------------------------------- -diff -up chromium-77.0.3865.90/components/history/core/browser/history_types.h.el7-noexcept chromium-77.0.3865.90/components/history/core/browser/history_types.h ---- chromium-77.0.3865.90/components/history/core/browser/history_types.h.el7-noexcept 2019-09-19 22:39:59.318649738 +0200 -+++ chromium-77.0.3865.90/components/history/core/browser/history_types.h 2019-09-19 22:39:59.248649215 +0200 +diff -up chromium-78.0.3904.70/components/history/core/browser/history_types.h.el7-noexcept chromium-78.0.3904.70/components/history/core/browser/history_types.h +--- chromium-78.0.3904.70/components/history/core/browser/history_types.h.el7-noexcept 2019-10-21 15:06:29.000000000 -0400 ++++ chromium-78.0.3904.70/components/history/core/browser/history_types.h 2019-10-30 09:26:51.623050465 -0400 @@ -143,7 +143,7 @@ class QueryResults { ~QueryResults(); @@ -58,9 +58,9 @@ diff -up chromium-77.0.3865.90/components/history/core/browser/history_types.h.e ~QueryURLResult(); // Indicates whether the call to HistoryBackend::QueryURL was successfull -diff -up chromium-77.0.3865.90/components/history/core/browser/url_row.cc.el7-noexcept chromium-77.0.3865.90/components/history/core/browser/url_row.cc ---- chromium-77.0.3865.90/components/history/core/browser/url_row.cc.el7-noexcept 2019-09-19 22:39:59.268649364 +0200 -+++ chromium-77.0.3865.90/components/history/core/browser/url_row.cc 2019-09-19 22:39:59.301649611 +0200 +diff -up chromium-78.0.3904.70/components/history/core/browser/url_row.cc.el7-noexcept chromium-78.0.3904.70/components/history/core/browser/url_row.cc +--- chromium-78.0.3904.70/components/history/core/browser/url_row.cc.el7-noexcept 2019-10-21 15:06:29.000000000 -0400 ++++ chromium-78.0.3904.70/components/history/core/browser/url_row.cc 2019-10-30 09:26:51.625050418 -0400 @@ -26,7 +26,7 @@ URLRow::~URLRow() { } @@ -70,9 +70,9 @@ diff -up chromium-77.0.3865.90/components/history/core/browser/url_row.cc.el7-no void URLRow::Swap(URLRow* other) { std::swap(id_, other->id_); -diff -up chromium-77.0.3865.90/components/omnibox/browser/suggestion_answer.cc.el7-noexcept chromium-77.0.3865.90/components/omnibox/browser/suggestion_answer.cc ---- chromium-77.0.3865.90/components/omnibox/browser/suggestion_answer.cc.el7-noexcept 2019-09-19 22:40:04.794690694 +0200 -+++ chromium-77.0.3865.90/components/omnibox/browser/suggestion_answer.cc 2019-09-19 22:40:04.756690409 +0200 +diff -up chromium-78.0.3904.70/components/omnibox/browser/suggestion_answer.cc.el7-noexcept chromium-78.0.3904.70/components/omnibox/browser/suggestion_answer.cc +--- chromium-78.0.3904.70/components/omnibox/browser/suggestion_answer.cc.el7-noexcept 2019-10-21 15:06:29.000000000 -0400 ++++ chromium-78.0.3904.70/components/omnibox/browser/suggestion_answer.cc 2019-10-30 09:26:51.627050372 -0400 @@ -60,7 +60,7 @@ SuggestionAnswer::TextField::TextField(T SuggestionAnswer::TextField& SuggestionAnswer::TextField::operator=( const TextField&) = default; @@ -82,9 +82,9 @@ diff -up chromium-77.0.3865.90/components/omnibox/browser/suggestion_answer.cc.e // static bool SuggestionAnswer::TextField::ParseTextField(const base::Value& field_json, -diff -up chromium-77.0.3865.90/components/policy/core/common/policy_map.cc.el7-noexcept chromium-77.0.3865.90/components/policy/core/common/policy_map.cc ---- chromium-77.0.3865.90/components/policy/core/common/policy_map.cc.el7-noexcept 2019-09-19 22:40:05.476695794 +0200 -+++ chromium-77.0.3865.90/components/policy/core/common/policy_map.cc 2019-09-19 22:40:05.409695293 +0200 +diff -up chromium-78.0.3904.70/components/policy/core/common/policy_map.cc.el7-noexcept chromium-78.0.3904.70/components/policy/core/common/policy_map.cc +--- chromium-78.0.3904.70/components/policy/core/common/policy_map.cc.el7-noexcept 2019-10-21 15:06:29.000000000 -0400 ++++ chromium-78.0.3904.70/components/policy/core/common/policy_map.cc 2019-10-30 09:26:51.628050349 -0400 @@ -52,7 +52,7 @@ PolicyMap::Entry::Entry( PolicyMap::Entry::~Entry() = default; @@ -94,10 +94,10 @@ diff -up chromium-77.0.3865.90/components/policy/core/common/policy_map.cc.el7-n PolicyMap::Entry PolicyMap::Entry::DeepCopy() const { Entry copy; -diff -up chromium-77.0.3865.90/components/search_provider_logos/logo_common.cc.el7-noexcept chromium-77.0.3865.90/components/search_provider_logos/logo_common.cc ---- chromium-77.0.3865.90/components/search_provider_logos/logo_common.cc.el7-noexcept 2019-09-20 08:08:39.129845878 +0200 -+++ chromium-77.0.3865.90/components/search_provider_logos/logo_common.cc 2019-09-20 08:12:58.283828785 +0200 -@@ -14,14 +14,14 @@ LogoMetadata::LogoMetadata() = default; +diff -up chromium-78.0.3904.70/components/search_provider_logos/logo_common.cc.el7-noexcept chromium-78.0.3904.70/components/search_provider_logos/logo_common.cc +--- chromium-78.0.3904.70/components/search_provider_logos/logo_common.cc.el7-noexcept 2019-10-30 09:27:30.773143557 -0400 ++++ chromium-78.0.3904.70/components/search_provider_logos/logo_common.cc 2019-10-30 09:28:32.026733935 -0400 +@@ -14,7 +14,7 @@ LogoMetadata::LogoMetadata() = default; LogoMetadata::LogoMetadata(const LogoMetadata&) = default; LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default; LogoMetadata& LogoMetadata::operator=(const LogoMetadata&) = default; @@ -106,27 +106,10 @@ diff -up chromium-77.0.3865.90/components/search_provider_logos/logo_common.cc.e LogoMetadata::~LogoMetadata() = default; EncodedLogo::EncodedLogo() = default; - EncodedLogo::EncodedLogo(const EncodedLogo&) = default; - EncodedLogo::EncodedLogo(EncodedLogo&&) noexcept = default; - EncodedLogo& EncodedLogo::operator=(const EncodedLogo&) = default; --EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) noexcept = default; -+EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) = default; - EncodedLogo::~EncodedLogo() = default; - - Logo::Logo() = default; -@@ -29,7 +29,7 @@ Logo::~Logo() = default; - - LogoCallbacks::LogoCallbacks() = default; - LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default; --LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept = default; -+LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) = default; - LogoCallbacks::~LogoCallbacks() = default; - - } // namespace search_provider_logos -diff -up chromium-77.0.3865.90/components/signin/public/identity_manager/account_info.cc.el7-noexcept chromium-77.0.3865.90/components/signin/public/identity_manager/account_info.cc ---- chromium-77.0.3865.90/components/signin/public/identity_manager/account_info.cc.el7-noexcept 2019-09-19 22:39:59.938654375 +0200 -+++ chromium-77.0.3865.90/components/signin/public/identity_manager/account_info.cc 2019-09-19 22:39:59.946654435 +0200 -@@ -52,7 +52,7 @@ CoreAccountInfo::CoreAccountInfo(CoreAcc +diff -up chromium-78.0.3904.70/components/signin/public/identity_manager/account_info.cc.el7-noexcept chromium-78.0.3904.70/components/signin/public/identity_manager/account_info.cc +--- chromium-78.0.3904.70/components/signin/public/identity_manager/account_info.cc.el7-noexcept 2019-10-21 15:06:30.000000000 -0400 ++++ chromium-78.0.3904.70/components/signin/public/identity_manager/account_info.cc 2019-10-30 09:26:51.629050326 -0400 +@@ -57,7 +57,7 @@ CoreAccountInfo::CoreAccountInfo(CoreAcc CoreAccountInfo& CoreAccountInfo::operator=(const CoreAccountInfo& other) = default; @@ -135,7 +118,7 @@ diff -up chromium-77.0.3865.90/components/signin/public/identity_manager/account default; bool CoreAccountInfo::IsEmpty() const { -@@ -69,7 +69,7 @@ AccountInfo::AccountInfo(AccountInfo&& o +@@ -74,7 +74,7 @@ AccountInfo::AccountInfo(AccountInfo&& o AccountInfo& AccountInfo::operator=(const AccountInfo& other) = default; @@ -144,9 +127,9 @@ diff -up chromium-77.0.3865.90/components/signin/public/identity_manager/account bool AccountInfo::IsEmpty() const { return CoreAccountInfo::IsEmpty() && hosted_domain.empty() && -diff -up chromium-77.0.3865.90/google_apis/gaia/core_account_id.cc.el7-noexcept chromium-77.0.3865.90/google_apis/gaia/core_account_id.cc ---- chromium-77.0.3865.90/google_apis/gaia/core_account_id.cc.el7-noexcept 2019-09-19 22:40:51.185037647 +0200 -+++ chromium-77.0.3865.90/google_apis/gaia/core_account_id.cc 2019-09-19 22:40:51.202037775 +0200 +diff -up chromium-78.0.3904.70/google_apis/gaia/core_account_id.cc.el7-noexcept chromium-78.0.3904.70/google_apis/gaia/core_account_id.cc +--- chromium-78.0.3904.70/google_apis/gaia/core_account_id.cc.el7-noexcept 2019-10-21 15:06:34.000000000 -0400 ++++ chromium-78.0.3904.70/google_apis/gaia/core_account_id.cc 2019-10-30 09:26:51.630050302 -0400 @@ -14,7 +14,7 @@ CoreAccountId::~CoreAccountId() = defaul CoreAccountId& CoreAccountId::operator=(const CoreAccountId&) = default; @@ -156,9 +139,9 @@ diff -up chromium-77.0.3865.90/google_apis/gaia/core_account_id.cc.el7-noexcept CoreAccountId::CoreAccountId(const char* id) : id(id) {} -diff -up chromium-77.0.3865.90/google_apis/gaia/core_account_id.h.el7-noexcept chromium-77.0.3865.90/google_apis/gaia/core_account_id.h ---- chromium-77.0.3865.90/google_apis/gaia/core_account_id.h.el7-noexcept 2019-09-19 22:40:51.193037707 +0200 -+++ chromium-77.0.3865.90/google_apis/gaia/core_account_id.h 2019-09-19 22:40:51.197037737 +0200 +diff -up chromium-78.0.3904.70/google_apis/gaia/core_account_id.h.el7-noexcept chromium-78.0.3904.70/google_apis/gaia/core_account_id.h +--- chromium-78.0.3904.70/google_apis/gaia/core_account_id.h.el7-noexcept 2019-10-21 15:06:34.000000000 -0400 ++++ chromium-78.0.3904.70/google_apis/gaia/core_account_id.h 2019-10-30 09:26:51.631050279 -0400 @@ -20,7 +20,7 @@ struct CoreAccountId { ~CoreAccountId(); @@ -168,10 +151,10 @@ diff -up chromium-77.0.3865.90/google_apis/gaia/core_account_id.h.el7-noexcept c // Those implicit constructor and conversion operator allow to // progressively migrate the code to use this struct. Removing -diff -up chromium-77.0.3865.90/gpu/config/gpu_info.cc.el7-noexcept chromium-77.0.3865.90/gpu/config/gpu_info.cc ---- chromium-77.0.3865.90/gpu/config/gpu_info.cc.el7-noexcept 2019-09-19 22:40:26.755854941 +0200 -+++ chromium-77.0.3865.90/gpu/config/gpu_info.cc 2019-09-19 22:40:26.755854941 +0200 -@@ -170,7 +170,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice:: +diff -up chromium-78.0.3904.70/gpu/config/gpu_info.cc.el7-noexcept chromium-78.0.3904.70/gpu/config/gpu_info.cc +--- chromium-78.0.3904.70/gpu/config/gpu_info.cc.el7-noexcept 2019-10-21 15:06:35.000000000 -0400 ++++ chromium-78.0.3904.70/gpu/config/gpu_info.cc 2019-10-30 09:26:51.633050233 -0400 +@@ -169,7 +169,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice:: const GPUInfo::GPUDevice& other) = default; GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=( @@ -180,9 +163,9 @@ diff -up chromium-77.0.3865.90/gpu/config/gpu_info.cc.el7-noexcept chromium-77.0 GPUInfo::GPUInfo() : optimus(false), -diff -up chromium-77.0.3865.90/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept chromium-77.0.3865.90/third_party/openscreen/src/osp/public/service_info.h ---- chromium-77.0.3865.90/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept 2019-09-19 22:43:20.726156068 +0200 -+++ chromium-77.0.3865.90/third_party/openscreen/src/osp/public/service_info.h 2019-09-19 22:43:20.728156083 +0200 +diff -up chromium-78.0.3904.70/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept chromium-78.0.3904.70/third_party/openscreen/src/osp/public/service_info.h +--- chromium-78.0.3904.70/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept 2019-10-21 15:09:14.000000000 -0400 ++++ chromium-78.0.3904.70/third_party/openscreen/src/osp/public/service_info.h 2019-10-30 09:26:51.634050210 -0400 @@ -21,7 +21,7 @@ struct ServiceInfo { ServiceInfo(ServiceInfo&&) MAYBE_NOEXCEPT = default; ServiceInfo(const ServiceInfo&) MAYBE_NOEXCEPT = default; diff --git a/chromium.spec b/chromium.spec index 6c43be5..e619049 100644 --- a/chromium.spec +++ b/chromium.spec @@ -243,7 +243,7 @@ Patch69: chromium-77-clang.patch # Use lstdc++ on EPEL7 only Patch101: chromium-75.0.3770.100-epel7-stdc++.patch # el7 only patch -Patch102: chromium-77.0.3865.75-el7-noexcept.patch +Patch102: chromium-78.0.3904.70-el7-noexcept.patch # Enable VAAPI support on Linux # NOTE: This patch will never land upstream