[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/data/xkb-data][debian-unstable] Revert d0e5e63c and e6103610

Title: GitLab

Andreas Boll pushed to branch debian-unstable at X Strike Force / data / xkb-data

Commits:

4 changed files:

Changes:

  • debian/changelog
    1 1 
     xkeyboard-config (2.26-2) UNRELEASED; urgency=medium
    2 2
    3 
    -  * Revert ed67b29e (Map evdev keycode KEY_BRIGHTNESS_CYCLE to
    4 
    -    XF86MonBrightnessCycle) (Closes: #921867, #921940, #922020).
    3 
    +  * Revert following commits:
    4 
    +    - ed67b29e (Map evdev keycode KEY_BRIGHTNESS_CYCLE to
    5 
    +      XF86MonBrightnessCycle)
    6 
    +    - d0e5e63c (Map evdev keycode KEY_KEYBOARD to XF86Keyboard)
    7 
    +    - e6103610 (Map evdev keycode KEY_FAVORITES to XF86Favorites)
    8 
    +    (Closes: #921867, #921940, #922020).
    5 9
    6 10 
      -- Andreas Boll <aboll@debian.org>  Mon, 11 Feb 2019 14:14:53 +0100
    7 11

  • debian/patches/revert-Map-evdev-keycode-KEY_FAVORITES.diff
    1 
    +commit 3dd87655fd92a375ada3fc6d8cfe90d431baecaa
    2 
    +Author: Andreas Boll <aboll@debian.org>
    3 
    +Date:   Mon Feb 11 14:55:34 2019 +0100
    4 
    +
    5 
    +    Revert "Map evdev keycode KEY_FAVORITES to XF86Favorites"
    6 
    +
    7 
    +    This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd.
    8 
    +
    9 
    +    This patch breaks keyboard layouts in XWayland applications when having
    10 
    +    several keyboard layouts enabled.
    11 
    +
    12 
    +    See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998
    13 
    +
    14 
    +    Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867
    15 
    +    Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940
    16 
    +    Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020
    17 
    +
    18 
    +    Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump
    19 
    +    dependency on x11-xkb-utils.
    20 
    +
    21 
    +diff --git a/keycodes/evdev b/keycodes/evdev
    22 
    +index f2630ffe..51a6e26d 100644
    23 
    +--- a/keycodes/evdev
    24 
    ++++ b/keycodes/evdev
    25 
    +@@ -284,8 +284,6 @@ default xkb_keycodes "evdev" {
    26 
    + 	<I254> = 254;	// #define KEY_WWAN                246
    27 
    + 	<I255> = 255;	// #define KEY_RFKILL              247
    28 
    +
    29 
    +-	<I372> = 372;   // #define KEY_FAVORITES           364
    30 
    +-
    31 
    + 	// Fake keycodes for virtual keys
    32 
    + 	<LVL3> =   92;
    33 
    + 	<MDSW> =   203;
    34 
    +diff --git a/symbols/inet b/symbols/inet
    35 
    +index 469a7d65..ef0635a7 100644
    36 
    +--- a/symbols/inet
    37 
    ++++ b/symbols/inet
    38 
    +@@ -218,8 +218,6 @@ xkb_symbols "evdev" {
    39 
    +     key <I254>   {      [ XF86WWAN              ]       }; // KEY_WWAN
    40 
    +     key <I255>   {      [ XF86RFKill            ]       }; // KEY_RFKILL
    41 
    +
    42 
    +-    key <I372>  {       [ XF86Favorites          ]       };
    43 
    +-
    44 
    +     key <FK13>   {      [ XF86Tools         ]       };
    45 
    +     key <FK14>   {      [ XF86Launch5       ]       };
    46 
    +     key <FK15>   {      [ XF86Launch6       ]       };

  • debian/patches/revert-Map-evdev-keycode-KEY_KEYBOARD.diff
    1 
    +commit 0ea1d601ee56e1eb81be5f0a740e1380735e11ac
    2 
    +Author: Andreas Boll <aboll@debian.org>
    3 
    +Date:   Mon Feb 11 14:48:08 2019 +0100
    4 
    +
    5 
    +    Revert "Map evdev keycode KEY_KEYBOARD to XF86Keyboard"
    6 
    +
    7 
    +    This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d.
    8 
    +
    9 
    +    This patch breaks keyboard layouts in XWayland applications when having several
    10 
    +    keyboard layouts enabled.
    11 
    +
    12 
    +    See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998
    13 
    +
    14 
    +    Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867
    15 
    +    Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940
    16 
    +    Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020
    17 
    +
    18 
    +    Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump
    19 
    +    dependency on x11-xkb-utils.
    20 
    +
    21 
    +diff --git a/keycodes/evdev b/keycodes/evdev
    22 
    +index 90b8278d..f2630ffe 100644
    23 
    +--- a/keycodes/evdev
    24 
    ++++ b/keycodes/evdev
    25 
    +@@ -285,7 +285,6 @@ default xkb_keycodes "evdev" {
    26 
    + 	<I255> = 255;	// #define KEY_RFKILL              247
    27 
    +
    28 
    + 	<I372> = 372;   // #define KEY_FAVORITES           364
    29 
    +-	<I374> = 374;   // #define KEY_KEYBOARD            366
    30 
    +
    31 
    + 	// Fake keycodes for virtual keys
    32 
    + 	<LVL3> =   92;
    33 
    +diff --git a/symbols/inet b/symbols/inet
    34 
    +index 4d774fac..469a7d65 100644
    35 
    +--- a/symbols/inet
    36 
    ++++ b/symbols/inet
    37 
    +@@ -219,7 +219,6 @@ xkb_symbols "evdev" {
    38 
    +     key <I255>   {      [ XF86RFKill            ]       }; // KEY_RFKILL
    39 
    +
    40 
    +     key <I372>  {       [ XF86Favorites          ]       };
    41 
    +-    key <I374>  {       [ XF86Keyboard           ]       };
    42 
    +
    43 
    +     key <FK13>   {      [ XF86Tools         ]       };
    44 
    +     key <FK14>   {      [ XF86Launch5       ]       };

  • debian/patches/series
    1 1 
     docs.diff
    2 2 
     revert-goodmap-badmap-for-apple.diff
    3 3 
     revert-Map-evdev-keycode-KEY_BRIGHTNESS_CYCLE.diff
    4 
    +revert-Map-evdev-keycode-KEY_KEYBOARD.diff
    5 
    +revert-Map-evdev-keycode-KEY_FAVORITES.diff

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: