wok-current rev 21998

sylpheed: update $WGET_URL
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Oct 17 10:59:42 2019 +0200 (2019-10-17)
parents a6a314a3e716
children a5dc7e70b051
files linld/stuff/src/CRTL.ASM linld/stuff/src/JUMP.ASM linld/stuff/src/LOAD.CPP linld/stuff/src/TAZBOOT.CPP linld/stuff/src/VCPI.ASM linld/stuff/src/pipehole.awk sylpheed-full/receipt sylpheed/receipt
line diff
     1.1 --- a/linld/stuff/src/CRTL.ASM	Wed Oct 16 22:41:02 2019 -0400
     1.2 +++ b/linld/stuff/src/CRTL.ASM	Thu Oct 17 10:59:42 2019 +0200
     1.3 @@ -217,8 +217,7 @@
     1.4          global  @open$qpxzc:near
     1.5          proc    @open$qpxzc near
     1.6  
     1.7 -        global  open:near			; open(bx)
     1.8 -open:
     1.9 +open:						; open(bx)
    1.10  	ifdef	LONG_FILENAME
    1.11  		mov	ax,716Ch
    1.12  		push	bx si di
    1.13 @@ -467,7 +466,7 @@
    1.14  		dec	dx
    1.15  		dec	dx
    1.16  		je	@@done
    1.17 -		mov	bx,si
    1.18 +		;mov	bx,si
    1.19  		call	@strtol$qpxzc
    1.20  		mov	[di],ax
    1.21  		mov	[di+2],dx
    1.22 @@ -1086,12 +1085,16 @@
    1.23  ;***************************************************************
    1.24  ;_fastcall unsigned long strtol(const char *s);
    1.25  ;***************************************************************
    1.26 +		ifndef	USE_ARGSTR
    1.27  	global	@strtol$qpxzc:near
    1.28 +		endif
    1.29  	proc	@strtol$qpxzc near
    1.30  
    1.31  		ifndef	NO386
    1.32 +		ifndef	USE_ARGSTR
    1.33  		push	si
    1.34  		mov	si,bx
    1.35 +		endif
    1.36  		xor	ecx,ecx
    1.37  		xor	eax,eax
    1.38  		xor	ebx,ebx
    1.39 @@ -1167,15 +1170,26 @@
    1.40  		pop	ax
    1.41  		pop	dx
    1.42  @@popsiret:
    1.43 +		ifndef	USE_ARGSTR
    1.44  		pop	si
    1.45 +		endif
    1.46  		else
    1.47 +		ifndef	USE_ARGSTR
    1.48  		push	si di
    1.49  		xor	ax,ax
    1.50  		cwd
    1.51  		or	bx,bx
    1.52 +		else
    1.53 +		push	di
    1.54 +		xor	ax,ax
    1.55 +		cwd
    1.56 +		or	si,si
    1.57 +		endif
    1.58  		jz	@@goend
    1.59  		xchg	ax,di
    1.60 +		ifndef	USE_ARGSTR
    1.61  		mov	si,bx
    1.62 +		endif
    1.63  		lodsb
    1.64  		or	al,20h
    1.65  		cmp	al,'a'
    1.66 @@ -1262,7 +1276,11 @@
    1.67  @@end:
    1.68  		xchg	ax,bx
    1.69  @@popdisiret:
    1.70 +		ifndef	USE_ARGSTR
    1.71  		pop	di si
    1.72 +		else
    1.73 +		pop	di
    1.74 +		endif
    1.75  		endif
    1.76  strtol_ret:
    1.77  		ret
     2.1 --- a/linld/stuff/src/JUMP.ASM	Wed Oct 16 22:41:02 2019 -0400
     2.2 +++ b/linld/stuff/src/JUMP.ASM	Thu Oct 17 10:59:42 2019 +0200
     2.3 @@ -194,10 +194,10 @@
     2.4  		mov	cx,100h		; DS=ES=SS=0100
     2.5  		mov	ss,cx
     2.6  		mov	es,cx
     2.7 -		mov	ax,120h		; CS=0120
     2.8 -		push	ax
     2.9 +		mov	cl,20h		; CS=0120
    2.10 +		push	cx
    2.11  		push	si		; IP=0000
    2.12 -		mov	ch,040h		; 500h mini
    2.13 +		mov	ch,3Fh		; 05h min, 3Fh max
    2.14  		rep
    2.15  		  movsw
    2.16  @@notelks:
     3.1 --- a/linld/stuff/src/LOAD.CPP	Wed Oct 16 22:41:02 2019 -0400
     3.2 +++ b/linld/stuff/src/LOAD.CPP	Thu Oct 17 10:59:42 2019 +0200
     3.3 @@ -124,7 +124,7 @@
     3.4  struct image_himem imgs[2];
     3.5  
     3.6  static const char kernel_file_error[] = "Can't use kernel file";
     3.7 -char *version_string="";
     3.8 +static char *version_string="";
     3.9  char* load_kernel() {
    3.10  
    3.11      struct	image_himem *m = &pm;
     4.1 --- a/linld/stuff/src/TAZBOOT.CPP	Wed Oct 16 22:41:02 2019 -0400
     4.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Thu Oct 17 10:59:42 2019 +0200
     4.3 @@ -138,7 +138,7 @@
     4.4  u32 base_himem;
     4.5  const char* kernel_name = "bzImage";
     4.6  const char* initrd_name;
     4.7 -char* iso;
     4.8 +static char* iso;
     4.9  
    4.10  int main(int argc, char *argv[])
    4.11  {
     5.1 --- a/linld/stuff/src/VCPI.ASM	Wed Oct 16 22:41:02 2019 -0400
     5.2 +++ b/linld/stuff/src/VCPI.ASM	Thu Oct 17 10:59:42 2019 +0200
     5.3 @@ -312,7 +312,6 @@
     5.4  ;***************************************************************
     5.5  ;****** Helper: This is where real copy is done
     5.6  ;***************************************************************
     5.7 -	global	do_memcpy_vcpi:near
     5.8  label   do_memcpy_vcpi near
     5.9  
    5.10  ; Note: ss:bp => params
     6.1 --- a/linld/stuff/src/pipehole.awk	Wed Oct 16 22:41:02 2019 -0400
     6.2 +++ b/linld/stuff/src/pipehole.awk	Thu Oct 17 10:59:42 2019 +0200
     6.3 @@ -76,6 +76,17 @@
     6.4  	}
     6.5  	 } # file == "himem.cpp"
     6.6  	 if (file == "load.cpp") {
     6.7 +	if (/== 0x200/) isload=13
     6.8 +	if (isload == 13) {  # LOAD.LST
     6.9 +		if (/cmp/) {
    6.10 +			print "	mov	dx,-512"
    6.11 +			$0="	add	ax,dx"
    6.12 +		}
    6.13 +		if (/dx,-512/) {
    6.14 +			isload=0
    6.15 +			$0="; " $0
    6.16 +		}
    6.17 +	}
    6.18  	if (/word ptr \[si\+21\],513$/) isload=11
    6.19  	if (isload == 12) {  # LOAD.LST
    6.20  		if (/cmp/) next
     7.1 --- a/sylpheed-full/receipt	Wed Oct 16 22:41:02 2019 -0400
     7.2 +++ b/sylpheed-full/receipt	Thu Oct 17 10:59:42 2019 +0200
     7.3 @@ -11,7 +11,7 @@
     7.4  
     7.5  SOURCE="sylpheed"
     7.6  TARBALL="$SOURCE-$VERSION.tar.bz2"
     7.7 -WGET_URL="https://osdn.net/dl/$SOURCE/$TARBALL"
     7.8 +WGET_URL="https://dotsrc.dl.osdn.net/osdn/sylpheed/68999/$TARBALL"
     7.9  
    7.10  PROVIDE="sylpheed"
    7.11  DEPENDS="enchant gnupg gpgme gtk+ gtkspell libgpg-error libldap libssl"
     8.1 --- a/sylpheed/receipt	Wed Oct 16 22:41:02 2019 -0400
     8.2 +++ b/sylpheed/receipt	Thu Oct 17 10:59:42 2019 +0200
     8.3 @@ -10,7 +10,7 @@
     8.4  WEB_SITE="https://sylpheed.sraoss.jp/en/"
     8.5  
     8.6  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     8.7 -WGET_URL="https://osdn.net/dl/$PACKAGE/$TARBALL"
     8.8 +WGET_URL="https://dotsrc.dl.osdn.net/osdn/sylpheed/68999/$TARBALL"
     8.9  
    8.10  DEPENDS="gtk+ libffi libssl"
    8.11  BUILD_DEPENDS="gtk+-dev openssl-dev"