kbd: add upstream patch to fix loading some keymaps (fr-latin9).
This commit is contained in:
parent
874184dd0a
commit
5c8060a7d2
2 changed files with 48 additions and 1 deletions
47
srcpkgs/kbd/patches/fix-keymap-loading-1.15.5.patch
Normal file
47
srcpkgs/kbd/patches/fix-keymap-loading-1.15.5.patch
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
commit 7e06e56157e8431d02e1377cdc44230944203d88
|
||||||
|
Author: Alexey Gladkov <gladkov.alexey@gmail.com>
|
||||||
|
Date: Tue Dec 11 14:24:44 2012 +0400
|
||||||
|
|
||||||
|
Fix regression in 16117ce6ab
|
||||||
|
|
||||||
|
Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
|
||||||
|
|
||||||
|
diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
|
||||||
|
index c18dcea..f817c78 100644
|
||||||
|
--- src/loadkeys.analyze.l
|
||||||
|
+++ src/loadkeys.analyze.l
|
||||||
|
@@ -307,8 +307,10 @@ To to|To|TO
|
||||||
|
char *s = xstrndup(yytext+1, strlen(yytext)-2);
|
||||||
|
/* use static pathname to store *s ? */
|
||||||
|
open_include(s);
|
||||||
|
- yy_pop_state();
|
||||||
|
- state_ptr--;
|
||||||
|
+ while (state_ptr > 0) {
|
||||||
|
+ yy_pop_state();
|
||||||
|
+ state_ptr--;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
<INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol} {
|
||||||
|
yyerror(_("expected filename between quotes"));
|
||||||
|
@@ -323,7 +325,7 @@ To to|To|TO
|
||||||
|
}
|
||||||
|
{Eol} {
|
||||||
|
line_nr++;
|
||||||
|
- if (state_ptr > 0) {
|
||||||
|
+ while (state_ptr > 0) {
|
||||||
|
yy_pop_state();
|
||||||
|
state_ptr--;
|
||||||
|
}
|
||||||
|
@@ -428,8 +430,10 @@ To to|To|TO
|
||||||
|
}
|
||||||
|
<STR>\" {
|
||||||
|
*p = '\0';
|
||||||
|
- yy_pop_state();
|
||||||
|
- state_ptr--;
|
||||||
|
+ while (state_ptr > 0) {
|
||||||
|
+ yy_pop_state();
|
||||||
|
+ state_ptr--;
|
||||||
|
+ }
|
||||||
|
return(STRLITERAL);
|
||||||
|
}
|
||||||
|
. {
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'kbd'
|
# Template file for 'kbd'
|
||||||
pkgname=kbd
|
pkgname=kbd
|
||||||
version=1.15.5
|
version=1.15.5
|
||||||
revision=2
|
revision=3
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale"
|
configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale"
|
||||||
hostmakedepends="flex"
|
hostmakedepends="flex"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue