commit af4746e6db6857279053ac789cb8fe0fe8af4b88 Author: Tomas Popela <tpopela(a)redhat.com&gt; Date: Fri Aug 23 07:54:57 2019 +0200 Fix the EL7 build as it doesn't like part of the upstream GCC patch ...809.100-el7-gcc-accountinfo-move-noexcept.patch | 23 ++++++++++++++++++++++ chromium.spec | 3 +++ 2 files changed, 26 insertions(+) --- diff --git a/chromium-76.0.3809.100-el7-gcc-accountinfo-move-noexcept.patch b/chromium-76.0.3809.100-el7-gcc-accountinfo-move-noexcept.patch new file mode 100644 index 0000000..09fccf6 --- /dev/null +++ b/chromium-76.0.3809.100-el7-gcc-accountinfo-move-noexcept.patch @@ -0,0 +1,23 @@ +diff -up chromium-76.0.3809.100/google_apis/gaia/core_account_id.cc.gcc-accountinfo-move-noexcept-epel chromium-76.0.3809.100/google_apis/gaia/core_account_id.cc +--- chromium-76.0.3809.100/google_apis/gaia/core_account_id.cc.gcc-accountinfo-move-noexcept-epel 2019-08-23 07:35:16.544308344 +0200 ++++ chromium-76.0.3809.100/google_apis/gaia/core_account_id.cc 2019-08-23 07:35:34.115441446 +0200 +@@ -14,8 +14,6 @@ CoreAccountId::~CoreAccountId() = defaul + + CoreAccountId& CoreAccountId::operator=(const CoreAccountId&) = default; + +-CoreAccountId& CoreAccountId::operator=(CoreAccountId&&) noexcept = default; +- + CoreAccountId::CoreAccountId(const char* id) : id(id) {} + + CoreAccountId::CoreAccountId(std::string&& id) : id(std::move(id)) {} +diff -up chromium-76.0.3809.100/google_apis/gaia/core_account_id.h.gcc-accountinfo-move-noexcept-epel chromium-76.0.3809.100/google_apis/gaia/core_account_id.h +--- chromium-76.0.3809.100/google_apis/gaia/core_account_id.h.gcc-accountinfo-move-noexcept-epel 2019-08-23 07:36:05.994682935 +0200 ++++ chromium-76.0.3809.100/google_apis/gaia/core_account_id.h 2019-08-23 07:36:13.039736302 +0200 +@@ -19,7 +19,6 @@ struct CoreAccountId { + ~CoreAccountId(); + + CoreAccountId& operator=(const CoreAccountId&); +- CoreAccountId& operator=(CoreAccountId&&) noexcept; + + // Those implicit constructor and conversion operator allow to + // progressively migrate the code to use this struct. Removing diff --git a/chromium.spec b/chromium.spec index 8a246b7..e09a0ac 100644 --- a/chromium.spec +++ b/chromium.spec @@ -311,6 +311,8 @@ Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch Patch101: chromium-75.0.3770.100-epel7-stdc++.patch # el7 only patch Patch102: chromium-75.0.3770.100-el7-fix-noexcept.patch +# el7 only patch as it doesn't like on of the operator= change in patch59 +Patch103: chromium-76.0.3809.100-el7-gcc-accountinfo-move-noexcept.patch # In file included from ../linux/directory.c:21: # In file included from ../../../../native_client/src/nonsfi/linux/abi_conversion.h:20: @@ -885,6 +887,7 @@ udev. %patch100 -p1 -b .kmaxskip %patch101 -p1 -b .epel7 %patch102 -p1 -b .el7-noexcept +%patch103 -p1 -b .el7-gcc-accountinfo-move-noexcept %endif # Feature specific patches