Attachment 125772 Details for Bug 97336 – adjusting two layouts so they will work with a newer xkbcomp

[patch] adjusting two layouts so they will work with a newer xkbcomp

0001-Do-not-specify-the-key.type-where-it-isn-t-needed.patch (text/plain), 2.25 KB, created by Benno Schulenberg on 2016-08-13 20:04:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benno Schulenberg

Created: 2016-08-13 20:04:07 UTC

Size: 2.25 KB

patch

obsolete

>From 3941ecb629c3730d2584d81bd75b69e0eff5dd7f Mon Sep 17 00:00:00 2001
>From: Benno Schulenberg <bensberg@justemail.net>
>Date: Sat, 13 Aug 2016 21:36:26 +0200
>Subject: [PATCH] Do not specify the key.type where it isn't needed.
>
>With a newer xkbcomp, a trailing "any" (NoSymbol) in a key definition is
>taken to mean "none" (VoidSymbol) when the layout specifies the keytype
>explicitly.  Avoid this by not specifying the keytype -- it isn't needed
>when an included file has already defined the relevant number of levels.
>
>This fixes https://bugs.freedesktop.org/show_bug.cgi?id=97332.
>
>Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
>---
> symbols/de | 2 --
> symbols/rs | 6 ------
> 2 files changed, 8 deletions(-)
>
>diff --git a/symbols/de b/symbols/de
>index fe72152..30b23af 100644
>--- a/symbols/de
>+++ b/symbols/de
>@@ -598,8 +598,6 @@ xkb_symbols "ru" {
> 
>     name[Group1]= "Russian (Germany, phonetic)";
> 
>-    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
>-
>     key <LatA> { [        Cyrillic_a,        Cyrillic_A ] };
>     key <LatB> { [       Cyrillic_be,       Cyrillic_BE ] };
>     key <LatW> { [       Cyrillic_ve,       Cyrillic_VE ] };
>diff --git a/symbols/rs b/symbols/rs
>index e164f2e..9b9c74a 100644
>--- a/symbols/rs
>+++ b/symbols/rs
>@@ -50,8 +50,6 @@ xkb_symbols "common" {
>     // "Common" keys: keys that are the same
>     // for both latin and cyrillic keyboards.
> 
>-    key.type[Group1] = "FOUR_LEVEL";
>-
>     key <TLDE> { [ grave,          asciitilde,     any, any ] };
>     key <AE01> { [ 1,              exclam,         any, any ] };
>     key <AE02> { [ 2,              quotedbl,       any, any ] };
>@@ -76,8 +74,6 @@ xkb_symbols "common" {
> hidden partial alphanumeric_keys
> xkb_symbols "cyralpha" {
> 
>-    key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
>-
>     key <AD01> { [ Cyrillic_lje,   Cyrillic_LJE,   any, any ] }; // q
>     key <AD02> { [ Cyrillic_nje,   Cyrillic_NJE,   any, any ] }; // w
>     key <AD03> { [ Cyrillic_ie,    Cyrillic_IE,    any, any ] }; // e
>@@ -117,8 +113,6 @@ xkb_symbols "cyralpha" {
> hidden partial alphanumeric_keys
> xkb_symbols "latalpha" {
> 
>-    key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
>-
>     key <AD11> { [ scaron,         Scaron,         any, any ] }; // [ {
>     key <AD12> { [ dstroke,        Dstroke,        any, any ] }; // ] }
> 
>-- 
>2.9.2
>

Actions: View | Splinter Review

Attachments on bug 97336: 125772 | 125775 | 125776 | 126509

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.