[oe-commits] Vladimir Zapolskiy : kdrive: fix compilation problem of xserver-kdrive

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 08ed57bc4aa0cd57960a106a99ce9cf7738a3f4b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=08ed57bc4aa0cd57960a106a99ce9cf7738a3f4b

Author: Vladimir Zapolskiy <vzapolskiy at gmail.com>
Date:   Wed Jun  2 11:45:59 2010 +0400

kdrive: fix compilation problem of xserver-kdrive

This patch adds application of no_xkb patch for the last
available version of xserver-kdrive in OpenEmbedded.

Signed-off-by: Vladimir Zapolskiy <vzapolskiy at gmail.com>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>

---

 .../xorg-xserver/xserver-kdrive-1.5.3/no_xkb.patch |    4 ++--
 recipes/xorg-xserver/xserver-kdrive_1.5.3.bb       |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-kdrive-1.5.3/no_xkb.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/no_xkb.patch
index 779aa2d..0920441 100644
--- a/recipes/xorg-xserver/xserver-kdrive-1.5.3/no_xkb.patch
+++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/no_xkb.patch
@@ -1,5 +1,5 @@
---- dix/devices.c~	2008-04-16 13:01:08.000000000 +0200
-+++ dix/devices.c	2008-04-16 13:01:08.000000000 +0200
+--- a/dix/devices.c	2008-04-16 13:01:08.000000000 +0200
++++ b/dix/devices.c	2008-04-16 13:01:08.000000000 +0200
 @@ -527,8 +527,8 @@
  #ifdef XKB
  	if (dev->key->xkbInfo)
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
index f1430fc..5de73c5 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb
@@ -17,8 +17,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://tslib-default-device.patch \
 	file://keyboard-resume-workaround.patch \
 	file://xorg-avr32-support.diff \
-    file://sysroot_fix.patch \
-    file://drmfix.patch \
+	file://sysroot_fix.patch \
+	file://drmfix.patch \
+	file://no_xkb.patch \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"