[chromium-freeworld/el7] REVERT: Re-adjust the patch to make the auto sync script happy. Refer: https://src.fedoraproject.org
commit 8f46c499f71bb9aec5da5a2cd168f4c160959a48
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Fri Mar 22 21:58:51 2019 +0530
REVERT: Re-adjust the patch to make the auto sync script happy. Refer:
https://src.fedoraproject.org/rpms/chromium/blob/7ccede1e1c9540468ce6fb36...
chromium-freeworld.spec | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index e7797b5..fc43772 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -309,8 +309,7 @@ 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...
-# 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:
@@ -344,10 +343,6 @@
Source15: http://download.savannah.nongnu.org/releases/freebangfont/MuktiNarrow-
Source16: https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf
Source17: GardinerModBug.ttf
Source18: GardinerModCat.ttf
-# RHEL needs newer nodejs
-%if 0%{?rhel}
-Source19: node-v8.9.1-linux-x64.tar.gz
-%endif
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@@ -377,7 +372,6 @@ BuildRequires: libdrm-devel
%endif
BuildRequires: libgcrypt-devel
BuildRequires: libudev-devel
-BuildRequires: libuuid-devel
BuildRequires: libusb-devel
BuildRequires: libXdamage-devel
BuildRequires: libXScrnSaver-devel
@@ -387,10 +381,7 @@ BuildRequires: minizip-compat-devel
%else
BuildRequires: minizip-devel
%endif
-# RHEL 7's nodejs is too old
-%if 0%{?fedora}
BuildRequires: nodejs
-%endif
BuildRequires: nss-devel >= 3.26
BuildRequires: pciutils-devel
BuildRequires: pulseaudio-libs-devel
@@ -873,9 +864,7 @@ 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