From f8a35e25a9db2fa9f4b18d07848015c09adb23e1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 22 Jun 2010 04:54:10 +0200 Subject: [PATCH] xkeyboard-config: update to xkeyboard-config-1.9, various cleanups Signed-off-by: Stephan Raue --- packages/x11/data/xkeyboard-config/build | 6 ++---- packages/x11/data/xkeyboard-config/install | 2 +- packages/x11/data/xkeyboard-config/url | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build index 41c3d5b4d3..4fd8de7fe8 100755 --- a/packages/x11/data/xkeyboard-config/build +++ b/packages/x11/data/xkeyboard-config/build @@ -5,8 +5,6 @@ $SCRIPTS/build toolchain $SCRIPTS/build xkbcomp -SRC_DIR=`ls -d $ROOT/$PKG_BUILD` - cd $PKG_BUILD XKBCOMP="/usr/bin/xkbcomp" \ ./configure --host=$TARGET_NAME \ @@ -15,8 +13,8 @@ XKBCOMP="/usr/bin/xkbcomp" \ --sysconfdir=/etc \ --enable-compat-rules \ --with-xkb-base=$XORG_PATH_XKB \ - --disable-xkbcomp-symlink \ --with-xkb-rules-symlink=xorg + make -make DESTDIR=$SRC_DIR/.install install +make DESTDIR=`pwd`/.install install diff --git a/packages/x11/data/xkeyboard-config/install b/packages/x11/data/xkeyboard-config/install index 8555b2d4e1..c0a437425d 100755 --- a/packages/x11/data/xkeyboard-config/install +++ b/packages/x11/data/xkeyboard-config/install @@ -3,4 +3,4 @@ . config/options mkdir -p $INSTALL/$XORG_PATH_XKB -cp -PR $PKG_BUILD/.install/$XORG_PATH_XKB/* $INSTALL/$XORG_PATH_XKB + cp -R $PKG_BUILD/.install/$XORG_PATH_XKB/* $INSTALL/$XORG_PATH_XKB diff --git a/packages/x11/data/xkeyboard-config/url b/packages/x11/data/xkeyboard-config/url index c1596af300..600cd298e2 100644 --- a/packages/x11/data/xkeyboard-config/url +++ b/packages/x11/data/xkeyboard-config/url @@ -1 +1 @@ -http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.8.tar.bz2 \ No newline at end of file +http://people.freedesktop.org/~svu/xkeyboard-config-1.9.tar.bz2 \ No newline at end of file