From 5758fe2188631d87013e6f60c9c681bb3f953a71 Mon Sep 17 00:00:00 2001 From: Liu Zixian Date: Mon, 17 Oct 2022 09:26:32 +0800 Subject: [PATCH] sync openEuler kernel 22.03 and enable regression test --- ...lude-sync-key-codes-with-kernel-5.17.patch | 28 +++++++++++++++++++ libevdev.spec | 11 ++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 backport-include-sync-key-codes-with-kernel-5.17.patch diff --git a/backport-include-sync-key-codes-with-kernel-5.17.patch b/backport-include-sync-key-codes-with-kernel-5.17.patch new file mode 100644 index 0000000..6b15d66 --- /dev/null +++ b/backport-include-sync-key-codes-with-kernel-5.17.patch @@ -0,0 +1,28 @@ +From 714895f990ee7e90a6548181909b3fe5749e4a11 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 22 Mar 2022 12:33:16 +1000 +Subject: [PATCH] include: sync key codes with kernel 5.17 + +Signed-off-by: Peter Hutterer +Signed-off-by: Liu Zixian +--- + include/linux/linux/input-event-codes.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/linux/linux/input-event-codes.h b/include/linux/linux/input-event-codes.h +index ee93428..62e9f0a 100644 +--- a/include/linux/linux/input-event-codes.h ++++ b/include/linux/linux/input-event-codes.h +@@ -278,7 +278,8 @@ + #define KEY_PAUSECD 201 + #define KEY_PROG3 202 + #define KEY_PROG4 203 +-#define KEY_DASHBOARD 204 /* AL Dashboard */ ++#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ ++#define KEY_DASHBOARD KEY_ALL_APPLICATIONS + #define KEY_SUSPEND 205 + #define KEY_CLOSE 206 /* AC Close */ + #define KEY_PLAY 207 +-- +2.36.1 + diff --git a/libevdev.spec b/libevdev.spec index b13806c..273750d 100644 --- a/libevdev.spec +++ b/libevdev.spec @@ -1,12 +1,13 @@ Name: libevdev Version: 1.11.0 -Release: 2 +Release: 3 Summary: Library for handling evdev kernel devices License: MIT URL: http://www.freedesktop.org/wiki/Software/libevdev Source0: http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz +Patch0: backport-include-sync-key-codes-with-kernel-5.17.patch -BuildRequires: git-core automake libtool gcc python3 python3-devel +BuildRequires: git-core automake libtool gcc python3 python3-devel check-devel %description Library for handling evdev kernel devices. It abstracts the ioctls @@ -45,6 +46,9 @@ make %{?_smp_mflags} %ldconfig_scriptlets +%check +make check + %files %doc COPYING %{_libdir}/libevdev.so.* @@ -68,6 +72,9 @@ make %{?_smp_mflags} %{_mandir}/man1/touchpad-edge-detector.1* %changelog +* Sun Oct 16 2022 Liu Zixian - 1.11.0-3 +- sync openEuler kernel 22.03 and enable regression test + * Wed Dec 1 2021 zhouwenpei - 1.11.0-2 - fix license in src and in spec are not same