summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vzapolskiy@gmail.com>2010-06-02 11:45:59 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2010-06-02 17:13:37 +0400
commit08ed57bc4aa0cd57960a106a99ce9cf7738a3f4b (patch)
treeec89ecd0a5bb457553c1aa2f29ec00e5fb8c7a3c /recipes
parent1f7eee75cc78820ff1991ae157a9e78608f8608d (diff)
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@gmail.com> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-1.5.3/no_xkb.patch4
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_1.5.3.bb5
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 779aa2d6ef..0920441563 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 f1430fc43b..5de73c5ccf 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}"