wok-next rev 20409

lxde-icon-theme-base: fix loop depends; lxqt: add lxmenu-data to dependencies; ntfs-3g: tiny edits.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Jan 06 16:41:02 2018 +0200 (20 months ago)
parents 71a9af106745
children 7975a302b55c
files lxde-icon-theme/receipt lxqt/receipt ntfs-3g/receipt
line diff
     1.1 --- a/lxde-icon-theme/receipt	Sat Dec 23 15:54:20 2017 +0200
     1.2 +++ b/lxde-icon-theme/receipt	Sat Jan 06 16:41:02 2018 +0200
     1.3 @@ -7,6 +7,7 @@
     1.4  MAINTAINER="al.bobylev@gmail.com"
     1.5  LICENSE="LGPL3"
     1.6  WEB_SITE="http://www.lxde.org/"
     1.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/lxde-icon-theme.html"
     1.8  
     1.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.10  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
    1.11 @@ -14,25 +15,20 @@
    1.12  BUILD_DEPENDS="coreutils-operations"
    1.13  SPLIT="lxde-icon-theme-base lxde-icon-theme"
    1.14  
    1.15 -# Rules to configure and make the package.
    1.16 -compile_rules()
    1.17 -{
    1.18 -	# http://www.linuxfromscratch.org/blfs/view/stable/x/lxde-icon-theme.html
    1.19 +compile_rules() {
    1.20  	./configure $CONFIGURE_ARGS && make && make install
    1.21  }
    1.22  
    1.23 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.24 -genpkg_rules()
    1.25 -{
    1.26 +genpkg_rules() {
    1.27  	TAGS="LXDE"
    1.28  	case $PACKAGE in
    1.29  		*-base)
    1.30  			copy 16x16/ 48x48/ icon.theme
    1.31  			CAT="customization|16 and 48 sizes only"
    1.32 +			DEPENDS="hicolor-icon-theme"
    1.33  			;;
    1.34  		*-theme)
    1.35 -			copy @std
    1.36 -			remove_already_packed
    1.37 +			copy @std @rm
    1.38  			DEPENDS="lxde-icon-theme-base"
    1.39  			;;
    1.40  	esac
     2.1 --- a/lxqt/receipt	Sat Dec 23 15:54:20 2017 +0200
     2.2 +++ b/lxqt/receipt	Sat Jan 06 16:41:02 2018 +0200
     2.3 @@ -13,7 +13,7 @@
     2.4  lxqt-about lxqt-admin lxqt-config lxqt-globalkeys lxqt-l10n lxqt-notificationd \
     2.5  lxqt-openssh-askpass lxqt-panel lxqt-policykit lxqt-powermanagement \
     2.6  lxqt-qtplugin lxqt-runner lxqt-session lxqt-sudo lxqt-themes pavucontrol-qt \
     2.7 -pcmanfm-qt qterminal qtermwidget   \
     2.8 +pcmanfm-qt qterminal qtermwidget lxmenu-data   \
     2.9  gvfs gvfs-udisks2 openbox qlipper xorg-xprop xorg-xset"
    2.10  # still Qt4: obconf-qt lxqt-config-randr lxqt-appswitcher
    2.11  
    2.12 @@ -33,9 +33,9 @@
    2.13  	done
    2.14  
    2.15  	for a in lxpanel pcmanfm tazpkg-notify xcompmgr; do
    2.16 -		if [ -e "$1/etc/xdg/autostart/$a.desktop" -a \
    2.17 -			! grep -q LXQt "$1/etc/xdg/autostart/$a.desktop" ]; then
    2.18 -			sed '/NotShowIn=/s|;$|&LXQt;|' -i "$1/etc/xdg/autostart/$a.desktop"
    2.19 +		if [ -e "$1/etc/xdg/autostart/$a.desktop" ]; then
    2.20 +			grep -q LXQt "$1/etc/xdg/autostart/$a.desktop" ||
    2.21 +			sed -i '/NotShowIn=/ s|;$|&LXQt;|' "$1/etc/xdg/autostart/$a.desktop"
    2.22  		fi
    2.23  	done
    2.24  }
     3.1 --- a/ntfs-3g/receipt	Sat Dec 23 15:54:20 2017 +0200
     3.2 +++ b/ntfs-3g/receipt	Sat Jan 06 16:41:02 2018 +0200
     3.3 @@ -7,6 +7,7 @@
     3.4  MAINTAINER="pankso@slitaz.org"
     3.5  LICENSE="GPL2 LGPL2"
     3.6  WEB_SITE="https://www.tuxera.com/community/open-source-ntfs-3g/"
     3.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/ntfs-3g.html"
     3.8  
     3.9  TARBALL="ntfs-3g_ntfsprogs-$VERSION.tgz"
    3.10  WGET_URL="https://tuxera.com/opensource/$TARBALL"
    3.11 @@ -14,11 +15,7 @@
    3.12  BUILD_DEPENDS="util-linux-uuid-dev libtool"
    3.13  SPLIT="ntfsprogs ntfsprogs-extra ntfs-3g ntfs-3g-dev"
    3.14  
    3.15 -# Rules to configure and make the package.
    3.16 -compile_rules()
    3.17 -{
    3.18 -	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/ntfs-3g.html
    3.19 -
    3.20 +compile_rules() {
    3.21  	touch $src/libtoolT
    3.22  
    3.23  	./configure \
    3.24 @@ -33,9 +30,7 @@
    3.25  	ln -s mount.ntfs-3g $install/sbin/mount.ntfs
    3.26  }
    3.27  
    3.28 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.29 -genpkg_rules()
    3.30 -{
    3.31 +genpkg_rules() {
    3.32  	TAGS="windows"
    3.33  	case $PACKAGE in
    3.34  		ntfsprogs)
    3.35 @@ -50,8 +45,7 @@
    3.36  			DEPENDS="ntfs-3g"
    3.37  			;;
    3.38  		ntfs-3g)
    3.39 -			copy @std
    3.40 -			remove_already_packed
    3.41 +			copy @std @rm
    3.42  			CONFIG_FILES="/etc/filesystems"
    3.43  			DEPENDS=" "
    3.44  			;;