wok rev 24697

updated kbd, kbd-base, kbd-busybox and kbd-vlock (2.2.0 -> 2.4.0)
author Hans-G?nter Theisgen
date Sun Mar 13 17:45:34 2022 +0100 (2022-03-13)
parents ce6b8763dcf8
children 7aaca7142a16
files kbd-base/receipt kbd-busybox/receipt kbd-lang/receipt kbd-vlock/receipt kbd/receipt
line diff
     1.1 --- a/kbd-base/receipt	Sun Mar 13 17:05:22 2022 +0100
     1.2 +++ b/kbd-base/receipt	Sun Mar 13 17:45:34 2022 +0100
     1.3 @@ -1,12 +1,12 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="kbd-base"
     1.7 -VERSION="2.2.0"
     1.8 +VERSION="2.4.0"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13 -WEB_SITE="http://kbd-project.org/"
    1.14 +WEB_SITE="https://kbd-project.org/"
    1.15  
    1.16  WANTED="kbd"
    1.17  
     2.1 --- a/kbd-busybox/receipt	Sun Mar 13 17:05:22 2022 +0100
     2.2 +++ b/kbd-busybox/receipt	Sun Mar 13 17:45:34 2022 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="kbd-busybox"
     2.7 -VERSION="2.2.0"
     2.8 +VERSION="2.4.0"
     2.9  CATEGORY="base-system"
    2.10  SHORT_DESC="Keyboard mapping definitions for busybox."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12 @@ -31,5 +31,5 @@
    2.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.14  genpkg_rules()
    2.15  {
    2.16 -	cp -a $install/usr $fs
    2.17 +	cp -a $install/usr	$fs
    2.18  }
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/kbd-lang/receipt	Sun Mar 13 17:45:34 2022 +0100
     3.3 @@ -0,0 +1,17 @@
     3.4 +# SliTaz package receipt.
     3.5 +
     3.6 +PACKAGE="kbd-lang"
     3.7 +VERSION="2.4.0"
     3.8 +CATEGORY="localization"
     3.9 +SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities - localised messages."
    3.10 +MAINTAINER="maintainer@slitaz.org"
    3.11 +LICENSE="GPL2"
    3.12 +WEB_SITE="https://kbd-project.org/"
    3.13 +
    3.14 +WANTED="kbd"
    3.15 +
    3.16 +# Rules to gen a SliTaz package suitable for Tazpkg.
    3.17 +genpkg_rules()
    3.18 +{
    3.19 +	cook_copy_folders	locale
    3.20 +}
     4.1 --- a/kbd-vlock/receipt	Sun Mar 13 17:05:22 2022 +0100
     4.2 +++ b/kbd-vlock/receipt	Sun Mar 13 17:45:34 2022 +0100
     4.3 @@ -1,13 +1,13 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="kbd-vlock"
     4.7 -VERSION="2.2.0"
     4.8 +VERSION="2.4.0"
     4.9  CATEGORY="system-tools"
    4.10  TAGS="console"
    4.11  SHORT_DESC="Vlock - Virtual Console lock program."
    4.12  MAINTAINER="al.bobylev@gmail.com"
    4.13  LICENSE="GPL2"
    4.14 -WEB_SITE="http://kbd-project.org/"
    4.15 +WEB_SITE="https://kbd-project.org/"
    4.16  
    4.17  DEPENDS="pam"
    4.18  WANTED="kbd"
     5.1 --- a/kbd/receipt	Sun Mar 13 17:05:22 2022 +0100
     5.2 +++ b/kbd/receipt	Sun Mar 13 17:45:34 2022 +0100
     5.3 @@ -1,19 +1,20 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="kbd"
     5.7 -VERSION="2.2.0"
     5.8 +VERSION="2.4.0"
     5.9  CATEGORY="system-tools"
    5.10  TAGS="keyboard"
    5.11  SHORT_DESC="Keyboard mapping definitions and tools."
    5.12  MAINTAINER="pankso@slitaz.org"
    5.13  LICENSE="GPL2"
    5.14 -WEB_SITE="http://kbd-project.org/"
    5.15 +WEB_SITE="https://kbd-project.org/"
    5.16  
    5.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
    5.18  WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL"
    5.19  
    5.20 -DEPENDS="kbd-base"
    5.21 -BUILD_DEPENDS="advancecomp check-dev flex pam-dev"
    5.22 +SUGGESTED="kbd-lang"
    5.23 +DEPENDS="gcc83-lib-base kbd-base"
    5.24 +BUILD_DEPENDS="advancecomp automake check-dev flex gcc83 pam-dev"
    5.25  
    5.26  HOST_ARCH="i486 arm"
    5.27  
    5.28 @@ -22,6 +23,8 @@
    5.29  	arm) BUILD_DEPENDS="check-dev flex" ;;
    5.30  esac
    5.31  
    5.32 +# @maintainer: Please update also: kbd-base, kbd-busybox, kbd-lang and kbd-vlock
    5.33 +
    5.34  current_version()
    5.35  {
    5.36  	wget -O - https://github.com/legionus/kbd/releases 2>/dev/null | \
    5.37 @@ -32,25 +35,31 @@
    5.38  compile_rules()
    5.39  {
    5.40  	# standard locale placement
    5.41 -	sed -i 's|localedir = .*|localedir = @localedir@|' \
    5.42 -		po/Makefile.in.in
    5.43 +	# 2.4.0 no longer required
    5.44 +#	sed -i 's|localedir = .*|localedir = @localedir@|' \
    5.45 +#		po/Makefile.in.in
    5.46  
    5.47  	# Handle cross compilation.
    5.48  	case "$ARCH" in
    5.49 -		arm)
    5.50 +		(arm)
    5.51  			# No PAM support for ARM
    5.52  			./configure				\
    5.53  				--datadir=/usr/share/kbd	\
    5.54  				--localedir=/usr/share/locale	\
    5.55  				--disable-vlock			\
    5.56 -				$CONFIGURE_ARGS ;;
    5.57 -		i486)
    5.58 +				$CONFIGURE_ARGS
    5.59 +			;;
    5.60 +		(i486)
    5.61  			./configure				\
    5.62 +				CC=gcc-83			\
    5.63 +				CXX=g++-83			\
    5.64  				--datadir=/usr/share/kbd	\
    5.65  				--localedir=/usr/share/locale	\
    5.66 -				$CONFIGURE_ARGS ;;
    5.67 +				$CONFIGURE_ARGS
    5.68 +			;;
    5.69  	esac &&
    5.70 -	make -j 1 &&
    5.71 +
    5.72 +	make &&
    5.73  	make install &&
    5.74  
    5.75  	find $DESTDIR/usr/share/kbd -name '*gz' -exec advdef -z4 {} \;
    5.76 @@ -71,7 +80,7 @@
    5.77  	# Remove files provided by kbd-base and kbd-vlock.
    5.78  	for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list)
    5.79  	  do
    5.80 -		rm -f $fs/usr/share/kbd/keymaps/i386/$keymap
    5.81 +		rm -f			$fs/usr/share/kbd/keymaps/i386/$keymap
    5.82  	  done
    5.83  	rm -rf				$fs/usr/share/kbd/keymaps/include
    5.84  	rm -rf				$fs/usr/share/kbd/keymaps/i386/include