From e9829bbce48a38ec1c97cdbcd180f4edf546b90f Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 20 Dec 2018 09:53:41 -0500 Subject: [PATCH] okay, lets try this --- chromium-71.0.3578.98-el7-fix-noexcept.patch | 12 ++++++++++++ chromium.spec | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 chromium-71.0.3578.98-el7-fix-noexcept.patch diff --git a/chromium-71.0.3578.98-el7-fix-noexcept.patch b/chromium-71.0.3578.98-el7-fix-noexcept.patch new file mode 100644 index 0000000..ba1268b --- /dev/null +++ b/chromium-71.0.3578.98-el7-fix-noexcept.patch @@ -0,0 +1,12 @@ +diff -up chromium-71.0.3578.98/gpu/config/gpu_info.cc.fix-noexcept chromium-71.0.3578.98/gpu/config/gpu_info.cc +--- chromium-71.0.3578.98/gpu/config/gpu_info.cc.fix-noexcept 2018-12-20 09:50:03.320449807 -0500 ++++ chromium-71.0.3578.98/gpu/config/gpu_info.cc 2018-12-20 09:50:25.768849091 -0500 +@@ -116,7 +116,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.spec b/chromium.spec index cb71e2c..a050d5e 100644 --- a/chromium.spec +++ b/chromium.spec @@ -309,6 +309,8 @@ Patch123: relax-libva-version.patch Patch124: chromium-71.0.3578.98-vaapi-libva1-compatibility.patch # From gentoo Patch125: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-71-gcc-0.patch +# For el7: error: function 'gpu::GPUInfo::GPUDevice& gpu::GPUInfo::GPUDevice::operator=(gpu::GPUInfo::GPUDevice&&)' defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification '' +Patch126: chromium-71.0.3578.98-el7-fix-noexcept.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: @@ -864,6 +866,9 @@ udev. %patch123 -p1 -b .relaxva %patch124 -p1 -b .va1compat %patch125 -p1 -b .gcc-overloaded +%if 0%{?rhel} == 7 +%patch126 -p1 -b .fix-noexcept +%endif # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works