[arch-commits] CVS update of extra/x11/xorg-server (2 files)

[Alexander Baldeck]

    Date: Monday, November 5, 2007 @ 11:16:35
  Author: alexander
    Path: /home/cvs-extra/extra/x11/xorg-server

   Added: xorg-server-1.4-kbd-leds-fix.patch (1.1)
Modified: PKGBUILD (1.37 -> 1.38)

* fixed FS#8495


------------------------------------+
 PKGBUILD                           |    9 ++++++---
 xorg-server-1.4-kbd-leds-fix.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)


Index: extra/x11/xorg-server/PKGBUILD
diff -u extra/x11/xorg-server/PKGBUILD:1.37 extra/x11/xorg-server/PKGBUILD:1.38
--- extra/x11/xorg-server/PKGBUILD:1.37	Wed Oct 10 15:21:04 2007
+++ extra/x11/xorg-server/PKGBUILD	Mon Nov  5 11:16:34 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.37 2007/10/10 19:21:04 alexander Exp $
+# $Id: PKGBUILD,v 1.38 2007/11/05 16:16:34 alexander Exp $
 # Maintainer: Alexander Baldeck <kth5 at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-server
@@ -30,7 +30,8 @@
 	xorg-x11-server-1.1.1-vbe-filter-less.patch
 	xorg-server-1.2.0-defaultdpi.patch
 	xorg-x11-server-1.1.1-no-scanpci.patch
-	xserver-1.3.0-newglx-offscreen-pixmaps.patch)
+	xserver-1.3.0-newglx-offscreen-pixmaps.patch
+	xorg-server-1.4-kbd-leds-fix.patch)
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -43,6 +44,7 @@
   patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-vbe-filter-less.patch || return 1
   patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-no-scanpci.patch || return 1
   patch -Np1 -i ${startdir}/src/xserver-1.3.0-newglx-offscreen-pixmaps.patch || return 1
+  patch -Np1 -i ${startdir}/src/xorg-server-1.4-kbd-leds-fix.patch || return 1
 
   # Own patches
   patch -Np1 -i ${startdir}/src/xorg-server-1.2.0-defaultdpi.patch || return 1
@@ -100,4 +102,5 @@
          '91d5eea40148b9e9db59c659b15fe443'
          'e162134c68230f7b168430fe73b4881a'
          '43257d8ade0f087870426eca1f09005c'
-         '0241d51f94de450845531b4df2af2527')
+         '0241d51f94de450845531b4df2af2527'
+         '958d907381f0df253668a5d9473d1adf')
Index: extra/x11/xorg-server/xorg-server-1.4-kbd-leds-fix.patch
diff -u /dev/null extra/x11/xorg-server/xorg-server-1.4-kbd-leds-fix.patch:1.1
--- /dev/null	Mon Nov  5 11:16:35 2007
+++ extra/x11/xorg-server/xorg-server-1.4-kbd-leds-fix.patch	Mon Nov  5 11:16:34 2007
@@ -0,0 +1,21 @@
+--- xorg-server-1.4/dix/devices.c.orig  2007-10-19 17:04:51.000000000 -0200
++++ xorg-server-1.4/dix/devices.c       2007-10-23 17:50:38.000000000 -0200
+@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt
+ static void
+ CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
+ {
++#ifdef XKB
++    if (!noXkbExtension) {
++       DeviceIntPtr dev = (DeviceIntPtr)
++           pDev->devPrivates[CoreDevicePrivatesIndex].ptr;
++
++       if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc)
++           (*dev->key->xkbInfo->kbdProc)(dev, ctrl);
++    }
++#else
+     return;
++#endif
+ }
+
+ /**
+