xserver-kdrive_1.4.0.90.bb : add the no_kbd patch to this as well

diff --git a/packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch
new file mode 100644 (file)
index 0000000..779aa2d
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch
@@ -0,0 +1,12 @@
+--- dix/devices.c~     2008-04-16 13:01:08.000000000 +0200
++++ dix/devices.c      2008-04-16 13:01:08.000000000 +0200
+@@ -527,8 +527,8 @@
+ #ifdef XKB
+       if (dev->key->xkbInfo)
+           XkbFreeInfo(dev->key->xkbInfo);
+-#endif
+         dev->key->xkbInfo = NULL;
++#endif
+       xfree(dev->key->curKeySyms.map);
+       xfree(dev->key->modifierKeyMap);
+       xfree(dev->key);

diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index 32bb76c..1583cc3 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \
@@ -23,6 +23,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://keyboard-resume-workaround.patch;patch=1 \
        file://xorg-avr32-support.diff;patch=1 \
        file://pkgconfig_fix.patch;patch=1 \
+        file://no_xkb.patch;patch=1;pnum=0 \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"