Pull request for branch for-2011.02/fix-bug-2965
The following changes since commit 11ab05f53a16f635a27139b33170a9dadba9f3c5:
Peter Korsgaard (1):
qt: svg and multimedia modules depends on gui module as well
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.02/fix-bug-2965
Thomas Petazzoni (1):
xkeyboard-config: bump to 2.0 to fix bug 2965
package/x11r7/xkeyboard-config/xkeyboard-config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Thanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/1 xkeyboard-config: bump to 2.0 to fix bug 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.
--- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xkeyboard-config/xkeyboard-config.mk +2 -2
@@ -3,9 +3,9 @@ # xkeyboard-config # ############################################################# -XKEYBOARD_CONFIG_VERSION = 1.8 +XKEYBOARD_CONFIG_VERSION = 2.0 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_INSTALL_STAGING = NO XKEYBOARD_CONFIG_INSTALL_TARGET = YES
Signature · 1 line
1.7.0.4
PATCH 1/1 xkeyboard-config: bump to 2.0 to fix bug 2965
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> For some odd reason, xkeyboard-config < 1.8 was creating a symbolic Thomas> link from /usr/share/X11/xkb/xkbcomp to the xkbcomp binary. But in Thomas> cross-compilation mode, this is absurd as the xkbcomp binary to which Thomas> the link is pointing is the one in $(HOST_DIR).
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard