From fb8956b8a892b7deab78f943ae09d03ba9e30e96 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 19 Oct 2020 11:43:48 -0400 Subject: [PATCH] fix epel7 bits --- chromium-86.0.4240.75-epel7-no-kcmp-h.patch | 14 ++++++++++++++ chromium.spec | 6 +----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 chromium-86.0.4240.75-epel7-no-kcmp-h.patch diff --git a/chromium-86.0.4240.75-epel7-no-kcmp-h.patch b/chromium-86.0.4240.75-epel7-no-kcmp-h.patch new file mode 100644 index 0000000..f12ecf6 --- /dev/null +++ b/chromium-86.0.4240.75-epel7-no-kcmp-h.patch @@ -0,0 +1,14 @@ +diff -up chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc +--- chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp 2020-10-19 11:33:27.395594061 -0400 ++++ chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc 2020-10-19 11:33:41.703706818 -0400 +@@ -6,7 +6,9 @@ + + #include + #include +-#include ++#ifndef KCMP_FILE ++#define KCMP_FILE 0 ++#endif + #include + + // Some arch's (arm64 for instance) unistd.h don't pull in symbols used here diff --git a/chromium.spec b/chromium.spec index 89062ab..6466bce 100644 --- a/chromium.spec +++ b/chromium.spec @@ -274,7 +274,7 @@ 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-84.0.4147.89-epel7-no-kcmp-h.patch +Patch103: chromium-86.0.4240.75-epel7-no-kcmp-h.patch # Use old cups (chromium's code workaround breaks on gcc) # Revert: https://github.com/chromium/chromium/commit/c3213f8779ddc427e89d982514185ed5e4c94e91 Patch104: chromium-84.0.4147.89-epel7-old-cups.patch @@ -894,10 +894,6 @@ udev. %patch108 -p1 -b .el7-old-libdrm %endif -%if 0%{?rhel} == 7 || 0%{?rhel} == 8 -%patch106 -p1 -b .el-clang -%endif - %if 0%{?rhel} == 8 %patch107 -p1 -b .el8-arm-incompatible-ints %endif