[oe-commits] org.oe.dev xserver-kdrive_1.4.0.90.bb : add the no_kbd patch to this as well

xora commit oe at amethyst.openembedded.net
Thu Apr 17 14:46:50 UTC 2008


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

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: c56fffcbc3549d2f4ff8cd73112cbb756f8a9cb6
ViewMTN: http://monotone.openembedded.org/revision/info/c56fffcbc3549d2f4ff8cd73112cbb756f8a9cb6
Files:
1
packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch
packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
Diffs:

#
# mt diff -r36bf6ed41d5a4e0c89e3eda9b2b04bbc9b35d6c1 -rc56fffcbc3549d2f4ff8cd73112cbb756f8a9cb6
#
#
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch"
#  content [17027e633e5809ba281942d8c0a5d96710ff3b44]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb"
#  from [c45a81192919a98109d7b2e1550ccc2a98830f7e]
#    to [caaa6c6290239b9a702134c8c8c3b5b7f3208c61]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch	17027e633e5809ba281942d8c0a5d96710ff3b44
+++ packages/xorg-xserver/xserver-kdrive-1.4.0.90/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.0.90.bb	c45a81192919a98109d7b2e1550ccc2a98830f7e
+++ packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb	caaa6c6290239b9a702134c8c8c3b5b7f3208c61
@@ -3,7 +3,7 @@ PE = "1"
 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/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}"






More information about the Openembedded-commits mailing list