diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-04-17 14:30:55 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-04-17 14:30:55 +0000 |
| commit | c94655317c1750c14c7b986895395360c61f3898 (patch) | |
| tree | 0062e16ae44a3ef24815349fef371ac996495aab | |
| parent | 4bfc761321a85432d15828fa3c44632b0bd2cb9a (diff) | |
xserver-kdrive_1.4.0.90.bb : add the no_kbd patch to this as well
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-1.4.0.90/no_xkb.patch | 12 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb | 3 |
2 files changed, 14 insertions, 1 deletions
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 index 0000000000..779aa2d6ef --- /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 32bb76c0f5..1583cc3c6c 100644 --- 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}" |