backport-Suppress-high-keycode-warnings-at-the-default-warning-level.patch

@@ -0,0 +1,40 @@
+From 1fdbacbe34742328b2a95742982b6017f60a1342 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 17 Oct 2018 11:44:37 -0400
+Subject: [PATCH] Suppress high-keycode warnings at the default warning level
+
+We expect evdev to have keycodes above 255, there's no reason to warn
+about this.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+Conflict:NA
+Reference:https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/commit/1fdbacbe34742328b2a95742982b6017f60a1342
+---
+ keycodes.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/keycodes.c b/keycodes.c
+index c21f7c4..425ba10 100644
+--- a/keycodes.c
++++ b/keycodes.c
+@@ -332,7 +332,7 @@ AddKeyName(KeyNamesInfo * info,
+ 
+     if ((kc < info->effectiveMin) || (kc > info->effectiveMax))
+     {
+-        if (!high_keycode_warned)
++        if (!high_keycode_warned && warningLevel > 1)
+         {
+             WARN2("Unsupported high keycode %d for name <%s> ignored\n",
+                   kc, name);
+@@ -596,7 +596,7 @@ HandleKeycodeDef(KeycodeDef * stmt, unsigned merge, KeyNamesInfo * info)
+     code = result.ival;
+     if ((code < info->effectiveMin) || (code > info->effectiveMax))
+     {
+-        if (!high_keycode_warned)
++        if (!high_keycode_warned && warningLevel > 1)
+         {
+             WARN2("Unsupported high keycode %d for name <%s> ignored\n",
+                   code, stmt->name);
+-- 
+GitLab

xorg-x11-xkb-utils.spec

@@ -1,17 +1,28 @@
 Summary:    X.Org X11 xkb utilities
 Name:       xorg-x11-xkb-utils
-Version:    7.8
+Version:    7.7
-Release:    4
+Release:    29
 License:    MIT
 URL:        https://www.x.org
 
-Source0:    https://www.x.org/pub/individual/app/setxkbmap-1.3.3.tar.gz
+Source0:    https://www.x.org/pub/individual/app/setxkbmap-1.3.1.tar.bz2
-Source1:    https://www.x.org/pub/individual/app/xkbcomp-1.4.5.tar.gz
+Source1:    https://www.x.org/pub/individual/app/xkbcomp-1.4.2.tar.bz2
+Source2:    https://www.x.org/pub/individual/app/xkbevd-1.1.4.tar.bz2
+Source3:    https://www.x.org/pub/individual/app/xkbprint-1.0.4.tar.bz2
+Source4:    https://www.x.org/pub/individual/app/xkbutils-1.0.4.tar.bz2
 
-BuildRequires:  byacc pkgconfig(x11) pkgconfig(xkbfile) pkgconfig(xorg-macros) >= 1.8 pkgconfig(xrandr)
+Patch6000:  backport-Suppress-high-keycode-warnings-at-the-default-warning-level.patch
 
-Provides:   setxkbmap = 1.3.3
+BuildRequires:  byacc pkgconfig(x11) pkgconfig(xaw7) pkgconfig(xkbfile) pkgconfig(xorg-macros) >= 1.8 pkgconfig(xt)
-Provides:   xkbcomp = 1.4.5
+
+Provides:   setxkbmap = 1.3.1
+Provides:   xkbcomp = 1.4.2
+Provides:   xkbevd = 1.1.4
+Provides:   xkbprint = 1.0.4
+Provides:   xkbutils = 1.0.4
+Provides:   xorg-x11-xkb-extras
+
+Obsoletes:  xorg-x11-xkb-extras
 
 %description
 X.Org X11 xkb core utilities.
@@ -27,7 +38,7 @@ Requires:   xkbcomp
 X.Org X11 xkb utilities development files.
 
 %prep
-%setup -q -c xorg-x11-xkb-utils-%{version} -a1
+%setup -q -c xorg-x11-xkb-utils-%{version} -a1 -a2 -a3 -a4
 
 %build
 {
@@ -56,35 +67,29 @@ X.Org X11 xkb utilities development files.
 }
 
 %files
+%doc xkbutils-1.0.4/COPYING
+%doc xkbutils-1.0.4/README
+%{_bindir}/xkbbell
+%{_bindir}/xkbevd
+%{_bindir}/xkbprint
+%{_bindir}/xkbvleds
+%{_bindir}/xkbwatch
 %{_bindir}/setxkbmap
 %{_bindir}/xkbcomp
 
 %files help
 %{_mandir}/man1/setxkbmap.1*
 %{_mandir}/man1/xkbcomp.1*
+%{_mandir}/man1/xkbbell.1*
+%{_mandir}/man1/xkbevd.1*
+%{_mandir}/man1/xkbprint.1*
+%{_mandir}/man1/xkbvleds.*
+%{_mandir}/man1/xkbwatch.*
 
 %files devel
 %{_libdir}/pkgconfig/xkbcomp.pc
 
 %changelog
-* Tue Dec 24 2024 lingsheng <lingsheng1@h-partners.com> - 7.8-4
-- Remove xorg-x11-xkb-extras
-
-* Thu Dec 12 2024 lingsheng <lingsheng1@h-partners.com> - 7.8-3
-- Remove the unused xkbevd xkbprint xkbutils
-
-* Thu Aug 01 2024 lingsheng <lingsheng1@h-partners.com> - 7.8-2
-- Add version for provides and obsoletes
-
-* Thu Oct 27 2022 wangkerong <wangkerong@h-partners.com> - 7.8-1
-- upgrade to setxkbmap-1.3.3
-- upgrade to xkbcomp-1.4.5
-- upgrade to xkbprint-1.0.6
-- upgrade to xkbutils-1.0.5
-
-* Wed Apr 13 2022 xingxing <xingxing9@h-partners.com> - 7.7-30
-- enable patch 6000
-
 * Mon Apr 11 2022 xingxing <xingxing9@h-partners.com> - 7.7-29
 - Type:bugfix
 - CVE:NA