# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1550051011 -3600
# Node ID 378b0ba41272af67aa48fd09154def4fbe69c75e
# Parent  9501f694872ef404e114e10174264aff1fa4cdd5
Fix cairo & cadaver

diff -r 9501f694872e -r 378b0ba41272 cadaver/receipt
--- a/cadaver/receipt	Tue Feb 12 17:49:17 2019 +0100
+++ b/cadaver/receipt	Wed Feb 13 10:43:31 2019 +0100
@@ -18,6 +18,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	touch config.rpath
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
diff -r 9501f694872e -r 378b0ba41272 cairo-gl/receipt
--- a/cairo-gl/receipt	Tue Feb 12 17:49:17 2019 +0100
+++ b/cairo-gl/receipt	Wed Feb 13 10:43:31 2019 +0100
@@ -26,6 +26,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	sed -i '/index.sgml/d' doc/public/Makefile*
 	./configure \
 		--prefix=/usr \
 		--enable-xcb \
diff -r 9501f694872e -r 378b0ba41272 cairo/receipt
--- a/cairo/receipt	Tue Feb 12 17:49:17 2019 +0100
+++ b/cairo/receipt	Wed Feb 13 10:43:31 2019 +0100
@@ -29,6 +29,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	sed -i '/index.sgml/d' doc/public/Makefile*
 	./configure \
 		--prefix=/usr \
 		--enable-xcb \
diff -r 9501f694872e -r 378b0ba41272 linld/stuff/src/CRTL.H
--- a/linld/stuff/src/CRTL.H	Tue Feb 12 17:49:17 2019 +0100
+++ b/linld/stuff/src/CRTL.H	Wed Feb 13 10:43:31 2019 +0100
@@ -25,7 +25,7 @@
 extern _fastcall int argstr(const char *s, const char keywords[], const char **var);
 extern _fastcall int argnum(char *s, const char keywords[], unsigned long *var);
 extern _fastcall void set_cmdline(const char *filename);
-#define strhead(a,b)	(strstr(a,b) != (int) a)
+#define strhead(a,b)	(strstr(a,b) != (int) (a))
 #else
 extern _fastcall int strhead(const char* a,const char* head);
 #endif
diff -r 9501f694872e -r 378b0ba41272 syslinux/stuff/iso2exe/Makefile
--- a/syslinux/stuff/iso2exe/Makefile	Tue Feb 12 17:49:17 2019 +0100
+++ b/syslinux/stuff/iso2exe/Makefile	Wed Feb 13 10:43:31 2019 +0100
@@ -19,6 +19,7 @@
 	./$@ --build boot.com bootiso.bin init win32.exe
 
 init.built: bootloader.bin ifmem.bin init
+	sed -i 's|^[ \t]*||;s|[ \t]*###.*||;s|^$||' init
 	./init --build
 	touch init.built
 
diff -r 9501f694872e -r 378b0ba41272 syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Tue Feb 12 17:49:17 2019 +0100
+++ b/syslinux/stuff/iso2exe/init	Wed Feb 13 10:43:31 2019 +0100
@@ -569,7 +569,7 @@
 
 pxe()
 {
-	gotcdfile "?pxe"
+	gotcdfile "?pxe*"
 	$DIALOG --clear \
 		--title " Create $(basename $file).exe ? " \
 		--yes-label "Install" --yesno \
@@ -593,7 +593,7 @@
 from the Web using PXE and HTTP protocols.\n\n
 Please insert a blank disk in floppy drive.\n
 " 12 70
-	[ $? -eq 0 ] && gotcdfile "?pxe" && mkfloppy $file
+	[ $? -eq 0 ] && gotcdfile "?pxe*" && mkfloppy $file
 }
 
 gotposixovl()
@@ -868,7 +868,7 @@
 				l=$(($l + $r))
 			fi
 			case "$i:$INITRD" in
-				*rootfs.gz:*rootfs.gz,*) continue	# loram
+				*rootfs.gz:*rootfs.gz,*) continue	### loram
 			esac
 			len="$len $l"; l=0
 		done
@@ -951,8 +951,7 @@
 	14 70 4 \
 	$(for i in $DEV ; do
 		echo -n "/dev/$i \"$(($(cat /sys/block/$i/size)/2048))MB $(cat /sys/block/$i/device/model 2> /dev/null)\" "
-	done) \
-
+	done)
 EOT
 	exec 3>&1
 	device=$(. /tmp/dialog 2>&1 1>&3)
