# HG changeset patch # User Hans-G?nter Theisgen # Date 1552725746 -3600 # Node ID b0cfa2140c915cd5df525cfb43ee5e0289bd4008 # Parent 3f1e8cc50b2bf094c0c359cbbaca43b6d23cc233 updated kbd, kbd-base, kbd-busybox, and kdb-vlock (2.0.2 -> 2.0.4) diff -r 3f1e8cc50b2b -r b0cfa2140c91 kbd-base/receipt --- a/kbd-base/receipt Fri Mar 15 16:26:21 2019 +0100 +++ b/kbd-base/receipt Sat Mar 16 09:42:26 2019 +0100 @@ -1,15 +1,15 @@ # SliTaz package receipt. PACKAGE="kbd-base" -VERSION="2.0.2" +VERSION="2.0.4" CATEGORY="base-system" -SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities" +SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" WEB_SITE="http://kbd-project.org/" -HOST_ARCH="i486 arm" WANTED="kbd" +HOST_ARCH="i486 arm" # Make sure it will run on host or no keyboard support... testsuite() diff -r 3f1e8cc50b2b -r b0cfa2140c91 kbd-busybox/receipt --- a/kbd-busybox/receipt Fri Mar 15 16:26:21 2019 +0100 +++ b/kbd-busybox/receipt Sat Mar 16 09:42:26 2019 +0100 @@ -1,14 +1,14 @@ # SliTaz package receipt. PACKAGE="kbd-busybox" -VERSION="2.0.2" +VERSION="2.0.4" CATEGORY="base-system" -SHORT_DESC="Keyboard maping definitions for busybox." +SHORT_DESC="Keyboard mapping definitions for busybox." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="http://www.slitaz.org/" + WANTED="kbd-base" # for VERSION check only - BUILD_DEPENDS="kbd-base busybox" # Rules to configure and make the package. diff -r 3f1e8cc50b2b -r b0cfa2140c91 kbd-vlock/receipt --- a/kbd-vlock/receipt Fri Mar 15 16:26:21 2019 +0100 +++ b/kbd-vlock/receipt Sat Mar 16 09:42:26 2019 +0100 @@ -1,13 +1,13 @@ # SliTaz package receipt. PACKAGE="kbd-vlock" -VERSION="2.0.2" +VERSION="2.0.4" CATEGORY="system-tools" -SHORT_DESC="vlock - Virtual Console lock program" +TAGS="console" +SHORT_DESC="Vlock - Virtual Console lock program." MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2" WEB_SITE="http://kbd-project.org/" -TAGS="console" WANTED="kbd" DEPENDS="pam" diff -r 3f1e8cc50b2b -r b0cfa2140c91 kbd/receipt --- a/kbd/receipt Fri Mar 15 16:26:21 2019 +0100 +++ b/kbd/receipt Sat Mar 16 09:42:26 2019 +0100 @@ -1,23 +1,24 @@ # SliTaz package receipt. PACKAGE="kbd" -VERSION="2.0.2" +VERSION="2.0.4" CATEGORY="system-tools" -SHORT_DESC="Keyboard maping definitions and tools." +TAGS="keyboard" +SHORT_DESC="Keyboard mapping definitions and tools." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://kbd-project.org/" + TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://kbd-project.org/" WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL" -TAGS="keyboard" -HOST_ARCH="i486 arm" DEPENDS="kbd-base" -BUILD_DEPENDS="wget flex pam-dev check-dev advancecomp" +BUILD_DEPENDS="advancecomp check-dev flex pam-dev" +HOST_ARCH="i486 arm" # Handle cross compilation. case "$ARCH" in - arm) BUILD_DEPENDS="flex check-dev" ;; + arm) BUILD_DEPENDS="check-dev flex" ;; esac # Rules to configure and make the package. @@ -25,22 +26,26 @@ { # standard locale placement sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in + # Handle cross compilation. case "$ARCH" in arm) # No PAM support for ARM - ./configure \ - --datadir=/usr/share/kbd \ - --localedir=/usr/share/locale \ - --disable-vlock \ + ./configure \ + --datadir=/usr/share/kbd \ + --localedir=/usr/share/locale \ + --disable-vlock \ $CONFIGURE_ARGS ;; i486) - ./configure \ - --datadir=/usr/share/kbd \ - --localedir=/usr/share/locale \ + ./configure \ + --datadir=/usr/share/kbd \ + --localedir=/usr/share/locale \ $CONFIGURE_ARGS ;; esac && - make && make install && + + make -j 1 && + make install && + find $DESTDIR/usr/share/kbd -name '*gz' -exec advdef -z4 {} \; } @@ -62,7 +67,9 @@ done rm -rf $fs/usr/share/kbd/keymaps/include rm -rf $fs/usr/share/kbd/keymaps/i386/include - rm -f $fs/usr/bin/loadkeys $fs/usr/bin/setfont $fs/usr/bin/vlock + rm -f $fs/usr/bin/loadkeys + rm -f $fs/usr/bin/setfont + rm -f $fs/usr/bin/vlock } # Overlap busybox