diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-23 01:28:34 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-23 01:28:34 -0700 |
| commit | e0c1bfae73539aac5627d73dd70a299d274a0c10 (patch) | |
| tree | c18288b635e64dfbcd616503eb079a951a43fafc /core/kbd | |
| parent | bdf2189826c1931878cedc2262f67f6fd3c0ef15 (diff) | |
Thu May 23 01:28:33 PDT 2013
Diffstat (limited to 'core/kbd')
| -rw-r--r-- | core/kbd/PKGBUILD | 24 | ||||
| -rw-r--r-- | core/kbd/fix-dvorak-es.patch | 11 | ||||
| -rw-r--r-- | core/kbd/fix-euro2.patch | 9 |
3 files changed, 38 insertions, 6 deletions
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index 1ee33254c..af4c52d16 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 175749 2013-01-21 10:51:33Z tpowa $ +# $Id: PKGBUILD 186234 2013-05-22 12:12:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd pkgver=1.15.5 -pkgrel=3 +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-keymap-loading-1.15.5.patch' + 'fix-dvorak-es.patch' + 'fix-euro2.patch') provides=('vlock') conflicts=('vlock') replaces=('vlock') -md5sums=('34c71feead8ab9c01ec638acea8cd877' - '4362091d5e23bab2d158f8c7693a45d8') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} # rename keymap files with the same names # this is needed because when only name of keymap is specified @@ -32,6 +32,14 @@ build() { # 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 } @@ -40,3 +48,7 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install } +md5sums=('34c71feead8ab9c01ec638acea8cd877' + '4362091d5e23bab2d158f8c7693a45d8' + '998957c4f815347dcc874c4d7555dc66' + 'd869200acbc0aab6a9cafa43cb140d4e') diff --git a/core/kbd/fix-dvorak-es.patch b/core/kbd/fix-dvorak-es.patch new file mode 100644 index 000000000..95760fd3a --- /dev/null +++ b/core/kbd/fix-dvorak-es.patch @@ -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 diff --git a/core/kbd/fix-euro2.patch b/core/kbd/fix-euro2.patch new file mode 100644 index 000000000..572cba740 --- /dev/null +++ b/core/kbd/fix-euro2.patch @@ -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 |