[arch-commits] Commit in kbd/trunk (PKGBUILD fix-dvorak-es.patch fix-euro2.patch)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Wed May 8 13:07:35 UTC 2013
Date: Wednesday, May 8, 2013 @ 15:07:34
Author: tpowa
Revision: 184776
upgpkg: kbd 1.15.5-4
fix #33662 #28213
Added:
kbd/trunk/fix-dvorak-es.patch
kbd/trunk/fix-euro2.patch
Modified:
kbd/trunk/PKGBUILD
---------------------+
PKGBUILD | 22 +++++++++++++++++-----
fix-dvorak-es.patch | 11 +++++++++++
fix-euro2.patch | 9 +++++++++
3 files changed, 37 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-08 10:44:44 UTC (rev 184775)
+++ PKGBUILD 2013-05-08 13:07:34 UTC (rev 184776)
@@ -3,21 +3,21 @@
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 @@
# 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 @@
cd ${srcdir}/${pkgname}-${pkgver}
make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
}
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+ '4362091d5e23bab2d158f8c7693a45d8'
+ '998957c4f815347dcc874c4d7555dc66'
+ 'd869200acbc0aab6a9cafa43cb140d4e')
Added: fix-dvorak-es.patch
===================================================================
--- fix-dvorak-es.patch (rev 0)
+++ fix-dvorak-es.patch 2013-05-08 13:07:34 UTC (rev 184776)
@@ -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
Added: fix-euro2.patch
===================================================================
--- fix-euro2.patch (rev 0)
+++ fix-euro2.patch 2013-05-08 13:07:34 UTC (rev 184776)
@@ -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
More information about the arch-commits
mailing list