fix el7 noexcept patch
This commit is contained in:
Tom Callaway
parent
db1e9fac2b
commit
c07c245637
@ -1,6 +1,6 @@
|
||||
diff -up chromium-79.0.3945.56/chrome/common/media_router/media_sink.cc.el7-noexcept chromium-79.0.3945.56/chrome/common/media_router/media_sink.cc
|
||||
--- chromium-79.0.3945.56/chrome/common/media_router/media_sink.cc.el7-noexcept 2019-11-26 16:50:43.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/chrome/common/media_router/media_sink.cc 2019-12-03 12:55:19.129613273 -0500
|
||||
diff -up chromium-80.0.3987.132/chrome/common/media_router/media_sink.cc.el7-noexcept chromium-80.0.3987.132/chrome/common/media_router/media_sink.cc
|
||||
--- chromium-80.0.3987.132/chrome/common/media_router/media_sink.cc.el7-noexcept 2020-03-03 13:53:03.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/chrome/common/media_router/media_sink.cc 2020-03-11 10:47:13.352162096 -0400
|
||||
@@ -19,12 +19,12 @@ MediaSink::MediaSink(const MediaSink::Id
|
||||
provider_id_(provider_id) {}
|
||||
|
||||
@ -16,9 +16,9 @@ diff -up chromium-79.0.3945.56/chrome/common/media_router/media_sink.cc.el7-noex
|
||||
|
||||
bool MediaSink::IsMaybeCloudSink() const {
|
||||
switch (icon_type_) {
|
||||
diff -up chromium-79.0.3945.56/components/history/core/browser/history_types.cc.el7-noexcept chromium-79.0.3945.56/components/history/core/browser/history_types.cc
|
||||
--- chromium-79.0.3945.56/components/history/core/browser/history_types.cc.el7-noexcept 2019-11-26 16:50:45.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/components/history/core/browser/history_types.cc 2019-12-03 12:55:19.178612170 -0500
|
||||
diff -up chromium-80.0.3987.132/components/history/core/browser/history_types.cc.el7-noexcept chromium-80.0.3987.132/components/history/core/browser/history_types.cc
|
||||
--- chromium-80.0.3987.132/components/history/core/browser/history_types.cc.el7-noexcept 2020-03-03 13:53:53.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/components/history/core/browser/history_types.cc 2020-03-11 10:47:13.352162096 -0400
|
||||
@@ -42,7 +42,7 @@ QueryResults::QueryResults(QueryResults&
|
||||
Swap(&other);
|
||||
}
|
||||
@ -37,9 +37,9 @@ diff -up chromium-79.0.3945.56/components/history/core/browser/history_types.cc.
|
||||
|
||||
// MostVisitedURL --------------------------------------------------------------
|
||||
|
||||
diff -up chromium-79.0.3945.56/components/history/core/browser/history_types.h.el7-noexcept chromium-79.0.3945.56/components/history/core/browser/history_types.h
|
||||
--- chromium-79.0.3945.56/components/history/core/browser/history_types.h.el7-noexcept 2019-11-26 16:52:30.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/components/history/core/browser/history_types.h 2019-12-03 12:55:19.184612035 -0500
|
||||
diff -up chromium-80.0.3987.132/components/history/core/browser/history_types.h.el7-noexcept chromium-80.0.3987.132/components/history/core/browser/history_types.h
|
||||
--- chromium-80.0.3987.132/components/history/core/browser/history_types.h.el7-noexcept 2020-03-03 13:53:53.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/components/history/core/browser/history_types.h 2020-03-11 10:47:13.352162096 -0400
|
||||
@@ -141,7 +141,7 @@ class QueryResults {
|
||||
~QueryResults();
|
||||
|
||||
@ -58,9 +58,9 @@ diff -up chromium-79.0.3945.56/components/history/core/browser/history_types.h.e
|
||||
~QueryURLResult();
|
||||
|
||||
// Indicates whether the call to HistoryBackend::QueryURL was successfull
|
||||
diff -up chromium-79.0.3945.56/components/history/core/browser/url_row.cc.el7-noexcept chromium-79.0.3945.56/components/history/core/browser/url_row.cc
|
||||
--- chromium-79.0.3945.56/components/history/core/browser/url_row.cc.el7-noexcept 2019-11-26 16:50:45.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/components/history/core/browser/url_row.cc 2019-12-03 12:55:19.211611428 -0500
|
||||
diff -up chromium-80.0.3987.132/components/history/core/browser/url_row.cc.el7-noexcept chromium-80.0.3987.132/components/history/core/browser/url_row.cc
|
||||
--- chromium-80.0.3987.132/components/history/core/browser/url_row.cc.el7-noexcept 2020-03-03 13:53:05.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/components/history/core/browser/url_row.cc 2020-03-11 10:47:13.352162096 -0400
|
||||
@@ -26,7 +26,7 @@ URLRow::~URLRow() {
|
||||
}
|
||||
|
||||
@ -70,9 +70,9 @@ diff -up chromium-79.0.3945.56/components/history/core/browser/url_row.cc.el7-no
|
||||
|
||||
void URLRow::Swap(URLRow* other) {
|
||||
std::swap(id_, other->id_);
|
||||
diff -up chromium-79.0.3945.56/components/omnibox/browser/suggestion_answer.cc.el7-noexcept chromium-79.0.3945.56/components/omnibox/browser/suggestion_answer.cc
|
||||
--- chromium-79.0.3945.56/components/omnibox/browser/suggestion_answer.cc.el7-noexcept 2019-11-26 16:50:45.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/components/omnibox/browser/suggestion_answer.cc 2019-12-03 12:55:19.240610775 -0500
|
||||
diff -up chromium-80.0.3987.132/components/omnibox/browser/suggestion_answer.cc.el7-noexcept chromium-80.0.3987.132/components/omnibox/browser/suggestion_answer.cc
|
||||
--- chromium-80.0.3987.132/components/omnibox/browser/suggestion_answer.cc.el7-noexcept 2020-03-03 13:53:06.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/components/omnibox/browser/suggestion_answer.cc 2020-03-11 10:47:13.352162096 -0400
|
||||
@@ -60,7 +60,7 @@ SuggestionAnswer::TextField::TextField(T
|
||||
SuggestionAnswer::TextField& SuggestionAnswer::TextField::operator=(
|
||||
const TextField&) = default;
|
||||
@ -82,9 +82,9 @@ diff -up chromium-79.0.3945.56/components/omnibox/browser/suggestion_answer.cc.e
|
||||
|
||||
// static
|
||||
bool SuggestionAnswer::TextField::ParseTextField(const base::Value& field_json,
|
||||
diff -up chromium-79.0.3945.56/components/policy/core/common/policy_map.cc.el7-noexcept chromium-79.0.3945.56/components/policy/core/common/policy_map.cc
|
||||
--- chromium-79.0.3945.56/components/policy/core/common/policy_map.cc.el7-noexcept 2019-12-03 12:55:19.241610753 -0500
|
||||
+++ chromium-79.0.3945.56/components/policy/core/common/policy_map.cc 2019-12-03 13:45:18.433948708 -0500
|
||||
diff -up chromium-80.0.3987.132/components/policy/core/common/policy_map.cc.el7-noexcept chromium-80.0.3987.132/components/policy/core/common/policy_map.cc
|
||||
--- chromium-80.0.3987.132/components/policy/core/common/policy_map.cc.el7-noexcept 2020-03-03 13:53:53.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/components/policy/core/common/policy_map.cc 2020-03-11 10:47:13.353162076 -0400
|
||||
@@ -52,7 +52,7 @@ PolicyMap::Entry::Entry(
|
||||
PolicyMap::Entry::~Entry() = default;
|
||||
|
||||
@ -94,9 +94,9 @@ diff -up chromium-79.0.3945.56/components/policy/core/common/policy_map.cc.el7-n
|
||||
|
||||
PolicyMap::Entry PolicyMap::Entry::DeepCopy() const {
|
||||
Entry copy(level, scope, source, value ? value->CreateDeepCopy() : nullptr,
|
||||
diff -up chromium-79.0.3945.56/components/search_provider_logos/logo_common.cc.el7-noexcept chromium-79.0.3945.56/components/search_provider_logos/logo_common.cc
|
||||
--- chromium-79.0.3945.56/components/search_provider_logos/logo_common.cc.el7-noexcept 2019-11-26 16:50:45.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/components/search_provider_logos/logo_common.cc 2019-12-03 12:55:19.242610730 -0500
|
||||
diff -up chromium-80.0.3987.132/components/search_provider_logos/logo_common.cc.el7-noexcept chromium-80.0.3987.132/components/search_provider_logos/logo_common.cc
|
||||
--- chromium-80.0.3987.132/components/search_provider_logos/logo_common.cc.el7-noexcept 2020-03-03 13:53:06.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/components/search_provider_logos/logo_common.cc 2020-03-11 10:47:13.353162076 -0400
|
||||
@@ -14,14 +14,14 @@ LogoMetadata::LogoMetadata() = default;
|
||||
LogoMetadata::LogoMetadata(const LogoMetadata&) = default;
|
||||
LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default;
|
||||
@ -123,9 +123,9 @@ diff -up chromium-79.0.3945.56/components/search_provider_logos/logo_common.cc.e
|
||||
LogoCallbacks::~LogoCallbacks() = default;
|
||||
|
||||
} // namespace search_provider_logos
|
||||
diff -up chromium-79.0.3945.56/components/signin/public/identity_manager/account_info.cc.el7-noexcept chromium-79.0.3945.56/components/signin/public/identity_manager/account_info.cc
|
||||
--- chromium-79.0.3945.56/components/signin/public/identity_manager/account_info.cc.el7-noexcept 2019-11-26 16:50:45.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/components/signin/public/identity_manager/account_info.cc 2019-12-03 12:55:19.242610730 -0500
|
||||
diff -up chromium-80.0.3987.132/components/signin/public/identity_manager/account_info.cc.el7-noexcept chromium-80.0.3987.132/components/signin/public/identity_manager/account_info.cc
|
||||
--- chromium-80.0.3987.132/components/signin/public/identity_manager/account_info.cc.el7-noexcept 2020-03-03 13:53:54.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/components/signin/public/identity_manager/account_info.cc 2020-03-11 10:47:13.353162076 -0400
|
||||
@@ -58,7 +58,7 @@ CoreAccountInfo::CoreAccountInfo(CoreAcc
|
||||
CoreAccountInfo& CoreAccountInfo::operator=(const CoreAccountInfo& other) =
|
||||
default;
|
||||
@ -144,33 +144,40 @@ diff -up chromium-79.0.3945.56/components/signin/public/identity_manager/account
|
||||
|
||||
bool AccountInfo::IsEmpty() const {
|
||||
return CoreAccountInfo::IsEmpty() && hosted_domain.empty() &&
|
||||
diff -up chromium-79.0.3945.56/google_apis/gaia/core_account_id.cc.el7-noexcept chromium-79.0.3945.56/google_apis/gaia/core_account_id.cc
|
||||
--- chromium-79.0.3945.56/google_apis/gaia/core_account_id.cc.el7-noexcept 2019-11-26 16:52:31.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/google_apis/gaia/core_account_id.cc 2019-12-03 12:55:19.243610708 -0500
|
||||
@@ -14,7 +14,7 @@ CoreAccountId::~CoreAccountId() = defaul
|
||||
diff -up chromium-80.0.3987.132/google_apis/gaia/core_account_id.cc.el7-noexcept chromium-80.0.3987.132/google_apis/gaia/core_account_id.cc
|
||||
--- chromium-80.0.3987.132/google_apis/gaia/core_account_id.cc.el7-noexcept 2020-03-11 10:47:13.684155381 -0400
|
||||
+++ chromium-80.0.3987.132/google_apis/gaia/core_account_id.cc 2020-03-11 10:48:18.241848293 -0400
|
||||
@@ -24,7 +24,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-79.0.3945.56/google_apis/gaia/core_account_id.h.el7-noexcept chromium-79.0.3945.56/google_apis/gaia/core_account_id.h
|
||||
--- chromium-79.0.3945.56/google_apis/gaia/core_account_id.h.el7-noexcept 2019-11-26 16:52:31.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/google_apis/gaia/core_account_id.h 2019-12-03 12:55:19.243610708 -0500
|
||||
@@ -20,7 +20,7 @@ struct CoreAccountId {
|
||||
// static
|
||||
CoreAccountId CoreAccountId::FromGaiaId(const std::string& gaia_id) {
|
||||
@@ -82,4 +82,4 @@ std::vector<std::string> ToStringList(
|
||||
for (const auto& account_id : account_ids)
|
||||
account_ids_string.push_back(account_id.ToString());
|
||||
return account_ids_string;
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -up chromium-80.0.3987.132/google_apis/gaia/core_account_id.h.el7-noexcept chromium-80.0.3987.132/google_apis/gaia/core_account_id.h
|
||||
--- chromium-80.0.3987.132/google_apis/gaia/core_account_id.h.el7-noexcept 2020-03-11 10:47:13.686155340 -0400
|
||||
+++ chromium-80.0.3987.132/google_apis/gaia/core_account_id.h 2020-03-11 10:48:47.857248531 -0400
|
||||
@@ -30,7 +30,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-79.0.3945.56/gpu/config/gpu_info.cc.el7-noexcept chromium-79.0.3945.56/gpu/config/gpu_info.cc
|
||||
--- chromium-79.0.3945.56/gpu/config/gpu_info.cc.el7-noexcept 2019-11-26 16:52:31.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/gpu/config/gpu_info.cc 2019-12-03 12:55:19.244610685 -0500
|
||||
// Checks if the account is valid or not.
|
||||
bool empty() const;
|
||||
diff -up chromium-80.0.3987.132/gpu/config/gpu_info.cc.el7-noexcept chromium-80.0.3987.132/gpu/config/gpu_info.cc
|
||||
--- chromium-80.0.3987.132/gpu/config/gpu_info.cc.el7-noexcept 2020-03-03 13:53:55.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/gpu/config/gpu_info.cc 2020-03-11 10:47:13.689155280 -0400
|
||||
@@ -173,7 +173,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice::
|
||||
const GPUInfo::GPUDevice& other) = default;
|
||||
|
||||
@ -180,10 +187,10 @@ diff -up chromium-79.0.3945.56/gpu/config/gpu_info.cc.el7-noexcept chromium-79.0
|
||||
|
||||
GPUInfo::GPUInfo()
|
||||
: optimus(false),
|
||||
diff -up chromium-79.0.3945.56/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept chromium-79.0.3945.56/third_party/openscreen/src/osp/public/service_info.h
|
||||
--- chromium-79.0.3945.56/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept 2019-11-26 16:53:39.000000000 -0500
|
||||
+++ chromium-79.0.3945.56/third_party/openscreen/src/osp/public/service_info.h 2019-12-03 12:55:19.244610685 -0500
|
||||
@@ -21,7 +21,7 @@ struct ServiceInfo {
|
||||
diff -up chromium-80.0.3987.132/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept chromium-80.0.3987.132/third_party/openscreen/src/osp/public/service_info.h
|
||||
--- chromium-80.0.3987.132/third_party/openscreen/src/osp/public/service_info.h.el7-noexcept 2020-03-03 13:55:28.000000000 -0500
|
||||
+++ chromium-80.0.3987.132/third_party/openscreen/src/osp/public/service_info.h 2020-03-11 10:47:13.690155259 -0400
|
||||
@@ -22,7 +22,7 @@ struct ServiceInfo {
|
||||
ServiceInfo(ServiceInfo&&) MAYBE_NOEXCEPT = default;
|
||||
ServiceInfo(const ServiceInfo&) MAYBE_NOEXCEPT = default;
|
||||
|
||||
@ -249,7 +249,7 @@ Patch75: chromium-80.0.3987.106-missing-cstring-header.patch
|
||||
# Use lstdc++ on EPEL7 only
|
||||
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
|
||||
# el7 only patch
|
||||
Patch102: chromium-79.0.3945.56-el7-noexcept.patch
|
||||
Patch102: chromium-80.0.3987.132-el7-noexcept.patch
|
||||
|
||||
# Enable VAAPI support on Linux
|
||||
# NOTE: This patch will never land upstream
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user