Date: Tuesday, August 20, 2013 @ 14:18:42
Author: tpowa
Revision: 193453
db-move: moved kbd from [testing] to [core] (i686, x86_64)
Added:
kbd/repos/core-i686/PKGBUILD
(from rev 193452, kbd/repos/testing-i686/PKGBUILD)
kbd/repos/core-i686/fix-dvorak-es.patch
(from rev 193452, kbd/repos/testing-i686/fix-dvorak-es.patch)
kbd/repos/core-i686/fix-euro2.patch
(from rev 193452, kbd/repos/testing-i686/fix-euro2.patch)
kbd/repos/core-i686/fix-keymap-loading-1.15.5.patch
(from rev 193452, kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch)
kbd/repos/core-x86_64/PKGBUILD
(from rev 193452, kbd/repos/testing-x86_64/PKGBUILD)
kbd/repos/core-x86_64/fix-dvorak-es.patch
(from rev 193452, kbd/repos/testing-x86_64/fix-dvorak-es.patch)
kbd/repos/core-x86_64/fix-euro2.patch
(from rev 193452, kbd/repos/testing-x86_64/fix-euro2.patch)
kbd/repos/core-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 193452, kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch)
Deleted:
kbd/repos/core-i686/PKGBUILD
kbd/repos/core-i686/fix-dvorak-es.patch
kbd/repos/core-i686/fix-euro2.patch
kbd/repos/core-i686/fix-keymap-loading-1.15.5.patch
kbd/repos/core-x86_64/PKGBUILD
kbd/repos/core-x86_64/fix-dvorak-es.patch
kbd/repos/core-x86_64/fix-euro2.patch
kbd/repos/core-x86_64/fix-keymap-loading-1.15.5.patch
kbd/repos/testing-i686/
kbd/repos/testing-x86_64/
---------------------------------------------+
/PKGBUILD | 100 ++++++++++++++++++++++++++
/fix-dvorak-es.patch | 22 +++++
/fix-euro2.patch | 18 ++++
/fix-keymap-loading-1.15.5.patch | 94 ++++++++++++++++++++++++
core-i686/PKGBUILD | 54 --------------
core-i686/fix-dvorak-es.patch | 11 --
core-i686/fix-euro2.patch | 9 --
core-i686/fix-keymap-loading-1.15.5.patch | 47 ------------
core-x86_64/PKGBUILD | 54 --------------
core-x86_64/fix-dvorak-es.patch | 11 --
core-x86_64/fix-euro2.patch | 9 --
core-x86_64/fix-keymap-loading-1.15.5.patch | 47 ------------
12 files changed, 234 insertions(+), 242 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2013-08-20 10:14:18 UTC (rev 193452)
+++ core-i686/PKGBUILD 2013-08-20 12:18:42 UTC (rev 193453)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=kbd
-pkgver=1.15.5
-pkgrel=4
-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'
- 'fix-dvorak-es.patch'
- 'fix-euro2.patch')
-provides=('vlock')
-conflicts=('vlock')
-replaces=('vlock')
-
-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 https://bugs.archlinux.org/task/33308
- # keymap loading is broken for cetain keymaps
- patch -Np1 -i ../fix-keymap-loading-1.15.5.patch
- # fix es-dvorak #33662
- patch -Np1 -i ../fix-dvorak-es.patch
- # 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
-}
-md5sums=('34c71feead8ab9c01ec638acea8cd877'
- '4362091d5e23bab2d158f8c7693a45d8'
- '998957c4f815347dcc874c4d7555dc66'
- 'd869200acbc0aab6a9cafa43cb140d4e')
Copied: kbd/repos/core-i686/PKGBUILD (from rev 193452,
kbd/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2013-08-20 12:18:42 UTC (rev 193453)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=kbd
+pkgver=2.0.0
+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-dvorak-es.patch'
+ 'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('5ba259a0b2464196f6488a72070a3d60'
+ '998957c4f815347dcc874c4d7555dc66'
+ '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 es-dvorak #33662
+ patch -Np1 -i ../fix-dvorak-es.patch
+ # 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
+}
Deleted: core-i686/fix-dvorak-es.patch
===================================================================
--- core-i686/fix-dvorak-es.patch 2013-08-20 10:14:18 UTC (rev 193452)
+++ core-i686/fix-dvorak-es.patch 2013-08-20 12:18:42 UTC (rev 193453)
@@ -1,11 +0,0 @@
---- 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/core-i686/fix-dvorak-es.patch (from rev 193452,
kbd/repos/testing-i686/fix-dvorak-es.patch)
===================================================================
--- core-i686/fix-dvorak-es.patch (rev 0)
+++ core-i686/fix-dvorak-es.patch 2013-08-20 12:18:42 UTC (rev 193453)
@@ -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
Deleted: core-i686/fix-euro2.patch
===================================================================
--- core-i686/fix-euro2.patch 2013-08-20 10:14:18 UTC (rev 193452)
+++ core-i686/fix-euro2.patch 2013-08-20 12:18:42 UTC (rev 193453)
@@ -1,9 +0,0 @@
---- 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/core-i686/fix-euro2.patch (from rev 193452,
kbd/repos/testing-i686/fix-euro2.patch)
===================================================================
--- core-i686/fix-euro2.patch (rev 0)
+++ core-i686/fix-euro2.patch 2013-08-20 12:18:42 UTC (rev 193453)
@@ -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
Deleted: core-i686/fix-keymap-loading-1.15.5.patch
===================================================================
--- core-i686/fix-keymap-loading-1.15.5.patch 2013-08-20 10:14:18 UTC (rev
193452)
+++ core-i686/fix-keymap-loading-1.15.5.patch 2013-08-20 12:18:42 UTC (rev
193453)
@@ -1,47 +0,0 @@
-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/core-i686/fix-keymap-loading-1.15.5.patch (from rev 193452,
kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch)
===================================================================
--- core-i686/fix-keymap-loading-1.15.5.patch (rev 0)
+++ core-i686/fix-keymap-loading-1.15.5.patch 2013-08-20 12:18:42 UTC (rev
193453)
@@ -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);
+ }
+ . {
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2013-08-20 10:14:18 UTC (rev 193452)
+++ core-x86_64/PKGBUILD 2013-08-20 12:18:42 UTC (rev 193453)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=kbd
-pkgver=1.15.5
-pkgrel=4
-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'
- 'fix-dvorak-es.patch'
- 'fix-euro2.patch')
-provides=('vlock')
-conflicts=('vlock')
-replaces=('vlock')
-
-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 https://bugs.archlinux.org/task/33308
- # keymap loading is broken for cetain keymaps
- patch -Np1 -i ../fix-keymap-loading-1.15.5.patch
- # fix es-dvorak #33662
- patch -Np1 -i ../fix-dvorak-es.patch
- # 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
-}
-md5sums=('34c71feead8ab9c01ec638acea8cd877'
- '4362091d5e23bab2d158f8c7693a45d8'
- '998957c4f815347dcc874c4d7555dc66'
- 'd869200acbc0aab6a9cafa43cb140d4e')
Copied: kbd/repos/core-x86_64/PKGBUILD (from rev 193452,
kbd/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2013-08-20 12:18:42 UTC (rev 193453)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=kbd
+pkgver=2.0.0
+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-dvorak-es.patch'
+ 'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('5ba259a0b2464196f6488a72070a3d60'
+ '998957c4f815347dcc874c4d7555dc66'
+ '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 es-dvorak #33662
+ patch -Np1 -i ../fix-dvorak-es.patch
+ # 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
+}
Deleted: core-x86_64/fix-dvorak-es.patch
===================================================================
--- core-x86_64/fix-dvorak-es.patch 2013-08-20 10:14:18 UTC (rev 193452)
+++ core-x86_64/fix-dvorak-es.patch 2013-08-20 12:18:42 UTC (rev 193453)
@@ -1,11 +0,0 @@
---- 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/core-x86_64/fix-dvorak-es.patch (from rev 193452,
kbd/repos/testing-x86_64/fix-dvorak-es.patch)
===================================================================
--- core-x86_64/fix-dvorak-es.patch (rev 0)
+++ core-x86_64/fix-dvorak-es.patch 2013-08-20 12:18:42 UTC (rev 193453)
@@ -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
Deleted: core-x86_64/fix-euro2.patch
===================================================================
--- core-x86_64/fix-euro2.patch 2013-08-20 10:14:18 UTC (rev 193452)
+++ core-x86_64/fix-euro2.patch 2013-08-20 12:18:42 UTC (rev 193453)
@@ -1,9 +0,0 @@
---- 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/core-x86_64/fix-euro2.patch (from rev 193452,
kbd/repos/testing-x86_64/fix-euro2.patch)
===================================================================
--- core-x86_64/fix-euro2.patch (rev 0)
+++ core-x86_64/fix-euro2.patch 2013-08-20 12:18:42 UTC (rev 193453)
@@ -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
Deleted: core-x86_64/fix-keymap-loading-1.15.5.patch
===================================================================
--- core-x86_64/fix-keymap-loading-1.15.5.patch 2013-08-20 10:14:18 UTC (rev
193452)
+++ core-x86_64/fix-keymap-loading-1.15.5.patch 2013-08-20 12:18:42 UTC (rev
193453)
@@ -1,47 +0,0 @@
-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/core-x86_64/fix-keymap-loading-1.15.5.patch (from rev 193452,
kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch)
===================================================================
--- core-x86_64/fix-keymap-loading-1.15.5.patch (rev 0)
+++ core-x86_64/fix-keymap-loading-1.15.5.patch 2013-08-20 12:18:42 UTC (rev
193453)
@@ -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);
+ }
+ . {
