diff --git a/chromium-90.0.4430.85-epel7-no-kcmp-h.patch b/chromium-90.0.4430.93-epel7-old-headers-workarounds.patch similarity index 85% rename from chromium-90.0.4430.85-epel7-no-kcmp-h.patch rename to chromium-90.0.4430.93-epel7-old-headers-workarounds.patch index 0921bc3a..d7251640 100644 --- a/chromium-90.0.4430.85-epel7-no-kcmp-h.patch +++ b/chromium-90.0.4430.93-epel7-old-headers-workarounds.patch @@ -111,3 +111,17 @@ diff -up chromium-90.0.4430.93/sandbox/linux/seccomp-bpf-helpers/syscall_paramet #if defined(__arm__) && !defined(MAP_STACK) #define MAP_STACK 0x20000 // Daisy build environment has old headers. #endif +diff -up chromium-90.0.4430.93/ui/events/ozone/evdev/event_converter_evdev_impl.cc.epel7-kcmp chromium-90.0.4430.93/ui/events/ozone/evdev/event_converter_evdev_impl.cc +--- chromium-90.0.4430.93/ui/events/ozone/evdev/event_converter_evdev_impl.cc.epel7-kcmp 2021-04-28 09:55:12.941124592 -0400 ++++ chromium-90.0.4430.93/ui/events/ozone/evdev/event_converter_evdev_impl.cc 2021-04-28 09:55:42.071601437 -0400 +@@ -16,6 +16,10 @@ + #include "ui/events/keycodes/dom/keycode_converter.h" + #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h" + ++#ifndef SW_PEN_INSERTED ++#define SW_PEN_INSERTED 0x0f /* set = pen inserted */ ++#endif ++ + namespace ui { + + namespace { diff --git a/chromium.spec b/chromium.spec index 3286a4ee..5ee28f0e 100644 --- a/chromium.spec +++ b/chromium.spec @@ -314,8 +314,8 @@ Patch80: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/fil 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-90.0.4430.85-epel7-no-kcmp-h.patch +# Work around old and missing headers on EPEL7 +Patch103: chromium-90.0.4430.93-epel7-old-headers-workarounds.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 @@ -944,7 +944,7 @@ udev. %if 0%{?rhel} == 7 # %%patch101 -p1 -b .epel7 # %%patch102 -p1 -b .el7-noexcept -%patch103 -p1 -b .epel7-kcmp +%patch103 -p1 -b .epel7-header-workarounds %patch104 -p1 -b .el7cups %patch108 -p1 -b .el7-old-libdrm %endif