# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1497919921 -10800
# Node ID 5ae6788158f0b46a6ed7177be63c0429e2e17a55
# Parent  60126d568f3db514fd02ad16e5d76a84cad0dc1a
Tiny edits.

diff -r 60126d568f3d -r 5ae6788158f0 cook
--- a/cook	Mon Jun 19 19:00:28 2017 +0100
+++ b/cook	Tue Jun 20 03:52:01 2017 +0300
@@ -543,14 +543,18 @@
 patchit() {
 	[ -f "$stuff/patches/series" ] || return
 
+	IFS=$'\n'
 	while read i; do
-		[ -f "$src/done.$i" ] && continue
+		patchname=$(echo $i | cut -d' ' -f1)		# allow comments (anything after the space)
+		[ -n "$patchname" ] || continue				# allow empty lines
+		[ -f "$src/done.$patchname" ] && continue	# already applied (useful with `cook --continue`)
 		newline
-		_ 'Applying patch %s' "$i"
-		patch -p1 -i $stuff/patches/$i | sed 's|^|  |'
-		touch $src/done.$i
+		_ 'Applying patch %s' "$patchname"
+		patch -Np1 -i $stuff/patches/$patchname | sed 's|^|  |'
+		touch $src/done.$patchname
 	done < $stuff/patches/series
 	newline
+	unset IFS
 }
 
 
diff -r 60126d568f3d -r 5ae6788158f0 lighttpd/cooker.css
--- a/lighttpd/cooker.css	Mon Jun 19 19:00:28 2017 +0100
+++ b/lighttpd/cooker.css	Tue Jun 20 03:52:01 2017 +0300
@@ -337,8 +337,8 @@
 .summary th, .summary td { white-space: nowrap; width: 1rem; text-align: center; }
 .summary th:last-child, .summary td:last-child { width: unset; }
 
-.webstat td { text-align: center; }
-.webstat td:first-child { text-align: unset; }
+.webstat td { text-align: center; width: 16%; }
+.webstat td:first-child { text-align: unset; width: unset; }
 
 div.list td, div.list th { padding: 5px 2px; }
 
diff -r 60126d568f3d -r 5ae6788158f0 lighttpd/index.cgi
--- a/lighttpd/index.cgi	Mon Jun 19 19:00:28 2017 +0100
+++ b/lighttpd/index.cgi	Tue Jun 20 03:52:01 2017 +0300
@@ -487,7 +487,7 @@
 				-e 's#^.*[Nn]o such file.*#<b>\0</b>#' \
 				-e 's#^.*No package .* found.*#<b>\0</b>#' \
 				-e 's#^.*Unable to find.*#<b>\0</b>#' \
-				-e 's#^.*[Ii]nvalid.*#<b>\0</b>#' \
+				-e 's#[^a-zA-Z-][Ii]nvalid.*#<b>\0</b>#' \
 				-e 's#\([Nn][Oo][Tt] found\.*\)$#<b>\1</b>#' \
 				-e 's#\(found\.*\)$#<i>\1</i>#' \
 				\
@@ -591,8 +591,11 @@
 			}
 			function row2(line, rowNum) {
 				split(line, s, " : ");
-				if (rowNum == 1)
+				if (rowNum == 1) {
+					print "<thead>";
 					printf("\t<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", s[1], s[2], s[3], s[4], s[5]);
+					print "</thead><tbody>";
+				}
 				else
 					printf("\t<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n", s[1], s[2], s[3], s[4], s[5]);
 			}
@@ -601,12 +604,12 @@
 				if ($0 ~ "===") { seen++; if (seen == 1) next; else exit; }
 				if ($0 ~ "---") {
 					seen2++;
-					if (seen2 == 1) printf("</table>\n<table class=\"pkgslist\">\n")
+					if (seen2 == 1) print "</table>\n\n<table class=\"pkgslist\">"
 					next
 				}
 				if (seen2) row2($0, seen2); else row($0);
 			}
-			END { print "</table></section>" }
+			END { print "</tbody></table></section>" }
 			'
 		elif fgrep -q "Debug information" $log; then
 			echo -e '<section>\n<h3>Debug information</h3>'
