wok-6.x diff kbd/receipt @ rev 25044

*/stuff/bootloader.S: fix VCPI case
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jun 02 15:48:36 2022 +0000 (2022-06-02)
parents a3b6dd3aac6f
children
line diff
     1.1 --- a/kbd/receipt	Tue Jul 27 16:57:54 2021 +0000
     1.2 +++ b/kbd/receipt	Thu Jun 02 15:48:36 2022 +0000
     1.3 @@ -1,19 +1,20 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="kbd"
     1.7 -VERSION="2.2.0"
     1.8 +VERSION="2.4.0"
     1.9  CATEGORY="system-tools"
    1.10  TAGS="keyboard"
    1.11  SHORT_DESC="Keyboard mapping definitions and tools."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 -WEB_SITE="http://kbd-project.org/"
    1.15 +WEB_SITE="https://kbd-project.org/"
    1.16  
    1.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.18  WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL"
    1.19  
    1.20 -DEPENDS="kbd-base"
    1.21 -BUILD_DEPENDS="advancecomp check-dev flex pam-dev"
    1.22 +SUGGESTED="kbd-lang"
    1.23 +DEPENDS="gcc83-lib-base kbd-base"
    1.24 +BUILD_DEPENDS="advancecomp automake check-dev flex gcc83 pam-dev"
    1.25  
    1.26  HOST_ARCH="i486 arm"
    1.27  
    1.28 @@ -22,6 +23,8 @@
    1.29  	arm) BUILD_DEPENDS="check-dev flex" ;;
    1.30  esac
    1.31  
    1.32 +# @maintainer: Please update also: kbd-base, kbd-busybox, kbd-lang and kbd-vlock
    1.33 +
    1.34  current_version()
    1.35  {
    1.36  	wget -O - https://github.com/legionus/kbd/releases 2>/dev/null | \
    1.37 @@ -32,25 +35,31 @@
    1.38  compile_rules()
    1.39  {
    1.40  	# standard locale placement
    1.41 -	sed -i 's|localedir = .*|localedir = @localedir@|' \
    1.42 -		po/Makefile.in.in
    1.43 +	# 2.4.0 no longer required
    1.44 +#	sed -i 's|localedir = .*|localedir = @localedir@|' \
    1.45 +#		po/Makefile.in.in
    1.46  
    1.47  	# Handle cross compilation.
    1.48  	case "$ARCH" in
    1.49 -		arm)
    1.50 +		(arm)
    1.51  			# No PAM support for ARM
    1.52  			./configure				\
    1.53  				--datadir=/usr/share/kbd	\
    1.54  				--localedir=/usr/share/locale	\
    1.55  				--disable-vlock			\
    1.56 -				$CONFIGURE_ARGS ;;
    1.57 -		i486)
    1.58 +				$CONFIGURE_ARGS
    1.59 +			;;
    1.60 +		(i486)
    1.61  			./configure				\
    1.62 +				CC=gcc-83			\
    1.63 +				CXX=g++-83			\
    1.64  				--datadir=/usr/share/kbd	\
    1.65  				--localedir=/usr/share/locale	\
    1.66 -				$CONFIGURE_ARGS ;;
    1.67 +				$CONFIGURE_ARGS
    1.68 +			;;
    1.69  	esac &&
    1.70 -	make -j 1 &&
    1.71 +
    1.72 +	make &&
    1.73  	make install &&
    1.74  
    1.75  	find $DESTDIR/usr/share/kbd -name '*gz' -exec advdef -z4 {} \;
    1.76 @@ -71,7 +80,7 @@
    1.77  	# Remove files provided by kbd-base and kbd-vlock.
    1.78  	for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list)
    1.79  	  do
    1.80 -		rm -f $fs/usr/share/kbd/keymaps/i386/$keymap
    1.81 +		rm -f			$fs/usr/share/kbd/keymaps/i386/$keymap
    1.82  	  done
    1.83  	rm -rf				$fs/usr/share/kbd/keymaps/include
    1.84  	rm -rf				$fs/usr/share/kbd/keymaps/i386/include