[arch-commits] Commit in kbd/trunk (PKGBUILD fix-keymap-loading-1.15.5.patch)

[Tobias Powalowski]

    Date: Wednesday, January 16, 2013 @ 13:18:07
  Author: tpowa
Revision: 175210

upgpkg: kbd 1.15.5-3

fix keymap loading

Added:
  kbd/trunk/fix-keymap-loading-1.15.5.patch
Modified:
  kbd/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   12 ++++++---
 fix-keymap-loading-1.15.5.patch |   47 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-16 17:39:36 UTC (rev 175209)
+++ PKGBUILD	2013-01-16 18:18:07 UTC (rev 175210)
@@ -3,17 +3,19 @@
 
 pkgname=kbd
 pkgver=1.15.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64')
 url="http://www.kbd-project.org"
 license=('GPL')
 depends=('glibc' 'pam')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz)
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+        'fix-keymap-loading-1.15.5.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
-md5sums=('34c71feead8ab9c01ec638acea8cd877')
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+         '4362091d5e23bab2d158f8c7693a45d8')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -27,7 +29,9 @@
   mv data/keymaps/i386/dvorak/no{,-dvorak}.map
   mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
   mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
-
+  # fix https://bugs.archlinux.org/task/33308
+  # keymap loading is broken for cetain keymaps
+  patch -Np1 -i ../fix-keymap-loading-1.15.5.patch
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
 }

Added: fix-keymap-loading-1.15.5.patch
===================================================================
--- fix-keymap-loading-1.15.5.patch	                        (rev 0)
+++ fix-keymap-loading-1.15.5.patch	2013-01-16 18:18:07 UTC (rev 175210)
@@ -0,0 +1,47 @@
+commit 7e06e56157e8431d02e1377cdc44230944203d88
+Author: Alexey Gladkov <gladkov.alexey at gmail.com>
+Date:   Tue Dec 11 14:24:44 2012 +0400
+
+    Fix regression in 16117ce6ab
+    
+    Signed-off-by: Alexey Gladkov <gladkov.alexey at gmail.com>
+
+diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
+index c18dcea..f817c78 100644
+--- a/src/loadkeys.analyze.l
++++ b/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);
+ 			}
+ .			{