@@ -981,7 +980,7 @@
 	[ $? -eq 0 ] || return
 	usbdev || return
 	
-	# perform dd in progress bar
+	### perform dd in progress bar
 	max=$(($(cat /sys/block/loop0/size)/2048))
 	i=0; ddq if=/mnt/$ISO bs=1024k | ( 
 	while ddq bs=1024k count=1 ; do 
@@ -992,7 +991,7 @@
 			6 70 0 > /dev/tty0 2>&1
 	done ) > $device
 
-	# partition + fat32 format for the remaining space
+	### partition + fat32 format for the remaining space
 	for p in 0 16; do
 		get $((450+$p)) $device 2 12 | xargs echo | {
 		read dx cx ol oh ll lh
@@ -1143,18 +1142,21 @@
 
 runpxe()
 {
-	gotcdfile "?pxe" && dokexec
+	gotcdfile "?pxe*" && dokexec
 }
 
 flavdata()
 {
-	ddq if=/mnt/$ISO bs=512 skip=$((1+$(get 417 /mnt/$ISO 1))) \
-		count=20 | zcat 2>/dev/null
+	[ $(get 1024 /mnt/$ISO) -eq 35615 ] && n=2 ||
+	n=$((1+$(get 417 /mnt/$ISO 1)))
+	[ $n -eq 4 ] && n=20
+	[ $(get $(($n*512)) /mnt/$ISO) -eq 35615 ] || n=13
+	ddq if=/mnt/$ISO bs=512 skip=$n count=20 | zcat 2>/dev/null
 }
 
 hasflavinfo()
 {
-	[ "$(flavdata | ddq bs=1 count=8)" == "07070100" ] &&
+	[ "$(flavdata | ddq bs=1 count=7)" == "0707010" ] &&
 	echo -en "\"$1\"	\"$2\""
 }
 
@@ -1246,14 +1248,13 @@
 $(cdexe "memtest*"	"memtest"	"Get Memtest86 DOS/EXE file") \
 $(cdfilef "memtest*"	"fdmemtest"	"Create a Memtest86 boot floppy") \
 $(:||cdfilex "memtest*"	"runmemtest"	"Start Memtest86") \
-$(cdexe "?pxe"		"pxe"		"Get SliTaz Web boot DOS/EXE utility") \
-$(cdfilef "?pxe"	"fdpxe"		"Create a SliTaz Web boot floppy") \
-$(:||cdfilex "?pxe"	"runpxe"	"Start the SliTaz Web boot utility") \
+$(cdexe "?pxe*"		"pxe"		"Get SliTaz Web boot DOS/EXE utility") \
+$(cdfilef "?pxe*"	"fdpxe"		"Create a SliTaz Web boot floppy") \
+$(:||cdfilex "?pxe*"	"runpxe"	"Start the SliTaz Web boot utility") \
 $(xfile reboot		"restart"	"Restart the computer") \
 $(xfile poweroff	"stop"		"Power off") \
 			"bootlog"	"Linux boot messages" \
-			"shell"		"Shell prompt" \
-
+			"shell"		"Shell prompt"
 EOT
 	exec 3>&1
 	value=$(. /tmp/dialog 2>&1 1>&3)
diff -r 9501f694872e -r 378b0ba41272 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Tue Feb 12 17:49:17 2019 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Wed Feb 13 10:43:31 2019 +0100
@@ -716,7 +716,7 @@
 
 pxe()
 {
-	gotcdfile '?pxe'
+	gotcdfile '?pxe*'
 	if [ -z "$1" ]; then
 		$DIALOG --clear \
 			--title " Create $(basename $file).exe ? " \
@@ -746,7 +746,7 @@
 " 0 0
 		[ $? -eq 0 ] || return
 	fi
-	gotcdfile '?pxe' && mkfloppy $file
+	gotcdfile '?pxe*' && mkfloppy $file
 }
 
 menuitem()
@@ -1089,7 +1089,7 @@
 
 runpxe()
 {
-	gotcdfile '?pxe' && dokexec
+	gotcdfile '?pxe*' && dokexec
 }
 
 flavdata()