@@ -739,6 +742,10 @@
 # There is no need to recalculate the statistics every time the page is displayed.
 
 update_webstat() {
+	echo '<div id="waitme">'
+	show_note i 'Please wait while statistics are being collected.'
+	echo "</div>"
+
 	# for receipts:
 	rtotal=$(ls $WOK/*/arch.$ARCH | wc -l)
 	rcooked=$(ls -d $WOK/*/taz | wc -l)
@@ -763,6 +770,8 @@
 rtotal="$rtotal"; rcooked="$rcooked"; runbuilt="$runbuilt"; rblocked="$rblocked"; rbroken="$rbroken"
 ptotal="$ptotal"; pcooked="$pcooked"; punbuilt="$punbuilt"; pblocked="$pblocked"; pbroken="$pbroken"
 EOT
+
+	echo '<script>document.getElementById("waitme").remove();</script>'
 }
 
 
@@ -790,10 +799,10 @@
 		done
 
 		if [ -n "$(GET broken)" ]; then
-			echo '<div id="content2">'
+			echo '<section id="content2">'
 			echo "<h2>DB: broken - Packages: $(wc -l < $broken)</h2>"
 			sort $CACHE/broken | sed "s|^[^']*|<a href='$base/\0'>\0</a>|g" | mktable
-			echo '</div>'
+			echo '</section>'
 		fi
 
 		case "$QUERY_STRING" in
diff -r 60126d568f3d -r 5ae6788158f0 modules/deps
--- a/modules/deps	Mon Jun 19 19:00:28 2017 +0100
+++ b/modules/deps	Tue Jun 20 03:52:01 2017 +0300
@@ -23,23 +23,33 @@
 #   * mirror files list has been updated
 #   * local files list has been updated
 
-if [ ! -s $fl   -o   $fl_mirrorz -nt $fl   -o   $fl_local -nt $fl ]; then
-	# unpack mirror files list
-	fl_mirror="$(mktemp)"
-	lzcat $fl_mirrorz > $fl_mirror
+case $(hostname) in
+	# Do we need to use mirror files list?
+	# It useful on casual development on local host, but useless on cooker server
+	# (and slow down list creation a lot).
+	tank)
+		if [ ! -s $fl   -o   $fl_mirrorz -nt $fl   -o   $fl_local -nt $fl ]; then
+			# unpack mirror files list
+			fl_mirror="$(mktemp)"
+			lzcat $fl_mirrorz > $fl_mirror
 
-	# remove packages that exist in local list
-	cut -d: -f1 $fl_local | uniq | \
-	while read package; do
-		sed -i "/^$package: /d" $fl_mirror
-	done
+			# remove packages that exist in local list
+			cut -d: -f1 $fl_local | uniq | \
+			while read package; do
+				sed -i "/^$package: /d" $fl_mirror
+			done
 
-	# combine lists
-	cat $fl_mirror $fl_local > $fl
+			# combine lists
+			cat $fl_mirror $fl_local > $fl
 
-	# clean
-	rm $fl_mirror
-fi
+			# clean
+			rm $fl_mirror
+		fi
+		;;
+	*)
+		[ ! -s $fl   -o   $fl_local -nt $fl ] && cp $fl_local $fl
+		;;
+esac
 
 # recreate "database with *.so files" in the cases:
 #   * if absent
@@ -171,8 +181,12 @@
 			# Requires: glib-2.0 gobject-2.0
 			# Requires.private: gmodule-no-export-2.0
 			# Requires: gobject-2.0,gio-2.0
+			# Requires.private: nspr >= 4.9.2
 			pcs=$(grep '^Requires' $1 | cut -d: -f2 | tr ',' ' ' | tr '\n' ' ')
 			for i in $pcs; do
+				isitlib=$(echo $i | tr -d '<=>0-9.')
+				# if it contains only comparisons, numbers, dot - it is not lib, skip
+				[ -n "$isitlib" ] || continue
 				indb "$i.pc" $db_pc
 			done
 			# Syntax examples: