import xorg-x11-xkb-utils-7.7-28.el8

4 years ago · 9e005cc707
commit 9e005cc707
5 changed files with 313 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,5 @@
+SOURCES/setxkbmap-1.3.1.tar.bz2
+SOURCES/xkbcomp-1.4.2.tar.bz2
+SOURCES/xkbevd-1.1.4.tar.bz2
+SOURCES/xkbprint-1.0.4.tar.bz2
+SOURCES/xkbutils-1.0.4.tar.bz2
--- a/.xorg-x11-xkb-utils.metadata
+++ b/.xorg-x11-xkb-utils.metadata
@ -0,0 +1,5 @@
+560a02cf6f7db1f79739a4f2bd4f8050c7eb6f43 SOURCES/setxkbmap-1.3.1.tar.bz2
+9a39cf7a562c152465e04fc7cf1002c59f883870 SOURCES/xkbcomp-1.4.2.tar.bz2
+629fea940692f9d971dfae36cd697b13337caaba SOURCES/xkbevd-1.1.4.tar.bz2
+c0c1e71a32f7d8bfc40539e7f315ca7e02d99205 SOURCES/xkbprint-1.0.4.tar.bz2
+b09aef7cc3853eb12dbda332f55adec3add4447b SOURCES/xkbutils-1.0.4.tar.bz2
--- a/SOURCES/0001-Don-t-pretend-unresolved-symbols-are-an-error.patch
+++ b/SOURCES/0001-Don-t-pretend-unresolved-symbols-are-an-error.patch
@ -0,0 +1,31 @@
+From c8cfca25ab2ed65013448f7502bae933c66390ae Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 5 Jun 2020 14:23:09 +1000
+Subject: [PATCH xkbcomp] Don't pretend unresolved symbols are an error
+
+Whenever xkeyboard-config is newer than xorgproto, or libX11 just hasn't yet
+been rebuilt against the protocol we end up with some unresolved symbols.
+That's not an error, it just happens. Let's downgrade this to a warning
+instead.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ symbols.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/symbols.c b/symbols.c
+index 3fe0195..ece1caa 100644
+--- a/symbols.c
+++ b/symbols.c
+@@ -968,7 +968,7 @@ AddSymbolsToKey(KeyInfo * key,
+     key->symsDefined |= (1 << ndx);
+     for (i = 0; i < nSyms; i++) {
+         if (!LookupKeysym(value->value.list.syms[i], &key->syms[ndx][i])) {
+-            WSGO1("Could not resolve keysym %s\n", value->value.list.syms[i]);
+            WARN2("Could not resolve keysym %s\n", value->value.list.syms[i]);
+             key->syms[ndx][i] = NoSymbol;
+         }
+     }
+-- 
+2.26.2
+
--- a/SOURCES/0001-Suppress-high-keycode-warnings-at-the-default-warnin.patch
+++ b/SOURCES/0001-Suppress-high-keycode-warnings-at-the-default-warnin.patch
@ -0,0 +1,38 @@
+From c674b2152e5530fd4601d32f2cb5f455e7ef4809 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>
+---
+ 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);
+-- 
+2.19.0
+
--- a/SPECS/xorg-x11-xkb-utils.spec
+++ b/SPECS/xorg-x11-xkb-utils.spec
@ -0,0 +1,234 @@
+# Component versions
+%global setxkbmap 1.3.1
+%global xkbcomp 1.4.2
+%global xkbevd 1.1.4
+%global xkbprint 1.0.4
+%global xkbutils 1.0.4
+
+Summary:    X.Org X11 xkb utilities
+Name:       xorg-x11-xkb-utils
+Version:    7.7
+Release:    28%{?dist}
+License:    MIT
+URL:        https://www.x.org
+
+Source0:    https://www.x.org/pub/individual/app/setxkbmap-%{setxkbmap}.tar.bz2
+Source1:    https://www.x.org/pub/individual/app/xkbcomp-%{xkbcomp}.tar.bz2
+Source2:    https://www.x.org/pub/individual/app/xkbevd-%{xkbevd}.tar.bz2
+Source3:    https://www.x.org/pub/individual/app/xkbprint-%{xkbprint}.tar.bz2
+Source4:    https://www.x.org/pub/individual/app/xkbutils-%{xkbutils}.tar.bz2
+
+Patch0: 0001-Suppress-high-keycode-warnings-at-the-default-warnin.patch
+Patch1: 0001-Don-t-pretend-unresolved-symbols-are-an-error.patch
+
+BuildRequires:  byacc
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xaw7)
+BuildRequires:  pkgconfig(xkbfile)
+BuildRequires:  pkgconfig(xorg-macros) >= 1.8
+BuildRequires:  pkgconfig(xt)
+
+Provides:   setxkbmap = %{setxkbmap}
+Provides:   xkbcomp = %{xkbcomp}
+
+%description
+X.Org X11 xkb core utilities.
+
+%package devel
+Summary:    X.Org X11 xkb utilities development package
+Requires:   pkgconfig
+Requires:   xkbcomp
+
+%description devel
+X.Org X11 xkb utilities development files.
+
+%package -n xorg-x11-xkb-extras
+Summary:    X.Org X11 xkb gadgets
+Provides:   xkbevd = %{xkbevd}
+Provides:   xkbprint = %{xkbprint}
+Provides:   xkbutils = %{xkbutils}
+
+%description -n xorg-x11-xkb-extras
+X.Org X11 xkb gadgets.
+
+%prep
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
+pushd xkbcomp-*
+%patch0 -p1
+%patch1 -p1
+popd
+
+%build
+# Build all apps
+{
+    for app in * ; do
+        pushd $app
+            case $app in
+                xkbcomp-*)
+                    rm xkbparse.c # force regen
+                    ;;
+                *)
+                    ;;
+            esac
+            %configure
+            make %{?_smp_mflags}
+        popd
+    done
+}
+
+%install
+# Install all apps
+{
+    for app in * ; do
+        pushd $app
+            %make_install
+        popd
+    done
+}
+
+%files
+%{_bindir}/setxkbmap
+%{_bindir}/xkbcomp
+%{_mandir}/man1/setxkbmap.1*
+%{_mandir}/man1/xkbcomp.1*
+
+%files -n xorg-x11-xkb-extras
+%doc xkbutils-%{xkbutils}/COPYING
+%doc xkbutils-%{xkbutils}/README
+%{_bindir}/xkbbell
+%{_bindir}/xkbevd
+%{_bindir}/xkbprint
+%{_bindir}/xkbvleds
+%{_bindir}/xkbwatch
+%{_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
+* Mon Jun 08 2020 Peter Hutterer <peter.hutterer@redhat.com> 7.7-28
+- Downgrade errors about unresolved keysyms to warnings (#1780463)
+
+* Wed Oct 17 2018 Adam Jackson <ajax@redhat.com> - 7.7-27
+- Suppress high-keycode warnings from xkbcomp
+
+* Fri Jun 22 2018 Peter Hutterer <peter.hutterer@redhat.com> 7.7-26
+- xkbcomp 1.4.2
+
+* Thu Jun 07 2018 Peter Hutterer <peter.hutterer@redhat.com> 7.7-25
+- Ignore maximum keycode range greater than 255 (#1587998)
+
+* Tue Mar 13 2018 Adam Jackson <ajax@redhat.com> - 7.7-24
+- Make -devel Require the base package, so the pc file will point to an
+  xkbcomp that actually exists.
+
+* Thu Mar 01 2018 Adam Jackson <ajax@redhat.com> - 7.7-23
+- xkbcomp 1.4.1
+- https URLs
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jun 22 2017 Peter Hutterer <peter.hutterer@redhat.com> 7.7-19
+- xkbcomp 1.4.0 (#1463366)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jan 20 2016 Peter Hutterer <peter.hutterer@redhat.com>
+- s/define/global/
+
+* Thu Nov 05 2015 Peter Hutterer <peter.hutterer@redhat.com> 7.7-16
+- xkbcomp 1.3.1 (#1010592)
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Apr 30 2015 Simone Caronni <negativo17@gmail.com> - 7.7-14
+- setxkbmap 1.3.1
+- xkbevd 1.1.4
+- xkbprint 1.0.4
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 7.7-13
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Fri Nov 21 2014 Peter Hutterer <peter.hutterer@redhat.com> 7.7-12
+- xkbcomp 1.3.0
+
+* Fri Nov 07 2014 Simone Caronni <negativo17@gmail.com> - 7.7-11
+- Clean up SPEC file, build all components like other x11 packages.
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue May 21 2013 Peter Hutterer <peter.hutterer@redhat.com> 7.7-7
+- Apply the patch this time...
+
+* Tue May 21 2013 Peter Hutterer <peter.hutterer@redhat.com> 7.7-6
+- Add missing options to xkbcomp man page (#948842)
+
+* Mon Feb 11 2013 Peter Hutterer <peter.hutterer@redhat.com> 7.7-5
+- xkbutils 1.0.4
+
+* Tue Nov 13 2012 Peter Hutterer <peter.hutterer@redhat.com> 7.7-4
+- xkbcomp: Fix generation of XKB directory listing, missing reset on file
+  handler caused parse errors and incomplete directory listings
+
+* Tue Aug 28 2012 Peter Hutterer <peter.hutterer@redhat.com> 7.7-2
+- Remove duplicate sources
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jun 20 2012 Peter Hutterer <peter.hutterer@redhat.com> 7.7-1
+- X11R7.7 updates:
+- xkbcomp 1.2.4
+- setxkbmap 1.3.0
+- xkbevd 1.1.3
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Jun 22 2011 Peter Hutterer <peter.hutterer@redhat.com> 7.5-5
+- xkbcomp 1.2.3
+
+* Fri Feb 11 2011 Peter Hutterer <peter.hutterer@redhat.com> 7.5-4
+- xkbcomp 1.2.1
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 10 2011 Peter Hutterer <peter.hutterer@redhat.com> 7.5-2
+- xkbprint-1.0.3
+
+* Mon Nov 01 2010 Peter Hutterer <peter.hutterer@redhat.com> 7.5-1
+- setxkbmap 1.2.0
+- xkbcomp 1.2.0
+- xkbutils 1.0.3
+- xkbevd 1.1.1
+
+* Mon Oct 11 2010 Peter Hutterer <peter.hutterer@redhat.com> 7.4-9
+- xkbcomp-hex-parsing.patch: fix up parsing of hex-code symbols (#638244)
+
+* Thu Jul 08 2010 Adam Jackson <ajax@redhat.com> 7.4-8
+- xkbcomp-speed.patch: Backport performance changes from git master.