[oe-commits] org.oe.dev xserver-kdrive 1.4.99.901: allow builds without xkb

[pieterg commit]

xserver-kdrive 1.4.99.901: allow builds without xkb

Author: pieterg at gmx.com
Branch: org.openembedded.dev
Revision: 7d603cc04117ff26737fd883065be344201e5947
ViewMTN: http://monotone.openembedded.org/revision/info/7d603cc04117ff26737fd883065be344201e5947
Files:
1
packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch
packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
Diffs:

#
# mt diff -r9455801300c282c1468f2996676b4113cd314999 -r7d603cc04117ff26737fd883065be344201e5947
#
#
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch"
#  content [17027e633e5809ba281942d8c0a5d96710ff3b44]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb"
#  from [b4e6ae6d9910a862ac097c2fc2c5bde4b3dd24f6]
#    to [76619371ff78acba1cee7d5b37e21f468899b689]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch	17027e633e5809ba281942d8c0a5d96710ff3b44
+++ packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch	17027e633e5809ba281942d8c0a5d96710ff3b44
@@ -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);
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb	b4e6ae6d9910a862ac097c2fc2c5bde4b3dd24f6
+++ packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb	76619371ff78acba1cee7d5b37e21f468899b689
@@ -5,7 +5,7 @@ PE = "1"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -24,6 +24,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
 	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}"
@@ -31,4 +32,6 @@ W100_OECONF_arm = "--enable-w100"
 W100_OECONF = "--disable-w100"
 W100_OECONF_arm = "--enable-w100"
 
+EXTRA_OECONF += "--enable-builtin-fonts \
+		 --disable-dri2 \
+		"
-EXTRA_OECONF += "--enable-builtin-fonts"