From 1d37c1e7aa034fa781f73e3dcc663a8b66cc4952 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 23 Sep 2019 06:45:42 +0200 Subject: [PATCH] Update the el7's noexcept patch --- chromium-77.0.3865.90-el7-noexcept.patch | 194 +++++++++++++++++++++++ chromium.spec | 2 +- 2 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 chromium-77.0.3865.90-el7-noexcept.patch diff --git a/chromium-77.0.3865.90-el7-noexcept.patch b/chromium-77.0.3865.90-el7-noexcept.patch new file mode 100644 index 00000000..1b7ac615 --- /dev/null +++ b/chromium-77.0.3865.90-el7-noexcept.patch @@ -0,0 +1,194 @@ +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 +@@ -19,12 +19,12 @@ MediaSink::MediaSink(const MediaSink::Id + provider_id_(provider_id) {} + + MediaSink::MediaSink(const MediaSink& other) = default; +-MediaSink::MediaSink(MediaSink&& other) noexcept = default; ++MediaSink::MediaSink(MediaSink&& other) = default; + MediaSink::MediaSink() = default; + MediaSink::~MediaSink() = default; + + MediaSink& MediaSink::operator=(const MediaSink& other) = default; +-MediaSink& MediaSink::operator=(MediaSink&& other) noexcept = default; ++MediaSink& MediaSink::operator=(MediaSink&& other) = default; + + 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 +@@ -42,7 +42,7 @@ QueryResults::QueryResults(QueryResults& + Swap(&other); + } + +-QueryResults& QueryResults::operator=(QueryResults&& other) noexcept { ++QueryResults& QueryResults::operator=(QueryResults&& other) { + Swap(&other); + return *this; + } +@@ -186,7 +186,7 @@ QueryURLResult::QueryURLResult(QueryURLR + + QueryURLResult& QueryURLResult::operator=(const QueryURLResult&) = default; + +-QueryURLResult& QueryURLResult::operator=(QueryURLResult&&) noexcept = default; ++QueryURLResult& QueryURLResult::operator=(QueryURLResult&&) = default; + + // 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 +@@ -143,7 +143,7 @@ class QueryResults { + ~QueryResults(); + + QueryResults(QueryResults&& other) noexcept; +- QueryResults& operator=(QueryResults&& other) noexcept; ++ QueryResults& operator=(QueryResults&& other); + + void set_reached_beginning(bool reached) { reached_beginning_ = reached; } + bool reached_beginning() { return reached_beginning_; } +@@ -278,7 +278,7 @@ struct QueryURLResult { + QueryURLResult(const QueryURLResult&); + QueryURLResult(QueryURLResult&&) noexcept; + QueryURLResult& operator=(const QueryURLResult&); +- QueryURLResult& operator=(QueryURLResult&&) noexcept; ++ QueryURLResult& operator=(QueryURLResult&&); + ~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 +@@ -26,7 +26,7 @@ URLRow::~URLRow() { + } + + URLRow& URLRow::operator=(const URLRow& other) = default; +-URLRow& URLRow::operator=(URLRow&& other) noexcept = default; ++URLRow& URLRow::operator=(URLRow&& other) = default; + + 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 +@@ -60,7 +60,7 @@ SuggestionAnswer::TextField::TextField(T + SuggestionAnswer::TextField& SuggestionAnswer::TextField::operator=( + const TextField&) = default; + SuggestionAnswer::TextField& SuggestionAnswer::TextField::operator=( +- TextField&&) noexcept = default; ++ TextField&&) = default; + + // 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 +@@ -52,7 +52,7 @@ PolicyMap::Entry::Entry( + PolicyMap::Entry::~Entry() = default; + + PolicyMap::Entry::Entry(Entry&&) noexcept = default; +-PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) noexcept = default; ++PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) = default; + + 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; + LogoMetadata::LogoMetadata(const LogoMetadata&) = default; + LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default; + LogoMetadata& LogoMetadata::operator=(const LogoMetadata&) = default; +-LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default; ++LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) = default; + 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 + CoreAccountInfo& CoreAccountInfo::operator=(const CoreAccountInfo& other) = + default; + +-CoreAccountInfo& CoreAccountInfo::operator=(CoreAccountInfo&& other) noexcept = ++CoreAccountInfo& CoreAccountInfo::operator=(CoreAccountInfo&& other) = + default; + + bool CoreAccountInfo::IsEmpty() const { +@@ -69,7 +69,7 @@ AccountInfo::AccountInfo(AccountInfo&& o + + AccountInfo& AccountInfo::operator=(const AccountInfo& other) = default; + +-AccountInfo& AccountInfo::operator=(AccountInfo&& other) noexcept = default; ++AccountInfo& AccountInfo::operator=(AccountInfo&& other) = default; + + 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 +@@ -14,7 +14,7 @@ CoreAccountId::~CoreAccountId() = defaul + + CoreAccountId& CoreAccountId::operator=(const CoreAccountId&) = default; + +-CoreAccountId& CoreAccountId::operator=(CoreAccountId&&) noexcept = default; ++CoreAccountId& CoreAccountId::operator=(CoreAccountId&&) = default; + + 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 +@@ -20,7 +20,7 @@ struct CoreAccountId { + ~CoreAccountId(); + + CoreAccountId& operator=(const CoreAccountId&); +- CoreAccountId& operator=(CoreAccountId&&) noexcept; ++ CoreAccountId& operator=(CoreAccountId&&); + + // 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:: + const GPUInfo::GPUDevice& other) = default; + + GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=( +- GPUInfo::GPUDevice&& other) noexcept = default; ++ GPUInfo::GPUDevice&& other) = default; + + 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 +@@ -21,7 +21,7 @@ struct ServiceInfo { + ServiceInfo(ServiceInfo&&) MAYBE_NOEXCEPT = default; + ServiceInfo(const ServiceInfo&) MAYBE_NOEXCEPT = default; + +- ServiceInfo& operator=(ServiceInfo&&) MAYBE_NOEXCEPT = default; ++ ServiceInfo& operator=(ServiceInfo&&) = default; + ServiceInfo& operator=(const ServiceInfo&) MAYBE_NOEXCEPT = default; + + bool operator==(const ServiceInfo& other) const; diff --git a/chromium.spec b/chromium.spec index e6a6f88e..8f9e7ee4 100644 --- a/chromium.spec +++ b/chromium.spec @@ -222,7 +222,7 @@ Patch60: chromium-77.0.3865.75-missing-limits.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-77.0.3865.90-el7-noexcept.patch # Enable VAAPI support on Linux # NOTE: This patch will never land upstream