# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1571302782 -7200
# Node ID fcb1de9af8f7dc52ced7786349ee561a9274ba91
# Parent  a6a314a3e71617262543b8c523dde0c0a7647a49
sylpheed: update $WGET_URL

diff -r a6a314a3e716 -r fcb1de9af8f7 linld/stuff/src/CRTL.ASM
--- a/linld/stuff/src/CRTL.ASM	Wed Oct 16 22:41:02 2019 -0400
+++ b/linld/stuff/src/CRTL.ASM	Thu Oct 17 10:59:42 2019 +0200
@@ -217,8 +217,7 @@
         global  @open$qpxzc:near
         proc    @open$qpxzc near
 
-        global  open:near			; open(bx)
-open:
+open:						; open(bx)
 	ifdef	LONG_FILENAME
 		mov	ax,716Ch
 		push	bx si di
@@ -467,7 +466,7 @@
 		dec	dx
 		dec	dx
 		je	@@done
-		mov	bx,si
+		;mov	bx,si
 		call	@strtol$qpxzc
 		mov	[di],ax
 		mov	[di+2],dx
@@ -1086,12 +1085,16 @@
 ;***************************************************************
 ;_fastcall unsigned long strtol(const char *s);
 ;***************************************************************
+		ifndef	USE_ARGSTR
 	global	@strtol$qpxzc:near
+		endif
 	proc	@strtol$qpxzc near
 
 		ifndef	NO386
+		ifndef	USE_ARGSTR
 		push	si
 		mov	si,bx
+		endif
 		xor	ecx,ecx
 		xor	eax,eax
 		xor	ebx,ebx
@@ -1167,15 +1170,26 @@
 		pop	ax
 		pop	dx
 @@popsiret:
+		ifndef	USE_ARGSTR
 		pop	si
+		endif
 		else
+		ifndef	USE_ARGSTR
 		push	si di
 		xor	ax,ax
 		cwd
 		or	bx,bx
+		else
+		push	di
+		xor	ax,ax
+		cwd
+		or	si,si
+		endif
 		jz	@@goend
 		xchg	ax,di
+		ifndef	USE_ARGSTR
 		mov	si,bx
+		endif
 		lodsb
 		or	al,20h
 		cmp	al,'a'
@@ -1262,7 +1276,11 @@
 @@end:
 		xchg	ax,bx
 @@popdisiret:
+		ifndef	USE_ARGSTR
 		pop	di si
+		else
+		pop	di
+		endif
 		endif
 strtol_ret:
 		ret
diff -r a6a314a3e716 -r fcb1de9af8f7 linld/stuff/src/JUMP.ASM
--- a/linld/stuff/src/JUMP.ASM	Wed Oct 16 22:41:02 2019 -0400
+++ b/linld/stuff/src/JUMP.ASM	Thu Oct 17 10:59:42 2019 +0200
@@ -194,10 +194,10 @@
 		mov	cx,100h		; DS=ES=SS=0100
 		mov	ss,cx
 		mov	es,cx
-		mov	ax,120h		; CS=0120
-		push	ax
+		mov	cl,20h		; CS=0120
+		push	cx
 		push	si		; IP=0000
-		mov	ch,040h		; 500h mini
+		mov	ch,3Fh		; 05h min, 3Fh max
 		rep
 		  movsw
 @@notelks:
diff -r a6a314a3e716 -r fcb1de9af8f7 linld/stuff/src/LOAD.CPP
--- a/linld/stuff/src/LOAD.CPP	Wed Oct 16 22:41:02 2019 -0400
+++ b/linld/stuff/src/LOAD.CPP	Thu Oct 17 10:59:42 2019 +0200
@@ -124,7 +124,7 @@
 struct image_himem imgs[2];
 
 static const char kernel_file_error[] = "Can't use kernel file";
-char *version_string="";
+static char *version_string="";
 char* load_kernel() {
 
     struct	image_himem *m = &pm;
diff -r a6a314a3e716 -r fcb1de9af8f7 linld/stuff/src/TAZBOOT.CPP
--- a/linld/stuff/src/TAZBOOT.CPP	Wed Oct 16 22:41:02 2019 -0400
+++ b/linld/stuff/src/TAZBOOT.CPP	Thu Oct 17 10:59:42 2019 +0200
@@ -138,7 +138,7 @@
 u32 base_himem;
 const char* kernel_name = "bzImage";
 const char* initrd_name;
-char* iso;
+static char* iso;
 
 int main(int argc, char *argv[])
 {
diff -r a6a314a3e716 -r fcb1de9af8f7 linld/stuff/src/VCPI.ASM
--- a/linld/stuff/src/VCPI.ASM	Wed Oct 16 22:41:02 2019 -0400
+++ b/linld/stuff/src/VCPI.ASM	Thu Oct 17 10:59:42 2019 +0200
@@ -312,7 +312,6 @@
 ;***************************************************************
 ;****** Helper: This is where real copy is done
 ;***************************************************************
-	global	do_memcpy_vcpi:near
 label   do_memcpy_vcpi near
 
 ; Note: ss:bp => params
diff -r a6a314a3e716 -r fcb1de9af8f7 linld/stuff/src/pipehole.awk
--- a/linld/stuff/src/pipehole.awk	Wed Oct 16 22:41:02 2019 -0400
+++ b/linld/stuff/src/pipehole.awk	Thu Oct 17 10:59:42 2019 +0200
@@ -76,6 +76,17 @@
 	}
 	 } # file == "himem.cpp"
 	 if (file == "load.cpp") {
+	if (/== 0x200/) isload=13
+	if (isload == 13) {  # LOAD.LST
+		if (/cmp/) {
+			print "	mov	dx,-512"
+			$0="	add	ax,dx"
+		}
+		if (/dx,-512/) {
+			isload=0
+			$0="; " $0
+		}
+	}
 	if (/word ptr \[si\+21\],513$/) isload=11
 	if (isload == 12) {  # LOAD.LST
 		if (/cmp/) next
diff -r a6a314a3e716 -r fcb1de9af8f7 sylpheed-full/receipt
--- a/sylpheed-full/receipt	Wed Oct 16 22:41:02 2019 -0400
+++ b/sylpheed-full/receipt	Thu Oct 17 10:59:42 2019 +0200
@@ -11,7 +11,7 @@
 
 SOURCE="sylpheed"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WGET_URL="https://osdn.net/dl/$SOURCE/$TARBALL"
+WGET_URL="https://dotsrc.dl.osdn.net/osdn/sylpheed/68999/$TARBALL"
 
 PROVIDE="sylpheed"
 DEPENDS="enchant gnupg gpgme gtk+ gtkspell libgpg-error libldap libssl"
diff -r a6a314a3e716 -r fcb1de9af8f7 sylpheed/receipt
--- a/sylpheed/receipt	Wed Oct 16 22:41:02 2019 -0400
+++ b/sylpheed/receipt	Thu Oct 17 10:59:42 2019 +0200
@@ -10,7 +10,7 @@
 WEB_SITE="https://sylpheed.sraoss.jp/en/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="https://osdn.net/dl/$PACKAGE/$TARBALL"
+WGET_URL="https://dotsrc.dl.osdn.net/osdn/sylpheed/68999/$TARBALL"
 
 DEPENDS="gtk+ libffi libssl"
 BUILD_DEPENDS="gtk+-dev openssl-dev"