diff --git a/backport-Suppress-high-keycode-warnings-at-the-default-warning-level.patch b/backport-Suppress-high-keycode-warnings-at-the-default-warning-level.patch deleted file mode 100644 index ec1907959a0451ce3cc289e3a65e468e6756b459..0000000000000000000000000000000000000000 --- a/backport-Suppress-high-keycode-warnings-at-the-default-warning-level.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1fdbacbe34742328b2a95742982b6017f60a1342 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -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 - -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 diff --git a/setxkbmap-1.3.1.tar.bz2 b/setxkbmap-1.3.1.tar.bz2 deleted file mode 100644 index b8a877e4e31da62862f86e28d4d4ad900b406321..0000000000000000000000000000000000000000 Binary files a/setxkbmap-1.3.1.tar.bz2 and /dev/null differ diff --git a/setxkbmap-1.3.3.tar.gz b/setxkbmap-1.3.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..188aa2db1102a1314c5731fb2722bf2751d1cdff Binary files /dev/null and b/setxkbmap-1.3.3.tar.gz differ diff --git a/xkbcomp-1.4.2.tar.bz2 b/xkbcomp-1.4.2.tar.bz2 deleted file mode 100644 index da9a63b4ff1d0d30d8b60271d4fa9eba26759e0b..0000000000000000000000000000000000000000 Binary files a/xkbcomp-1.4.2.tar.bz2 and /dev/null differ diff --git a/xkbcomp-1.4.5.tar.gz b/xkbcomp-1.4.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a4d370ba3f9565e832d0826f61b9058cbad36df5 Binary files /dev/null and b/xkbcomp-1.4.5.tar.gz differ diff --git a/xkbprint-1.0.4.tar.bz2 b/xkbprint-1.0.4.tar.bz2 deleted file mode 100644 index 80923c2130440d60d0679b05c31a11897f97a155..0000000000000000000000000000000000000000 Binary files a/xkbprint-1.0.4.tar.bz2 and /dev/null differ diff --git a/xkbprint-1.0.6.tar.gz b/xkbprint-1.0.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1dc087ade47bcf5708514d2730d7fe368d1fcbc1 Binary files /dev/null and b/xkbprint-1.0.6.tar.gz differ diff --git a/xkbutils-1.0.4.tar.bz2 b/xkbutils-1.0.4.tar.bz2 deleted file mode 100644 index 99c38904f41351bb3dbddf90f6ed9f9aab867aa9..0000000000000000000000000000000000000000 Binary files a/xkbutils-1.0.4.tar.bz2 and /dev/null differ diff --git a/xkbutils-1.0.5.tar.gz b/xkbutils-1.0.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1686eafb3f846a1bab626b58017d1ce483ed54a1 Binary files /dev/null and b/xkbutils-1.0.5.tar.gz differ diff --git a/xorg-x11-xkb-utils.spec b/xorg-x11-xkb-utils.spec index 43483d4f0def1fffd3ad61d348a4cd5e37d72013..9ad6f890056f9642b4817f0f786e8f144bd53aca 100644 --- a/xorg-x11-xkb-utils.spec +++ b/xorg-x11-xkb-utils.spec @@ -1,25 +1,23 @@ Summary: X.Org X11 xkb utilities Name: xorg-x11-xkb-utils -Version: 7.7 -Release: 30 +Version: 7.8 +Release: 1 License: MIT URL: https://www.x.org -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.2.tar.bz2 +Source0: https://www.x.org/pub/individual/app/setxkbmap-1.3.3.tar.gz +Source1: https://www.x.org/pub/individual/app/xkbcomp-1.4.5.tar.gz 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 +Source3: https://www.x.org/pub/individual/app/xkbprint-1.0.6.tar.gz +Source4: https://www.x.org/pub/individual/app/xkbutils-1.0.5.tar.gz -Patch6000: backport-Suppress-high-keycode-warnings-at-the-default-warning-level.patch +BuildRequires: byacc pkgconfig(x11) pkgconfig(xaw7) pkgconfig(xkbfile) pkgconfig(xorg-macros) >= 1.8 pkgconfig(xt) pkgconfig(xrandr) -BuildRequires: byacc pkgconfig(x11) pkgconfig(xaw7) pkgconfig(xkbfile) pkgconfig(xorg-macros) >= 1.8 pkgconfig(xt) - -Provides: setxkbmap = 1.3.1 -Provides: xkbcomp = 1.4.2 +Provides: setxkbmap = 1.3.3 +Provides: xkbcomp = 1.4.5 Provides: xkbevd = 1.1.4 -Provides: xkbprint = 1.0.4 -Provides: xkbutils = 1.0.4 +Provides: xkbprint = 1.0.6 +Provides: xkbutils = 1.0.5 Provides: xorg-x11-xkb-extras Obsoletes: xorg-x11-xkb-extras @@ -39,9 +37,6 @@ X.Org X11 xkb utilities development files. %prep %setup -q -c xorg-x11-xkb-utils-%{version} -a1 -a2 -a3 -a4 -pushd xkbcomp-* -%patch6000 -p1 -popd %build { @@ -70,8 +65,8 @@ popd } %files -%doc xkbutils-1.0.4/COPYING -%doc xkbutils-1.0.4/README +%doc xkbutils-1.0.5/COPYING +%doc xkbutils-1.0.5/README.md %{_bindir}/xkbbell %{_bindir}/xkbevd %{_bindir}/xkbprint @@ -93,6 +88,12 @@ popd %{_libdir}/pkgconfig/xkbcomp.pc %changelog +* Thu Oct 27 2022 wangkerong - 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 - 7.7-30 - enable patch 6000