[arch-commits] CVS update of arch/build/x11/xkeyboard-config (2 files)

[Jan de Groot]

    Date: Wednesday, May 16, 2007 @ 14:40:55
  Author: jgc
    Path: /home/cvs-arch/arch/build/x11/xkeyboard-config

   Added: xkeyboard-config-fix-ralt.patch (1.1)
Modified: PKGBUILD (1.3 -> 1.4)

upgpkg: xkeyboard-config 0.9-2
Fix right alt problem from bug 6144


---------------------------------+
 PKGBUILD                        |   22 +++++++-------
 xkeyboard-config-fix-ralt.patch |   59 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 10 deletions(-)


Index: arch/build/x11/xkeyboard-config/PKGBUILD
diff -u arch/build/x11/xkeyboard-config/PKGBUILD:1.3 arch/build/x11/xkeyboard-config/PKGBUILD:1.4
--- arch/build/x11/xkeyboard-config/PKGBUILD:1.3	Sun Dec 31 12:32:33 2006
+++ arch/build/x11/xkeyboard-config/PKGBUILD	Wed May 16 14:40:54 2007
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD,v 1.3 2006/12/31 17:32:33 jgc Exp $
-#Maintainer: Jan de Groot <jgc at archlinux.org>
+# $Id: PKGBUILD,v 1.4 2007/05/16 18:40:54 jgc Exp $
+#Maintainer: Alexander Baldeck <kth5 at archlinux.org>
 
 pkgname=xkeyboard-config
 pkgver=0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="X keyboard configuration files"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=(xorg-xkb-utils)
-makedepends=(intltool pkgconfig)
-provides=(xkbdata)
-replaces=(xkbdata)
-conflicts=(xkbdata)
-source=(http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2)
-md5sums=('52afe60101ace8532881e70f6c2dc020')
+depends=('xorg-xkb-utils')
+makedepends=('perlxml' 'pkgconfig')
+provides=('xkbdata')
+replaces=('xkbdata')
+conflicts=('xkbdata')
+source=(http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2
+	xkeyboard-config-fix-ralt.patch)
+md5sums=('52afe60101ace8532881e70f6c2dc020' '880387b6f62bfd6c386186dea61a498f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/xkeyboard-config-fix-ralt.patch || return 1
   ./configure --prefix=/usr --with-xkb-base=/usr/share/X11/xkb --with-xkb-rules-symlink=xorg --enable-compat-rules=yes
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
Index: arch/build/x11/xkeyboard-config/xkeyboard-config-fix-ralt.patch
diff -u /dev/null arch/build/x11/xkeyboard-config/xkeyboard-config-fix-ralt.patch:1.1
--- /dev/null	Wed May 16 14:40:54 2007
+++ arch/build/x11/xkeyboard-config/xkeyboard-config-fix-ralt.patch	Wed May 16 14:40:54 2007
@@ -0,0 +1,59 @@
+Index: symbols/level3
+===================================================================
+RCS file: /cvs/xlibs/xkbdesc/symbols/level3,v
+retrieving revision 1.14
+diff -u -r1.14 level3
+--- symbols/level3	9 Oct 2006 21:53:27 -0000	1.14
++++ symbols/level3	16 Oct 2006 19:36:21 -0000
+@@ -14,7 +14,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <RALT> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ partial modifier_keys
+@@ -66,7 +66,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <RCTL> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ // using the level(menu_switch) map, the Menu key temporarily
+@@ -77,7 +77,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <MENU> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ // using the level3(win_switch) map, the either Windows' logo key
+@@ -96,7 +96,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <LWIN> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ // using the level(rwin_switch) map, the right Windows' logo key
+@@ -109,7 +109,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <RWIN> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ // using the level3(enter_switch) map, the Enter key on the keypad
+@@ -121,5 +121,5 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <KPEN> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };