Date: Tuesday, July 14, 2015 @ 08:00:27
Author: tpowa
Revision: 242188
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kbd/repos/testing-i686/
kbd/repos/testing-i686/PKGBUILD
(from rev 242187, kbd/trunk/PKGBUILD)
kbd/repos/testing-i686/fix-dvorak-es.patch
(from rev 242187, kbd/trunk/fix-dvorak-es.patch)
kbd/repos/testing-i686/fix-euro2.patch
(from rev 242187, kbd/trunk/fix-euro2.patch)
kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch
(from rev 242187, kbd/trunk/fix-keymap-loading-1.15.5.patch)
kbd/repos/testing-x86_64/
kbd/repos/testing-x86_64/PKGBUILD
(from rev 242187, kbd/trunk/PKGBUILD)
kbd/repos/testing-x86_64/fix-dvorak-es.patch
(from rev 242187, kbd/trunk/fix-dvorak-es.patch)
kbd/repos/testing-x86_64/fix-euro2.patch
(from rev 242187, kbd/trunk/fix-euro2.patch)
kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 242187, kbd/trunk/fix-keymap-loading-1.15.5.patch)
------------------------------------------------+
testing-i686/PKGBUILD | 46 ++++++++++++++++++++++
testing-i686/fix-dvorak-es.patch | 11 +++++
testing-i686/fix-euro2.patch | 9 ++++
testing-i686/fix-keymap-loading-1.15.5.patch | 47 +++++++++++++++++++++++
testing-x86_64/PKGBUILD | 46 ++++++++++++++++++++++
testing-x86_64/fix-dvorak-es.patch | 11 +++++
testing-x86_64/fix-euro2.patch | 9 ++++
testing-x86_64/fix-keymap-loading-1.15.5.patch | 47 +++++++++++++++++++++++
8 files changed, 226 insertions(+)
Copied: kbd/repos/testing-i686/PKGBUILD (from rev 242187, kbd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=kbd
+pkgver=2.0.3
+pkgrel=1
+pkgdesc="Keytable files and keyboard utilities"
+arch=('i686' 'x86_64')
+url="http://www.kbd-project.org";
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+ 'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('d636ee56f35233b5cd6f855c08372489'
+ 'd869200acbc0aab6a9cafa43cb140d4e')
+
+prepare() {
+ 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 euro2 #28213
+ patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./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-dvorak-es.patch (from rev 242187,
kbd/trunk/fix-dvorak-es.patch)
===================================================================
--- testing-i686/fix-dvorak-es.patch (rev 0)
+++ testing-i686/fix-dvorak-es.patch 2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old 2013-05-08
14:58:03.393349828 +0200
++++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map 2013-05-08
14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+
+ keymaps 0-2,4,5,6,8-10,12,14
+ include "linux-with-alt-and-altgr"
+-include "euro"
++include "euro.map"
+ strings as usual
+
+ keycode 1 = Escape
Copied: kbd/repos/testing-i686/fix-euro2.patch (from rev 242187,
kbd/trunk/fix-euro2.patch)
===================================================================
--- testing-i686/fix-euro2.patch (rev 0)
+++ testing-i686/fix-euro2.patch 2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08
15:00:25.917752313 +0200
++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08
15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
+ # on the positions where many keyboards have E and C.
+ # To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode 18 = currency
++altgr keycode 18 = euro
+ altgr keycode 46 = cent
Copied: kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch (from rev
242187, 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 2015-07-14 06:00:27 UTC
(rev 242188)
@@ -0,0 +1,47 @@
+commit 7e06e56157e8431d02e1377cdc44230944203d88
+Author: Alexey Gladkov <gladkov.ale...@gmail.com>
+Date: Tue Dec 11 14:24:44 2012 +0400
+
+ Fix regression in 16117ce6ab
+
+ Signed-off-by: Alexey Gladkov <gladkov.ale...@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);
+ }
+ . {
Copied: kbd/repos/testing-x86_64/PKGBUILD (from rev 242187, kbd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=kbd
+pkgver=2.0.3
+pkgrel=1
+pkgdesc="Keytable files and keyboard utilities"
+arch=('i686' 'x86_64')
+url="http://www.kbd-project.org";
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+ 'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('d636ee56f35233b5cd6f855c08372489'
+ 'd869200acbc0aab6a9cafa43cb140d4e')
+
+prepare() {
+ 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 euro2 #28213
+ patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./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-dvorak-es.patch (from rev 242187,
kbd/trunk/fix-dvorak-es.patch)
===================================================================
--- testing-x86_64/fix-dvorak-es.patch (rev 0)
+++ testing-x86_64/fix-dvorak-es.patch 2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old 2013-05-08
14:58:03.393349828 +0200
++++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map 2013-05-08
14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+
+ keymaps 0-2,4,5,6,8-10,12,14
+ include "linux-with-alt-and-altgr"
+-include "euro"
++include "euro.map"
+ strings as usual
+
+ keycode 1 = Escape
Copied: kbd/repos/testing-x86_64/fix-euro2.patch (from rev 242187,
kbd/trunk/fix-euro2.patch)
===================================================================
--- testing-x86_64/fix-euro2.patch (rev 0)
+++ testing-x86_64/fix-euro2.patch 2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08
15:00:25.917752313 +0200
++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08
15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
+ # on the positions where many keyboards have E and C.
+ # To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode 18 = currency
++altgr keycode 18 = euro
+ altgr keycode 46 = cent
Copied: kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch (from rev
242187, 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 2015-07-14 06:00:27 UTC
(rev 242188)
@@ -0,0 +1,47 @@
+commit 7e06e56157e8431d02e1377cdc44230944203d88
+Author: Alexey Gladkov <gladkov.ale...@gmail.com>
+Date: Tue Dec 11 14:24:44 2012 +0400
+
+ Fix regression in 16117ce6ab
+
+ Signed-off-by: Alexey Gladkov <gladkov.ale...@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);
+ }
+ . {
