# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1528536298 -10800
# Node ID 23700c523fdbc17f14418e37ee5c78a5dabde514
# Parent  7e99c6e7eb42d40164044b95ef1862a6176af12d
cook, lighttpd/index.cgi: add */share/metainfo/* to the "GNOME goodies" and exclude they from @std; modules/compressor: cache compressed gif's too

diff -r 7e99c6e7eb42 -r 23700c523fdb cook
--- a/cook	Wed Jun 06 15:31:35 2018 +0300
+++ b/cook	Sat Jun 09 12:24:58 2018 +0300
@@ -1562,7 +1562,7 @@
 					/\/share\/devhelp\//d; /\/share\/locale\//d;
 					/\/share\/bash-completion\//d; /\/etc\/bash_completion\.d\//d; /\/lib\/systemd\//d;
 					/\/fonts\.scale$/d; /\/fonts\.dir$/d;
-					/\/share\/appdata\//d; /\/share\/help\//d;
+					/\/share\/appdata\//d; /\/share\/help\//d; /\/share\/metainfo\//d;
 					/\/share\/icons\/hicolor\/[12356][1245][268]*x[12356][1245][268]*\//d;	# 22, 24, 32, 64, 128, 256, 512
 					/\.so\.dbg$/d;
 					' $filelist
diff -r 7e99c6e7eb42 -r 23700c523fdb lighttpd/index.cgi
--- a/lighttpd/index.cgi	Wed Jun 06 15:31:35 2018 +0300
+++ b/lighttpd/index.cgi	Sat Jun 09 12:24:58 2018 +0300
@@ -1721,7 +1721,8 @@
 							/\/share\/locale\// { tag("loc", 4); next }
 							/\.h$/ || /\.a$/ || /\.pc$/ || /\/bin\/.*-config$/ ||
 								/\/Makefile.*$/ { tag("dev", 3); next }
-							/\/share\/help\// || /\/share\/appdata\// { tag("gnm", 6); next }
+							/\/share\/help\// || /\/share\/appdata\// ||
+							/\/share\/metainfo\// { tag("gnm", 6); next }
 							{ tag("???", 1) }
 							' "$orphans" > $table
 
diff -r 7e99c6e7eb42 -r 23700c523fdb modules/compressor
--- a/modules/compressor	Wed Jun 06 15:31:35 2018 +0300
+++ b/modules/compressor	Sat Jun 09 12:24:58 2018 +0300
@@ -366,11 +366,11 @@
 
 	action 'Compressing svg images...'
 
+	the_log="$(mktemp)"
 	if which svgcleaner >/dev/null; then
 		[ "${COOKOPTS/!svgextra/}" == "$COOKOPTS" ] &&
 		opts="--apply-transform-to-paths yes --coordinates-precision 1 --paths-coordinates-precision 1"
 
-		the_log="$(mktemp)"
 		for i in $(IFS=$'\n' find $install -type f -name '*.svg'); do
 			out="$(unset IFS; svgcleaner "$i" "$i" --copy-on-error --quiet \
 				--multipass --remove-unresolved-classes no $opts 2>&1)"
@@ -396,16 +396,21 @@
 
 	action 'Compressing gif images...'
 
+	the_log="$(mktemp)"
 	if which gifsicle >/dev/null; then
-		the_log="$(mktemp)"
 		IFS=$'\n'
 		for i in $(find $install -type f -name '*.gif'); do
-			unset IFS
-			# use intermediate file, if all well ($?=0), then substitute the original
-			if gifsicle -O3 "$i" -o "$i.$$" >> "$the_log" 2>&1; then
-				if [ -s "$i.$$" ]; then mv "$i.$$" "$i"; fi
-			else
-				rm "$i.$$"
+			if ! cached_path=$(query_cache gif "$i"); then
+				unset IFS
+				# use intermediate file, if all well ($?=0), then substitute the original
+				if gifsicle -O3 "$i" -o "$i.$$" >> "$the_log" 2>&1; then
+					if [ -s "$i.$$" ]; then
+						mv "$i.$$" "$i"
+						store_cache "$cached_path" "$i"
+					fi
+				else
+					rm "$i.$$"
+				fi
 			fi
 		done
 	else
@@ -428,11 +433,11 @@
 
 	action 'Compressing ui files...'
 
+	the_log="$(mktemp)"
 	if which xmlstarlet >/dev/null; then
 		size0=$(sizes xml)
 		time0=$(get_time)
 		temp_ui="$(mktemp)"
-		the_log="$(mktemp)"
 		IFS=$'\n'
 		for ui in $(find $install -type f \( -name '*.ui' -o -name '*.glade' \) ); do
 			out="$(xmlstarlet c14n --without-comments "$ui" | xmlstarlet sel -B -t -c '*' > "$temp_ui")"