diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
| commit | 6c619a60fd89b5e75a93cff06977c552ddf1e621 (patch) | |
| tree | 630ca50ea1c128c4be85ce920ecf034c561bf7fe /abs/core-testing/xkeyboard-config | |
| parent | 0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d (diff) | |
| parent | 634dff8fdd0a9c866c92f0020f282c23d1a438d8 (diff) | |
| download | linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.zip linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.gz linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/xkeyboard-config')
| -rw-r--r-- | abs/core-testing/xkeyboard-config/PKGBUILD | 26 | ||||
| -rw-r--r-- | abs/core-testing/xkeyboard-config/fix-abnt2.patch | 20 |
2 files changed, 34 insertions, 12 deletions
diff --git a/abs/core-testing/xkeyboard-config/PKGBUILD b/abs/core-testing/xkeyboard-config/PKGBUILD index 5b26253..abac013 100644 --- a/abs/core-testing/xkeyboard-config/PKGBUILD +++ b/abs/core-testing/xkeyboard-config/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 7542 2008-08-02 21:31:59Z jgc $ -# Maintainer: Alexander Baldeck <kth5@archlinux.org> +# $Id: PKGBUILD 22425 2008-12-26 19:55:49Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xkeyboard-config -pkgver=1.3 -pkgrel=1 +pkgver=1.4 +pkgrel=2 pkgdesc="X keyboard configuration files" arch=(i686 x86_64) license=('custom') @@ -12,19 +12,21 @@ makedepends=('perlxml' 'pkgconfig') provides=('xkbdata') replaces=('xkbdata') conflicts=('xkbdata') -source=(http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${pkgver}.tar.bz2) -md5sums=('d9e9f69f9c6ef5c5a8255cfbe6a57d51') +source=(http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${pkgver}.tar.bz2 + fix-abnt2.patch) +md5sums=('a9fe7efbc67a6966c4d4501f0cf88073' '5af20ec00a42a051cf0d7bcb572471df') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-abnt2.patch" || return 1 ./configure --prefix=/usr \ --with-xkb-base=/usr/share/X11/xkb \ --with-xkb-rules-symlink=xorg \ --enable-compat-rules=yes || return 1 make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 - rm -f ${startdir}/pkg/usr/share/X11/xkb/compiled || return 1 - install -m755 -d ${startdir}/pkg/var/lib/xkb - install -m755 -d ${startdir}/pkg/usr/share/licenses/${pkgname} - install -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/ || return 1 + make DESTDIR="${pkgdir}" install || return 1 + rm -f "${pkgdir}/usr/share/X11/xkb/compiled" || return 1 + install -m755 -d "${pkgdir}/var/lib/xkb" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 } diff --git a/abs/core-testing/xkeyboard-config/fix-abnt2.patch b/abs/core-testing/xkeyboard-config/fix-abnt2.patch new file mode 100644 index 0000000..a451df8 --- /dev/null +++ b/abs/core-testing/xkeyboard-config/fix-abnt2.patch @@ -0,0 +1,20 @@ +From b67326a9b271332c5bef23115d9c4ac7e7b2e6d9 Mon Sep 17 00:00:00 2001 +From: Sergey V. Udaltsov<svu@gnome.org> +Date: Wed, 26 Nov 2008 23:19:41 +0000 +Subject: fixed abnt2 keycodes, b.fd.o#18712 + +--- +diff --git a/keycodes/evdev b/keycodes/evdev +index 760e2d0..9da2cd5 100644 +--- a/keycodes/evdev ++++ b/keycodes/evdev +@@ -311,6 +311,7 @@ xkb_keycodes "jp106" { + // For brazilian ABNT2 keyboard. + xkb_keycodes "abnt2" { + include "evdev(evdev)" ++ <KPPT> = 129; + }; + + // PC98 +-- +cgit v0.8.1-24-ge5fb |