[arch-commits] Commit in xkeyboard-config/repos (3 files)

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 14:55:49
  Author: jgc
Revision: 22425

Merged revisions 22424 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xkeyboard-config/trunk

........
  r22424 | jgc | 2008-12-26 19:55:37 +0000 (Fri, 26 Dec 2008) | 2 lines
  
  upgpkg: xkeyboard-config 1.4-2
      Fix FS#12135
........

Added:
  xkeyboard-config/repos/extra-i686/fix-abnt2.patch
    (from rev 22424, xkeyboard-config/trunk/fix-abnt2.patch)
Modified:
  xkeyboard-config/repos/extra-i686/	(properties)
  xkeyboard-config/repos/extra-i686/PKGBUILD

-----------------+
 PKGBUILD        |   20 +++++++++++---------
 fix-abnt2.patch |   20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)


Property changes on: xkeyboard-config/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xkeyboard-config/trunk:1-19167
   + /xkeyboard-config/trunk:1-22424
Deleted: svn:mergeinfo
   - 

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-26 19:55:37 UTC (rev 22424)
+++ extra-i686/PKGBUILD	2008-12-26 19:55:49 UTC (rev 22425)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xkeyboard-config
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X keyboard configuration files"
 arch=(i686 x86_64)
 license=('custom')
@@ -12,19 +12,21 @@
 provides=('xkbdata')
 replaces=('xkbdata')
 conflicts=('xkbdata')
-source=(http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${pkgver}.tar.bz2)
-md5sums=('a9fe7efbc67a6966c4d4501f0cf88073')
+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
 }

Copied: xkeyboard-config/repos/extra-i686/fix-abnt2.patch (from rev 22424, xkeyboard-config/trunk/fix-abnt2.patch)
===================================================================
--- extra-i686/fix-abnt2.patch	                        (rev 0)
+++ extra-i686/fix-abnt2.patch	2008-12-26 19:55:49 UTC (rev 22425)
@@ -0,0 +1,20 @@
+From b67326a9b271332c5bef23115d9c4ac7e7b2e6d9 Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov<svu at 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