SliTaz Repositories

     1.1 --- a/cook	Mon Jun 05 15:59:11 2017 +0300
     1.2 +++ b/cook	Tue Jun 06 17:29:00 2017 +0300
     1.3 @@ -432,7 +432,7 @@
     1.4  		if [ -d "$install/usr/share/pixmaps" ]; then
     1.5  			mkdir -p "$fs/usr/share/pixmaps"
     1.6  			for i in png xpm; do
     1.7 -				[ -f "$install/usr/share/pixmaps/$PACKAGE.$i" ] &&
     1.8 +				[ -f "$install/usr/share/pixmaps/$PACKAGE.$i" -a ! -f "$fs/usr/share/pixmaps/$PACKAGE.$i" ] &&
     1.9  				cp -a $install/usr/share/pixmaps/$PACKAGE.$i $fs/usr/share/pixmaps
    1.10  			done
    1.11  		fi
    1.12 @@ -835,10 +835,12 @@
    1.13  
    1.14  	save_PACKAGE="$PACKAGE"; save_DEPENDS="$DEPENDS"; save_PROVIDE="$PROVIDE"
    1.15  	save_SUGGESTED="$SUGGESTED"; save_TAZPANEL_DAEMON="$TAZPANEL_DAEMON"
    1.16 +	save_TAGS="$TAGS"
    1.17  	unset_receipt
    1.18  	. "$orig_receipt"
    1.19  	PACKAGE="$save_PACKAGE"; DEPENDS="$save_DEPENDS"; PROVIDE="$save_PROVIDE"
    1.20  	SUGGESTED="$save_SUGGESTED"; TAZPANEL_DAEMON="$save_TAZPANEL_DAEMON"
    1.21 +	TAGS="$save_TAGS"
    1.22  
    1.23  	# Manage split packages
    1.24  	SPLIT=" $SPLIT "
    1.25 @@ -884,6 +886,7 @@
    1.26  	[ -n "${DEPENDS# }" ] && echo "DEPENDS=\"$DEPENDS\"" | tr -ds '\t' ' '
    1.27  	[ -n "$PROVIDE" ] && echo "PROVIDE=\"$PROVIDE\"" | tr -ds '\t' ' '
    1.28  	[ -n "$CONFIG_FILES" ] && echo "CONFIG_FILES=\"$CONFIG_FILES\"" | tr -ds '\t' ' '
    1.29 +	[ -n "$SUGGESTED" ] && echo "SUGGESTED=\"$SUGGESTED\"" | tr -ds '\t' ' '
    1.30  	[ -n "$DATABASE_FILES" ] && echo "DATABASE_FILES=\"$DATABASE_FILES\""
    1.31  	[ -n "$TAZPANEL_DAEMON" ] && echo "TAZPANEL_DAEMON=\"$TAZPANEL_DAEMON\""
    1.32  
    1.33 @@ -1082,7 +1085,7 @@
    1.34  	set_paths
    1.35  	if head -n1 "$pkgdir/receipt" | fgrep -q 'v2'; then
    1.36  		for i in $PACKAGE $SPLIT; do
    1.37 -			unset TAGS DEPENDS CAT CONFIG_FILES PROVIDE DATABASE_FILES TAZPANEL_DAEMON
    1.38 +			unset TAGS DEPENDS CAT CONFIG_FILES PROVIDE SUGGESTED DATABASE_FILES TAZPANEL_DAEMON
    1.39  			packit $i
    1.40  		done
    1.41  	else
    1.42 @@ -1309,7 +1312,7 @@
    1.43  				# Copy "standard" files (all but "developer files", man pages, documentation, translations)
    1.44  				sed '/\.h$/d; /\.hxx$/d; /\.a$/d; /\.la$/d; /\.pc$/d; /bin\/.*-config$/d;
    1.45  					/\.m4$/d; /\.gir$/d; /\.typelib$/d; /\.vapi$/d; /\.deps$/d; /\.cmake$/d;
    1.46 -					/\/include\//d;
    1.47 +					/\/Makefile.*/d; /\/include\//d;
    1.48  					/\/share\/man\//d; /\/share\/doc\//d; /\/share\/gtk-doc\//d; /\/share\/info\//d;
    1.49  					/\/share\/devhelp\//d; /\/share\/locale\//d;
    1.50  					/\/share\/bash-completion\//d; /\/lib\/systemd\//d;
    1.51 @@ -1319,7 +1322,7 @@
    1.52  				# Copy "developer files"
    1.53  				sed -n '/\.h$/p; /\.hxx$/p; /\.a$/p; /\.la$/p; /\.pc$/p; /bin\/.*-config$/p;
    1.54  					/\.m4$/p; /\.gir$/p; /\.typelib$/p; /\.vapi$/p; /\.deps$/p; /\.cmake$/p;
    1.55 -					/\/include\//p;
    1.56 +					/\/Makefile.*/p; /\/include\//p;
    1.57  					' $filelist
    1.58  				;;
    1.59  			*/)
    1.60 @@ -1348,6 +1351,20 @@
    1.61  }
    1.62  
    1.63  
    1.64 +# Remove from current $fs files that already packed (for receipts v2).
    1.65 +# Note: the order in $SPLIT is very important.
    1.66 +
    1.67 +remove_already_packed() {
    1.68 +	local i j
    1.69 +	for i in $taz/*/files.list; do
    1.70 +		while read j; do
    1.71 +			rm $fs$j
    1.72 +			rmdir --parents --ignore-fail-on-non-empty $fs$(dirname $j)
    1.73 +		done < $i
    1.74 +	done
    1.75 +}
    1.76 +
    1.77 +
    1.78  # Function to use in genpkg_rules() to copy hicolor icons in specified sizes
    1.79  # (default: 16 and 48) from $install to $fs
    1.80  

     2.1 --- a/lighttpd/index.cgi	Mon Jun 05 15:59:11 2017 +0300
     2.2 +++ b/lighttpd/index.cgi	Tue Jun 06 17:29:00 2017 +0300
     2.3 @@ -513,7 +513,7 @@
     2.4  					s|$_install|<span class='var'>\${install}</span>|g;
     2.5  					s|$_fs|<span class='var'>\${fs}</span>|g;
     2.6  					s|$_stuff|<span class='var'>\${stuff}</span>|g" \
     2.7 -				-e "s|\[9\([1-6]\)m|<span class='c\1'>|;
     2.8 +				-e "s|\[9\([1-6]\)m|<span class='c\10'>|;
     2.9  					s|\[39m|</span>|;"
    2.10  			;;
    2.11