Andreas Boll pushed to branch debian-unstable at X Strike Force / data / xkb-data
Commits: b5f375a6 by Andreas Boll at 2019-02-11T14:13:49Z Revert d0e5e63c and e6103610 - - - - - 4 changed files: - debian/changelog - + debian/patches/revert-Map-evdev-keycode-KEY_FAVORITES.diff - + debian/patches/revert-Map-evdev-keycode-KEY_KEYBOARD.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,7 +1,11 @@ xkeyboard-config (2.26-2) UNRELEASED; urgency=medium - * Revert ed67b29e (Map evdev keycode KEY_BRIGHTNESS_CYCLE to - XF86MonBrightnessCycle) (Closes: #921867, #921940, #922020). + * Revert following commits: + - ed67b29e (Map evdev keycode KEY_BRIGHTNESS_CYCLE to + XF86MonBrightnessCycle) + - d0e5e63c (Map evdev keycode KEY_KEYBOARD to XF86Keyboard) + - e6103610 (Map evdev keycode KEY_FAVORITES to XF86Favorites) + (Closes: #921867, #921940, #922020). -- Andreas Boll <ab...@debian.org> Mon, 11 Feb 2019 14:14:53 +0100 ===================================== debian/patches/revert-Map-evdev-keycode-KEY_FAVORITES.diff ===================================== @@ -0,0 +1,46 @@ +commit 3dd87655fd92a375ada3fc6d8cfe90d431baecaa +Author: Andreas Boll <ab...@debian.org> +Date: Mon Feb 11 14:55:34 2019 +0100 + + Revert "Map evdev keycode KEY_FAVORITES to XF86Favorites" + + This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd. + + This patch breaks keyboard layouts in XWayland applications when having + several keyboard layouts enabled. + + See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998 + + Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 + Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 + Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 + + Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump + dependency on x11-xkb-utils. + +diff --git a/keycodes/evdev b/keycodes/evdev +index f2630ffe..51a6e26d 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 469a7d65..ef0635a7 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 ] }; ===================================== debian/patches/revert-Map-evdev-keycode-KEY_KEYBOARD.diff ===================================== @@ -0,0 +1,44 @@ +commit 0ea1d601ee56e1eb81be5f0a740e1380735e11ac +Author: Andreas Boll <ab...@debian.org> +Date: Mon Feb 11 14:48:08 2019 +0100 + + Revert "Map evdev keycode KEY_KEYBOARD to XF86Keyboard" + + This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d. + + This patch breaks keyboard layouts in XWayland applications when having several + keyboard layouts enabled. + + See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998 + + Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 + Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 + Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 + + Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump + dependency on x11-xkb-utils. + +diff --git a/keycodes/evdev b/keycodes/evdev +index 90b8278d..f2630ffe 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 4d774fac..469a7d65 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 ] }; ===================================== debian/patches/series ===================================== @@ -1,3 +1,5 @@ docs.diff revert-goodmap-badmap-for-apple.diff revert-Map-evdev-keycode-KEY_BRIGHTNESS_CYCLE.diff +revert-Map-evdev-keycode-KEY_KEYBOARD.diff +revert-Map-evdev-keycode-KEY_FAVORITES.diff View it on GitLab: https://salsa.debian.org/xorg-team/data/xkb-data/commit/b5f375a6e42d7aea2687914ec69d4cae8866731b -- View it on GitLab: https://salsa.debian.org/xorg-team/data/xkb-data/commit/b5f375a6e42d7aea2687914ec69d4cae8866731b You're receiving this email because of your account on salsa.debian.org.
