Skip to content

kcms/keyboard: Fix assigning variants to wrong layouts for "extra" rules

Ismael Asensio requested to merge work/iasensio/fix-kbd-layout-variants into master

When processing the xkb_rules files, we cannot assume that the layouts and their corresponding variants will always come in order. Instead find the layout by name before assigning the variant.

This fixes the layout/variant matches defined in *.extras.xml, which are merged later, and provide new variants to layouts that were already

BEFORE AFTER
kbd_layout_bqn-before kbd_layout_us-after
kbd_layout_us-before kbd_layout_bnp-after

BUG: 489975
FIXED-IN: 6.2

Edit: I've actually checked it out and the cherry-pick to 6.1.5 is not clean, so at this point in the calendar I'd leave it just for 6.2

Edited by Ismael Asensio

Merge request reports