xkeyboard-config: bump to 2.0 to fix bug 2965

Closes #2965

For some odd reason, xkeyboard-config < 1.8 was creating a symbolic
link from /usr/share/X11/xkb/xkbcomp to the xkbcomp binary. But in
cross-compilation mode, this is absurd as the xkbcomp binary to which
the link is pointing is the one in $(HOST_DIR).

This symbolic link thing has been removed completely starting from
xkeyboard-config 1.9. See
http://cgit.freedesktop.org/xkeyboard-config/commit/?id=f413dff57e77e7b01461508f74b4e92d1dc8defd.

Therefore, we simply bump xkeyboard-config to the latest available
version, 2.0.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2010-12-22 10:35:04 +01:00 committed by Peter Korsgaard
parent c482c5ab6f
commit 6ddf470264
2 changed files with 4 additions and 3 deletions

View File

@ -9,7 +9,7 @@
lsof, ltp-testsuite, lvm2, m4, memtester, mii-diag, mplayer, lsof, ltp-testsuite, lvm2, m4, memtester, mii-diag, mplayer,
mrouted, netplug, openssh, openssl, openvpn, pango, qt, rsync, mrouted, netplug, openssh, openssl, openvpn, pango, qt, rsync,
sdl_gfx, sdl_sound, sysklogd, sysvinit, udev, usbutils, sdl_gfx, sdl_sound, sysklogd, sysvinit, udev, usbutils,
xlib_libX11, xz, zlib xkeyboard-config, xlib_libX11, xz, zlib
New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone, New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone,
xl2tp xl2tp
@ -23,6 +23,7 @@
#1651: Build fail caused by ccache in module-init-tools #1651: Build fail caused by ccache in module-init-tools
#1735: [PATCH] mplayer: convert to autotools infrastructure #1735: [PATCH] mplayer: convert to autotools infrastructure
#2905: Qt: Speed up compilation, if gui-module isn't selected #2905: Qt: Speed up compilation, if gui-module isn't selected
#2965: Broken linkage to xkbcomp (blocking X server startup)
#2983: xlib_libX11 build failed #2983: xlib_libX11 build failed
2010.11, Released November 30th, 2010: 2010.11, Released November 30th, 2010:

View File

@ -3,9 +3,9 @@
# xkeyboard-config # xkeyboard-config
# #
############################################################# #############################################################
XKEYBOARD_CONFIG_VERSION = 1.8 XKEYBOARD_CONFIG_VERSION = 2.0
XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
XKEYBOARD_CONFIG_SITE = http://xlibs.freedesktop.org/xkbdesc XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
XKEYBOARD_CONFIG_AUTORECONF = NO XKEYBOARD_CONFIG_AUTORECONF = NO
XKEYBOARD_CONFIG_INSTALL_STAGING = NO XKEYBOARD_CONFIG_INSTALL_STAGING = NO
XKEYBOARD_CONFIG_INSTALL_TARGET = YES XKEYBOARD_CONFIG_INSTALL_TARGET = YES