Date: Wednesday, January 16, 2013 @ 13:18:31
Author: tpowa
Revision: 175211
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kbd/repos/testing-i686/
kbd/repos/testing-i686/PKGBUILD
(from rev 175210, kbd/trunk/PKGBUILD)
kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch
(from rev 175210, kbd/trunk/fix-keymap-loading-1.15.5.patch)
kbd/repos/testing-x86_64/
kbd/repos/testing-x86_64/PKGBUILD
(from rev 175210, kbd/trunk/PKGBUILD)
kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 175210, kbd/trunk/fix-keymap-loading-1.15.5.patch)
------------------------------------------------+
testing-i686/PKGBUILD | 42 ++++++++++++++++++++
testing-i686/fix-keymap-loading-1.15.5.patch | 47 +++++++++++++++++++++++
testing-x86_64/PKGBUILD | 42 ++++++++++++++++++++
testing-x86_64/fix-keymap-loading-1.15.5.patch | 47 +++++++++++++++++++++++
4 files changed, 178 insertions(+)
Copied: kbd/repos/testing-i686/PKGBUILD (from rev 175210, kbd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-01-16 18:18:31 UTC (rev 175211)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Tobias Powalowski <[email protected]>
+
+pkgname=kbd
+pkgver=1.15.5
+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
+ 'fix-keymap-loading-1.15.5.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+ '4362091d5e23bab2d158f8c7693a45d8')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ # rename keymap files with the same names
+ # this is needed because when only name of keymap is specified
+ # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+ # this should be removed when upstream adopts the change
+ mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+ mv data/keymaps/i386/olpc/es{,-olpc}.map
+ mv data/keymaps/i386/olpc/pt{,-olpc}.map
+ 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
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}
Copied: kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch (from rev
175210, kbd/trunk/fix-keymap-loading-1.15.5.patch)
===================================================================
--- testing-i686/fix-keymap-loading-1.15.5.patch
(rev 0)
+++ testing-i686/fix-keymap-loading-1.15.5.patch 2013-01-16 18:18:31 UTC
(rev 175211)
@@ -0,0 +1,47 @@
+commit 7e06e56157e8431d02e1377cdc44230944203d88
+Author: Alexey Gladkov <[email protected]>
+Date: Tue Dec 11 14:24:44 2012 +0400
+
+ Fix regression in 16117ce6ab
+
+ Signed-off-by: Alexey Gladkov <[email protected]>
+
+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);
+ }
+ . {
Copied: kbd/repos/testing-x86_64/PKGBUILD (from rev 175210, kbd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-01-16 18:18:31 UTC (rev 175211)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Tobias Powalowski <[email protected]>
+
+pkgname=kbd
+pkgver=1.15.5
+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
+ 'fix-keymap-loading-1.15.5.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+ '4362091d5e23bab2d158f8c7693a45d8')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ # rename keymap files with the same names
+ # this is needed because when only name of keymap is specified
+ # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+ # this should be removed when upstream adopts the change
+ mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+ mv data/keymaps/i386/olpc/es{,-olpc}.map
+ mv data/keymaps/i386/olpc/pt{,-olpc}.map
+ 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
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}
Copied: kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch (from rev
175210, kbd/trunk/fix-keymap-loading-1.15.5.patch)
===================================================================
--- testing-x86_64/fix-keymap-loading-1.15.5.patch
(rev 0)
+++ testing-x86_64/fix-keymap-loading-1.15.5.patch 2013-01-16 18:18:31 UTC
(rev 175211)
@@ -0,0 +1,47 @@
+commit 7e06e56157e8431d02e1377cdc44230944203d88
+Author: Alexey Gladkov <[email protected]>
+Date: Tue Dec 11 14:24:44 2012 +0400
+
+ Fix regression in 16117ce6ab
+
+ Signed-off-by: Alexey Gladkov <[email protected]>
+
+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);
+ }
+ . {
