9:22 p.m.
commit 8ca0005ac17f944b9e04c7f65eb0a8bd85372e96
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Jun 20 10:22:41 2019 -0400
update epel7 patches
chromium-75.0.3770.100-el7-fix-noexcept.patch | 54 +++++++++++++++++++++++++++
chromium-75.0.3770.100-epel7-stdc++.patch | 11 ++++++
chromium.spec | 4 +-
3 files changed, 67 insertions(+), 2 deletions(-)
---
diff --git a/chromium-75.0.3770.100-el7-fix-noexcept.patch
b/chromium-75.0.3770.100-el7-fix-noexcept.patch
new file mode 100644
index 0000000..eaba072
--- /dev/null
+++ b/chromium-75.0.3770.100-el7-fix-noexcept.patch
@@ -0,0 +1,54 @@
+diff -up chromium-75.0.3770.100/chrome/common/media_router/media_sink.cc.el7-noexcept
chromium-75.0.3770.100/chrome/common/media_router/media_sink.cc
+---
chromium-75.0.3770.100/chrome/common/media_router/media_sink.cc.el7-noexcept 2019-06-18
11:47:55.000000000 -0400
++++ chromium-75.0.3770.100/chrome/common/media_router/media_sink.cc 2019-06-20
10:17:27.440446569 -0400
+@@ -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-75.0.3770.100/components/policy/core/common/policy_map.cc.el7-noexcept
chromium-75.0.3770.100/components/policy/core/common/policy_map.cc
+---
chromium-75.0.3770.100/components/policy/core/common/policy_map.cc.el7-noexcept 2019-06-18
11:48:01.000000000 -0400
++++ chromium-75.0.3770.100/components/policy/core/common/policy_map.cc 2019-06-20
10:17:27.444446463 -0400
+@@ -31,7 +31,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-75.0.3770.100/components/signin/core/browser/account_info.cc.el7-noexcept
chromium-75.0.3770.100/components/signin/core/browser/account_info.cc
+---
chromium-75.0.3770.100/components/signin/core/browser/account_info.cc.el7-noexcept 2019-06-20
10:17:27.444446463 -0400
++++ chromium-75.0.3770.100/components/signin/core/browser/account_info.cc 2019-06-20
10:19:17.959532865 -0400
+@@ -51,7 +51,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 {
+diff -up chromium-75.0.3770.100/gpu/config/gpu_info.cc.el7-noexcept
chromium-75.0.3770.100/gpu/config/gpu_info.cc
+--- chromium-75.0.3770.100/gpu/config/gpu_info.cc.el7-noexcept 2019-06-18
11:48:10.000000000 -0400
++++ chromium-75.0.3770.100/gpu/config/gpu_info.cc 2019-06-20 10:17:27.445446437 -0400
+@@ -181,7 +181,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 --git a/chromium-75.0.3770.100-epel7-stdc++.patch
b/chromium-75.0.3770.100-epel7-stdc++.patch
new file mode 100644
index 0000000..e4d62a0
--- /dev/null
+++ b/chromium-75.0.3770.100-epel7-stdc++.patch
@@ -0,0 +1,11 @@
+diff -up chromium-75.0.3770.100/build/config/BUILD.gn.epel7
chromium-75.0.3770.100/build/config/BUILD.gn
+--- chromium-75.0.3770.100/build/config/BUILD.gn.epel7 2019-06-20 10:10:03.099549006
-0400
++++ chromium-75.0.3770.100/build/config/BUILD.gn 2019-06-20 10:10:21.483158162 -0400
+@@ -267,6 +267,7 @@ config("default_libs") {
+ "dl",
+ "pthread",
+ "rt",
++ "stdc++",
+ ]
+ }
+ }
diff --git a/chromium.spec b/chromium.spec
index 3c33fcf..9ecb449 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -254,7 +254,7 @@ Patch85: chromium-68.0.3440.106-boolfix.patch
# From Debian
Patch86: chromium-71.0.3578.98-skia-aarch64-buildfix.patch
# Use lstdc++ on EPEL7 only
-Patch87: chromium-65.0.3325.162-epel7-stdc++.patch
+Patch87: chromium-75.0.3770.100-epel7-stdc++.patch
# Missing files in tarball
Patch88: chromium-66.0.3359.117-missing-files.patch
#
https://chromium.googlesource.com/chromium/src/+/ba4141e451f4e0b1b19410b1...
@@ -322,7 +322,7 @@
Patch135: chromium-73.0.3683.75-disable-fno-delete-null-pointer-checks.patch
# Add #include <cstring> to get pipewire code to build
Patch136: chromium-73.0.3683.75-pipewire-cstring-fix.patch
# el7 only patch
-Patch139: chromium-73.0.3683.75-el7-fix-noexcept.patch
+Patch139: chromium-75.0.3770.100-el7-fix-noexcept.patch
# gcc does not have __assume
Patch140: chromium-75.0.3770.80-gcc-no-assume.patch
# Linux 5.2 defines SIOCGSTAMP in a slightly different way, so we need to teach chromium
where to find it