rpms
/
chromium
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue on epel7 where linux/kcmp.h does not exist

This commit is contained in:
Tom Callaway 2020-06-10 09:09:27 -04:00
parent b89f802e2a
commit 9063928687
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chromium-83.0.4103.97-epel7-no-kcmp-h.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up chromium-83.0.4103.97/services/service_manager/sandbox/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp chromium-83.0.4103.97/services/service_manager/sandbox/linux/bpf_cros_amd_gpu_policy_linux.cc
--- chromium-83.0.4103.97/services/service_manager/sandbox/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp 2020-06-10 09:02:52.693899311 -0400
+++ chromium-83.0.4103.97/services/service_manager/sandbox/linux/bpf_cros_amd_gpu_policy_linux.cc 2020-06-10 09:04:14.692102541 -0400
@@ -5,7 +5,9 @@
#include "services/service_manager/sandbox/linux/bpf_cros_amd_gpu_policy_linux.h"
#include <fcntl.h>
-#include <linux/kcmp.h>
+#ifndef KCMP_FILE
+#define KCMP_FILE 0
+#endif
#include <sys/socket.h>
// Some arch's (arm64 for instance) unistd.h don't pull in symbols used here

8
chromium.spec
View File

@ -167,7 +167,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.4103.97
Release: 2%{?dist}
Release: 3%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@ -273,6 +273,8 @@ Patch90: chromium-83-gcc-compatibility.patch
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
# el7 only patch
Patch102: chromium-80.0.3987.132-el7-noexcept.patch
# No linux/kcmp.h on EPEL7
Patch103: chromium-83.0.4103.97-epel7-no-kcmp-h.patch
# Enable VAAPI support on Linux
# NOTE: This patch will never land upstream
@ -855,6 +857,7 @@ udev.
%if 0%{?rhel} == 7
%patch101 -p1 -b .epel7
%patch102 -p1 -b .el7-noexcept
%patch103 -p1 -b .epel7-kcmp
%endif
# Feature specific patches
@ -1800,6 +1803,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Wed Jun 10 2020 Tom Callaway <spot@fedoraproject.org> - 83.0.4103.97-3
- fix issue on epel7 where linux/kcmp.h does not exist
* Mon Jun 8 2020 Tom Callaway <spot@fedoraproject.org> - 83.0.4103.97-2
- more fixes from gentoo