From cb2bf1575701c690c59ab79f9ddb37bc9841f9af Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:04:51 +0000
Subject: import xkeyboard-config-2.24-1.el7


---

diff --git a/.gitignore b/.gitignore
index 0f1c81f..3407308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xkeyboard-config-2.20.tar.bz2
+SOURCES/xkeyboard-config-2.24.tar.bz2
diff --git a/.xkeyboard-config.metadata b/.xkeyboard-config.metadata
index ac04c9a..3d6978a 100644
--- a/.xkeyboard-config.metadata
+++ b/.xkeyboard-config.metadata
@@ -1 +1 @@
-fe36dc8259571721776f885ba66060e0b5a0616c SOURCES/xkeyboard-config-2.20.tar.bz2
+2df5b347a4cd9891d2a15fdc4c1734629756a070 SOURCES/xkeyboard-config-2.24.tar.bz2
diff --git a/SOURCES/0001-Revert-Map-evdev-keycode-KEY_KEYBOARD-to-XF86Keyboar.patch b/SOURCES/0001-Revert-Map-evdev-keycode-KEY_KEYBOARD-to-XF86Keyboar.patch
new file mode 100644
index 0000000..a54a3da
--- /dev/null
+++ b/SOURCES/0001-Revert-Map-evdev-keycode-KEY_KEYBOARD-to-XF86Keyboar.patch
@@ -0,0 +1,39 @@
+From b8b0550a6bfb5fdbd90f6d50e4707f5fd50b6ba3 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 6 Jun 2018 12:59:57 +1000
+Subject: [PATCH xkeyboard-config 1/2] Revert "Map evdev keycode KEY_KEYBOARD
+ to XF86Keyboard"
+
+This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d.
+---
+ keycodes/evdev | 1 -
+ symbols/inet   | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/keycodes/evdev b/keycodes/evdev
+index 90b8278..f2630ff 100644
+--- a/keycodes/evdev
++++ b/keycodes/evdev
+@@ -285,7 +285,6 @@ default xkb_keycodes "evdev" {
+ 	<I255> = 255;	// #define KEY_RFKILL              247
+ 
+ 	<I372> = 372;   // #define KEY_FAVORITES           364
+-	<I374> = 374;   // #define KEY_KEYBOARD            366
+ 
+ 	// Fake keycodes for virtual keys
+ 	<LVL3> =   92;
+diff --git a/symbols/inet b/symbols/inet
+index bc4aaa3..5176e52 100644
+--- a/symbols/inet
++++ b/symbols/inet
+@@ -219,7 +219,6 @@ xkb_symbols "evdev" {
+     key <I255>   {      [ XF86RFKill            ]       }; // KEY_RFKILL
+ 
+     key <I372>  {       [ XF86Favorites          ]       };
+-    key <I374>  {       [ XF86Keyboard           ]       };
+ 
+     key <FK13>   {      [ XF86Tools         ]       };
+     key <FK14>   {      [ XF86Launch5       ]       };
+-- 
+2.14.4
+
diff --git a/SOURCES/0002-Revert-Map-evdev-keycode-KEY_FAVORITES-to-XF86Favori.patch b/SOURCES/0002-Revert-Map-evdev-keycode-KEY_FAVORITES-to-XF86Favori.patch
new file mode 100644
index 0000000..dc93a8d
--- /dev/null
+++ b/SOURCES/0002-Revert-Map-evdev-keycode-KEY_FAVORITES-to-XF86Favori.patch
@@ -0,0 +1,41 @@
+From f464bbb2031fa0473d902b58abde7dc3519185d6 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 6 Jun 2018 13:00:02 +1000
+Subject: [PATCH xkeyboard-config 2/2] Revert "Map evdev keycode KEY_FAVORITES
+ to XF86Favorites"
+
+This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd.
+---
+ keycodes/evdev | 2 --
+ symbols/inet   | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/keycodes/evdev b/keycodes/evdev
+index f2630ff..51a6e26 100644
+--- a/keycodes/evdev
++++ b/keycodes/evdev
+@@ -284,8 +284,6 @@ default xkb_keycodes "evdev" {
+ 	<I254> = 254;	// #define KEY_WWAN                246
+ 	<I255> = 255;	// #define KEY_RFKILL              247
+ 
+-	<I372> = 372;   // #define KEY_FAVORITES           364
+-
+ 	// Fake keycodes for virtual keys
+ 	<LVL3> =   92;
+ 	<MDSW> =   203;
+diff --git a/symbols/inet b/symbols/inet
+index 5176e52..2934b65 100644
+--- a/symbols/inet
++++ b/symbols/inet
+@@ -218,8 +218,6 @@ xkb_symbols "evdev" {
+     key <I254>   {      [ XF86WWAN              ]       }; // KEY_WWAN
+     key <I255>   {      [ XF86RFKill            ]       }; // KEY_RFKILL
+ 
+-    key <I372>  {       [ XF86Favorites          ]       };
+-
+     key <FK13>   {      [ XF86Tools         ]       };
+     key <FK14>   {      [ XF86Launch5       ]       };
+     key <FK15>   {      [ XF86Launch6       ]       };
+-- 
+2.14.4
+
diff --git a/SPECS/xkeyboard-config.spec b/SPECS/xkeyboard-config.spec
index c0cd4c1..69437f5 100644
--- a/SPECS/xkeyboard-config.spec
+++ b/SPECS/xkeyboard-config.spec
@@ -6,7 +6,7 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 2.20
+Version: 2.24
 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: User Interface/X
@@ -20,6 +20,9 @@ Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{
 %endif
 
 Patch01: 0001-Revert-rules-Move-Finnish-DAS-layout-to-extras.patch
+# Keycodes > 255 cannot be parsed by xkbcomp < 1.4.0
+Patch02: 0001-Revert-Map-evdev-keycode-KEY_KEYBOARD-to-XF86Keyboar.patch
+Patch03: 0002-Revert-Map-evdev-keycode-KEY_FAVORITES-to-XF86Favori.patch
 
 BuildArch: noarch
 
@@ -111,6 +114,13 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Wed Jun 06 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.24-1
+- xkeyboard-config 2.24 (#1564615)
+- Revert the high-keycode patches to avoid conflicts with xkbcomp < 1.4
+
+* Tue May 15 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.23.1-1
+- xkeyboard-config 2.23.1 (#1564615)
+
 * Wed Feb 08 2017 Peter Hutterer <peter.hutterer@redhat.com> 2.20-1
 - xkeyboard-config 2.20 (#1401753)