wok-next rev 20422

Up p11-kit (0.23.8 + v2), qarma (171125 + qt5)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jan 12 14:24:49 2018 +0200 (2018-01-12)
parents e8b34fc436f0
children 3ae7a9a4ea36
files p11-kit-dev/receipt p11-kit/receipt qarma/receipt
line diff
     1.1 --- a/p11-kit-dev/receipt	Thu Jan 11 21:13:16 2018 +0100
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,18 +0,0 @@
     1.4 -# SliTaz package receipt.
     1.5 -
     1.6 -PACKAGE="p11-kit-dev"
     1.7 -VERSION="0.23.2"
     1.8 -CATEGORY="development"
     1.9 -SHORT_DESC="Library to work with PKCS#11 modules (development files)"
    1.10 -MAINTAINER="slaxemulator@gmail.com"
    1.11 -LICENSE="BSD"
    1.12 -WEB_SITE="https://p11-glue.freedesktop.org/"
    1.13 -
    1.14 -WANTED="p11-kit"
    1.15 -DEPENDS="p11-kit glibc-dev libffi-dev libtasn1-dev"
    1.16 -
    1.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.18 -genpkg_rules()
    1.19 -{
    1.20 -	copy *.h *.la *.pc
    1.21 -}
     2.1 --- a/p11-kit/receipt	Thu Jan 11 21:13:16 2018 +0100
     2.2 +++ b/p11-kit/receipt	Fri Jan 12 14:24:49 2018 +0200
     2.3 @@ -1,30 +1,43 @@
     2.4 -# SliTaz package receipt.
     2.5 +# SliTaz package receipt v2.
     2.6  
     2.7  PACKAGE="p11-kit"
     2.8 -VERSION="0.23.2"
     2.9 +VERSION="0.23.8"
    2.10  CATEGORY="security"
    2.11 -LICENSE="BSD"
    2.12  SHORT_DESC="Library to work with PKCS#11 modules"
    2.13  MAINTAINER="slaxemulator@gmail.com"
    2.14 +LICENSE="BSD"
    2.15  WEB_SITE="https://p11-glue.freedesktop.org/"
    2.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/p11-kit.html"
    2.17  
    2.18  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.19 -WGET_URL="http://p11-glue.freedesktop.org/releases/$TARBALL"
    2.20 +WGET_URL="https://github.com/p11-glue/p11-kit/releases/download/$VERSION/$TARBALL"
    2.21  
    2.22 -DEPENDS="libffi libtasn1"
    2.23  BUILD_DEPENDS="gettext libtasn1-dev gtk-doc libxslt cacerts"
    2.24 +SPLIT="libp11-kit p11-kit p11-kit-dev"
    2.25  
    2.26 -# Rules to configure and make the package.
    2.27 -compile_rules()
    2.28 -{
    2.29 +compile_rules() {
    2.30 +	fix ld
    2.31  	./configure \
    2.32  		--sysconfdir=/etc \
    2.33 +		--with-trust-paths=/etc/pki/anchors \
    2.34  		$CONFIGURE_ARGS &&
    2.35 +	fix libtool &&
    2.36  	make && make install
    2.37  }
    2.38  
    2.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.40 -genpkg_rules()
    2.41 -{
    2.42 -	copy etc/ bin/ p11-kit/ *.so*
    2.43 +genpkg_rules() {
    2.44 +	case $PACKAGE in
    2.45 +		libp11-kit)
    2.46 +			copy libp11-kit.so* /usr/lib/p11-kit-proxy.so
    2.47 +			DEPENDS="libffi"
    2.48 +			;;
    2.49 +		p11-kit)
    2.50 +			copy @std @rm
    2.51 +			DEPENDS="libffi libp11-kit libtasn1"
    2.52 +			;;
    2.53 +		*-dev)
    2.54 +			copy @dev
    2.55 +			DEPENDS="p11-kit libffi-dev libtasn1-dev"
    2.56 +			;;
    2.57 +	esac
    2.58  }
     3.1 --- a/qarma/receipt	Thu Jan 11 21:13:16 2018 +0100
     3.2 +++ b/qarma/receipt	Fri Jan 12 14:24:49 2018 +0200
     3.3 @@ -1,28 +1,35 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="qarma"
     3.8 -GITHASH="cdb5319c6e90a045012b9b2059e507b6721e67ba"
     3.9 -VERSION=${GITHASH:0:7}
    3.10 +VERSION="171125"
    3.11 +COMMIT="27606a8"
    3.12  CATEGORY="utilities"
    3.13 -SHORT_DESC="Zenity Clone for Qt4/Qt5"
    3.14 +SHORT_DESC="Zenity Clone for Qt"
    3.15  MAINTAINER="al.bobylev@gmail.com"
    3.16  LICENSE="GPL2"
    3.17  WEB_SITE="https://github.com/luebking/qarma"
    3.18 +
    3.19  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.20 -WGET_URL="https://github.com/luebking/qarma/archive/$GITHASH.tar.gz"
    3.21 +WGET_URL="https://github.com/luebking/qarma/archive/$COMMIT.tar.gz"
    3.22  
    3.23 -DEPENDS="libQtDBus libQtGui"
    3.24 -BUILD_DEPENDS="Qt4-dev qmake xorg-libX11-dev wget"
    3.25 +BUILD_DEPENDS="qt5-dev xorg-libX11-dev"
    3.26  
    3.27 -# Rules to configure and make the package.
    3.28 -compile_rules()
    3.29 -{
    3.30 -	qmake
    3.31 -	make
    3.32 +compile_rules() {
    3.33 +	qmake &&
    3.34 +	# size 191236 -> 187140
    3.35 +	sed -i 's|-O1|-Os|' Makefile &&
    3.36 +	make &&
    3.37 +	make INSTALL_ROOT=$install install
    3.38  }
    3.39  
    3.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.41 -genpkg_rules()
    3.42 -{
    3.43 -	install -Dm755 $src/qarma $fs/usr/bin/qarma
    3.44 +genpkg_rules() {
    3.45 +	copy @std
    3.46 +	DEPENDS="libatomic mesa17 qt5-base qt5-x11extras xorg-libX11"
    3.47  }
    3.48 +
    3.49 +post_install() {
    3.50 +	[ -e "$1/usr/bin/zenity" ] || ln -s qarma "$1/usr/bin/zenity"
    3.51 +}
    3.52 +post_remove() {
    3.53 +	[ ! -h "$1/usr/bin/zenity" ] || rm "$1/usr/bin/zenity"
    3.54 +}