wok rev 20762

Fix cairo & cadaver
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Feb 13 10:43:31 2019 +0100 (20 months ago)
parents 9501f694872e
children 8ba0c1488f0c
files cadaver/receipt cairo-gl/receipt cairo/receipt linld/stuff/src/CRTL.H syslinux/stuff/iso2exe/Makefile syslinux/stuff/iso2exe/init syslinux/stuff/iso2exe/taziso
line diff
     1.1 --- a/cadaver/receipt	Tue Feb 12 17:49:17 2019 +0100
     1.2 +++ b/cadaver/receipt	Wed Feb 13 10:43:31 2019 +0100
     1.3 @@ -18,6 +18,7 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 +	touch config.rpath
     1.8  	./configure \
     1.9  		--prefix=/usr \
    1.10  		--infodir=/usr/share/info \
     2.1 --- a/cairo-gl/receipt	Tue Feb 12 17:49:17 2019 +0100
     2.2 +++ b/cairo-gl/receipt	Wed Feb 13 10:43:31 2019 +0100
     2.3 @@ -26,6 +26,7 @@
     2.4  # Rules to configure and make the package.
     2.5  compile_rules()
     2.6  {
     2.7 +	sed -i '/index.sgml/d' doc/public/Makefile*
     2.8  	./configure \
     2.9  		--prefix=/usr \
    2.10  		--enable-xcb \
     3.1 --- a/cairo/receipt	Tue Feb 12 17:49:17 2019 +0100
     3.2 +++ b/cairo/receipt	Wed Feb 13 10:43:31 2019 +0100
     3.3 @@ -29,6 +29,7 @@
     3.4  # Rules to configure and make the package.
     3.5  compile_rules()
     3.6  {
     3.7 +	sed -i '/index.sgml/d' doc/public/Makefile*
     3.8  	./configure \
     3.9  		--prefix=/usr \
    3.10  		--enable-xcb \
     4.1 --- a/linld/stuff/src/CRTL.H	Tue Feb 12 17:49:17 2019 +0100
     4.2 +++ b/linld/stuff/src/CRTL.H	Wed Feb 13 10:43:31 2019 +0100
     4.3 @@ -25,7 +25,7 @@
     4.4  extern _fastcall int argstr(const char *s, const char keywords[], const char **var);
     4.5  extern _fastcall int argnum(char *s, const char keywords[], unsigned long *var);
     4.6  extern _fastcall void set_cmdline(const char *filename);
     4.7 -#define strhead(a,b)	(strstr(a,b) != (int) a)
     4.8 +#define strhead(a,b)	(strstr(a,b) != (int) (a))
     4.9  #else
    4.10  extern _fastcall int strhead(const char* a,const char* head);
    4.11  #endif
     5.1 --- a/syslinux/stuff/iso2exe/Makefile	Tue Feb 12 17:49:17 2019 +0100
     5.2 +++ b/syslinux/stuff/iso2exe/Makefile	Wed Feb 13 10:43:31 2019 +0100
     5.3 @@ -19,6 +19,7 @@
     5.4  	./$@ --build boot.com bootiso.bin init win32.exe
     5.5  
     5.6  init.built: bootloader.bin ifmem.bin init
     5.7 +	sed -i 's|^[ \t]*||;s|[ \t]*###.*||;s|^$||' init
     5.8  	./init --build
     5.9  	touch init.built
    5.10  
     6.1 --- a/syslinux/stuff/iso2exe/init	Tue Feb 12 17:49:17 2019 +0100
     6.2 +++ b/syslinux/stuff/iso2exe/init	Wed Feb 13 10:43:31 2019 +0100
     6.3 @@ -569,7 +569,7 @@
     6.4  
     6.5  pxe()
     6.6  {
     6.7 -	gotcdfile "?pxe"
     6.8 +	gotcdfile "?pxe*"
     6.9  	$DIALOG --clear \
    6.10  		--title " Create $(basename $file).exe ? " \
    6.11  		--yes-label "Install" --yesno \
    6.12 @@ -593,7 +593,7 @@
    6.13  from the Web using PXE and HTTP protocols.\n\n
    6.14  Please insert a blank disk in floppy drive.\n
    6.15  " 12 70
    6.16 -	[ $? -eq 0 ] && gotcdfile "?pxe" && mkfloppy $file
    6.17 +	[ $? -eq 0 ] && gotcdfile "?pxe*" && mkfloppy $file
    6.18  }
    6.19  
    6.20  gotposixovl()
    6.21 @@ -868,7 +868,7 @@
    6.22  				l=$(($l + $r))
    6.23  			fi
    6.24  			case "$i:$INITRD" in
    6.25 -				*rootfs.gz:*rootfs.gz,*) continue	# loram
    6.26 +				*rootfs.gz:*rootfs.gz,*) continue	### loram
    6.27  			esac
    6.28  			len="$len $l"; l=0
    6.29  		done
    6.30 @@ -951,8 +951,7 @@
    6.31  	14 70 4 \
    6.32  	$(for i in $DEV ; do
    6.33  		echo -n "/dev/$i \"$(($(cat /sys/block/$i/size)/2048))MB $(cat /sys/block/$i/device/model 2> /dev/null)\" "
    6.34 -	done) \
    6.35 -
    6.36 +	done)
    6.37  EOT
    6.38  	exec 3>&1
    6.39  	device=$(. /tmp/dialog 2>&1 1>&3)
    6.40 @@ -981,7 +980,7 @@
    6.41  	[ $? -eq 0 ] || return
    6.42  	usbdev || return
    6.43  	
    6.44 -	# perform dd in progress bar
    6.45 +	### perform dd in progress bar
    6.46  	max=$(($(cat /sys/block/loop0/size)/2048))
    6.47  	i=0; ddq if=/mnt/$ISO bs=1024k | ( 
    6.48  	while ddq bs=1024k count=1 ; do 
    6.49 @@ -992,7 +991,7 @@
    6.50  			6 70 0 > /dev/tty0 2>&1
    6.51  	done ) > $device
    6.52  
    6.53 -	# partition + fat32 format for the remaining space
    6.54 +	### partition + fat32 format for the remaining space
    6.55  	for p in 0 16; do
    6.56  		get $((450+$p)) $device 2 12 | xargs echo | {
    6.57  		read dx cx ol oh ll lh
    6.58 @@ -1143,18 +1142,21 @@
    6.59  
    6.60  runpxe()
    6.61  {
    6.62 -	gotcdfile "?pxe" && dokexec
    6.63 +	gotcdfile "?pxe*" && dokexec
    6.64  }
    6.65  
    6.66  flavdata()
    6.67  {
    6.68 -	ddq if=/mnt/$ISO bs=512 skip=$((1+$(get 417 /mnt/$ISO 1))) \
    6.69 -		count=20 | zcat 2>/dev/null
    6.70 +	[ $(get 1024 /mnt/$ISO) -eq 35615 ] && n=2 ||
    6.71 +	n=$((1+$(get 417 /mnt/$ISO 1)))
    6.72 +	[ $n -eq 4 ] && n=20
    6.73 +	[ $(get $(($n*512)) /mnt/$ISO) -eq 35615 ] || n=13
    6.74 +	ddq if=/mnt/$ISO bs=512 skip=$n count=20 | zcat 2>/dev/null
    6.75  }
    6.76  
    6.77  hasflavinfo()
    6.78  {
    6.79 -	[ "$(flavdata | ddq bs=1 count=8)" == "07070100" ] &&
    6.80 +	[ "$(flavdata | ddq bs=1 count=7)" == "0707010" ] &&
    6.81  	echo -en "\"$1\"	\"$2\""
    6.82  }
    6.83  
    6.84 @@ -1246,14 +1248,13 @@
    6.85  $(cdexe "memtest*"	"memtest"	"Get Memtest86 DOS/EXE file") \
    6.86  $(cdfilef "memtest*"	"fdmemtest"	"Create a Memtest86 boot floppy") \
    6.87  $(:||cdfilex "memtest*"	"runmemtest"	"Start Memtest86") \
    6.88 -$(cdexe "?pxe"		"pxe"		"Get SliTaz Web boot DOS/EXE utility") \
    6.89 -$(cdfilef "?pxe"	"fdpxe"		"Create a SliTaz Web boot floppy") \
    6.90 -$(:||cdfilex "?pxe"	"runpxe"	"Start the SliTaz Web boot utility") \
    6.91 +$(cdexe "?pxe*"		"pxe"		"Get SliTaz Web boot DOS/EXE utility") \
    6.92 +$(cdfilef "?pxe*"	"fdpxe"		"Create a SliTaz Web boot floppy") \
    6.93 +$(:||cdfilex "?pxe*"	"runpxe"	"Start the SliTaz Web boot utility") \
    6.94  $(xfile reboot		"restart"	"Restart the computer") \
    6.95  $(xfile poweroff	"stop"		"Power off") \
    6.96  			"bootlog"	"Linux boot messages" \
    6.97 -			"shell"		"Shell prompt" \
    6.98 -
    6.99 +			"shell"		"Shell prompt"
   6.100  EOT
   6.101  	exec 3>&1
   6.102  	value=$(. /tmp/dialog 2>&1 1>&3)
     7.1 --- a/syslinux/stuff/iso2exe/taziso	Tue Feb 12 17:49:17 2019 +0100
     7.2 +++ b/syslinux/stuff/iso2exe/taziso	Wed Feb 13 10:43:31 2019 +0100
     7.3 @@ -716,7 +716,7 @@
     7.4  
     7.5  pxe()
     7.6  {
     7.7 -	gotcdfile '?pxe'
     7.8 +	gotcdfile '?pxe*'
     7.9  	if [ -z "$1" ]; then
    7.10  		$DIALOG --clear \
    7.11  			--title " Create $(basename $file).exe ? " \
    7.12 @@ -746,7 +746,7 @@
    7.13  " 0 0
    7.14  		[ $? -eq 0 ] || return
    7.15  	fi
    7.16 -	gotcdfile '?pxe' && mkfloppy $file
    7.17 +	gotcdfile '?pxe*' && mkfloppy $file
    7.18  }
    7.19  
    7.20  menuitem()
    7.21 @@ -1089,7 +1089,7 @@
    7.22  
    7.23  runpxe()
    7.24  {
    7.25 -	gotcdfile '?pxe' && dokexec
    7.26 +	gotcdfile '?pxe*' && dokexec
    7.27  }
    7.28  
    7.29  flavdata()