wok rev 21758

Update icevm & obex-data-server websites
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jun 26 17:24:54 2019 +0200 (2019-06-26)
parents 2373992ff751
children 8710e9c81dd7
files icewm/receipt linld/stuff/src/A20.ASM linld/stuff/src/COMMON.H linld/stuff/src/LOAD.CPP linld/stuff/src/_BEG.ASM linld/stuff/src/pipehole.awk obex-data-server/receipt
line diff
     1.1 --- a/icewm/receipt	Mon Jun 24 16:31:09 2019 +0200
     1.2 +++ b/icewm/receipt	Wed Jun 26 17:24:54 2019 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  MAINTAINER="devl547@gmail.com"
     1.5  LICENSE="GPL2"
     1.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.7 -WEB_SITE="http://www.icewm.org/"
     1.8 +WEB_SITE="https://ice-wm.org/"
     1.9  WGET_URL="$SF_MIRROR/icewm/icewm-${VERSION%.*}/$VERSION/$TARBALL"
    1.10  TAGS="window-manager"
    1.11  
     2.1 --- a/linld/stuff/src/A20.ASM	Mon Jun 24 16:31:09 2019 +0200
     2.2 +++ b/linld/stuff/src/A20.ASM	Wed Jun 26 17:24:54 2019 +0200
     2.3 @@ -17,6 +17,11 @@
     2.4  		dw	_enable_a20_fast, _enable_a20_kbd, _enable_a20_xmm, die
     2.5  msg_a20		db	"Can't use A20",0
     2.6  overflow	db	"Loaded too close to 9000:0",0
     2.7 +	global	sssp:dword
     2.8 +	global	_initrd_desc:dword
     2.9 +_initrd_desc	dd	90000218h
    2.10 +		org	$-4
    2.11 +sssp		dd	?
    2.12  
    2.13          ends    _DATA
    2.14  
    2.15 @@ -91,17 +96,12 @@
    2.16  	global	@moverm$qp11image_himem:near
    2.17  @moverm$qp11image_himem:
    2.18  		push	si di
    2.19 -		global	sssp:dword
    2.20  		extrn	_heap_top:word
    2.21  		ifdef	NO386
    2.22  		extrn	_topseg:near
    2.23  		call	near _topseg
    2.24  		mov	cl,4
    2.25 -		org	$-4
    2.26 -sssp		dd	?
    2.27  		mov	[word sssp+2],ax
    2.28 -		;extrn	_initrd_desc:dword
    2.29 -		;mov	[word _initrd_desc+2],ax
    2.30  		xchg	ax,dx
    2.31  		mov	ax,[_heap_top]
    2.32  		shr	ax,cl
    2.33 @@ -110,8 +110,6 @@
    2.34  		mov	ax,[_heap_top]
    2.35  		shr	ax,4
    2.36  		mov	dx,9000h
    2.37 -		org	$-4
    2.38 -sssp		dd	?
    2.39  		endif
    2.40  		mov	es,dx
    2.41  		mov	cx,cs
     3.1 --- a/linld/stuff/src/COMMON.H	Mon Jun 24 16:31:09 2019 +0200
     3.2 +++ b/linld/stuff/src/COMMON.H	Wed Jun 26 17:24:54 2019 +0200
     3.3 @@ -56,6 +56,7 @@
     3.4  
     3.5  extern int skip_alloc;
     3.6  extern u32 base_himem;
     3.7 +extern u32 far *initrd_desc;
     3.8  
     3.9  extern _fastcall void memcpy_image(struct image_himem *m);
    3.10  extern _fastcall void storepage(u32 *dst);
     4.1 --- a/linld/stuff/src/LOAD.CPP	Mon Jun 24 16:31:09 2019 +0200
     4.2 +++ b/linld/stuff/src/LOAD.CPP	Wed Jun 26 17:24:54 2019 +0200
     4.3 @@ -122,7 +122,6 @@
     4.4  static u8 pm_high;	// @ = @rm_size + 2, see JUMP.ASM
     4.5  static u8* rm_buf;	// @ = @rm_size + 3, see JUMP.ASM
     4.6  struct image_himem imgs[2];
     4.7 -u32 far *initrd_desc = (u32 far *) MK_FP(0x9000,0x218);
     4.8  
     4.9  static const char kernel_file_error[] = "Can't use kernel file";
    4.10  char *version_string="";
     5.1 --- a/linld/stuff/src/_BEG.ASM	Mon Jun 24 16:31:09 2019 +0200
     5.2 +++ b/linld/stuff/src/_BEG.ASM	Wed Jun 26 17:24:54 2019 +0200
     5.3 @@ -146,7 +146,7 @@
     5.4  		;call	_get_vcpi_interface
     5.5  		mov	bx,offset msg_badmapping
     5.6  		jnz	no_vcpi
     5.7 -		inc	[word bx+_vcpi-msg_badmapping]
     5.8 +		inc	[byte bx+_vcpi-msg_badmapping]
     5.9  endcpu386:
    5.10  		ifdef	EXTRA
    5.11  		pushfd
     6.1 --- a/linld/stuff/src/pipehole.awk	Mon Jun 24 16:31:09 2019 +0200
     6.2 +++ b/linld/stuff/src/pipehole.awk	Wed Jun 26 17:24:54 2019 +0200
     6.3 @@ -65,7 +65,7 @@
     6.4  		sub(/dx,cs/,"edx,cs")
     6.5  		sub(/eax/,"edx")
     6.6  		sub(/ax,9/,"dx,9")
     6.7 -		if (/,0/) sub(/,0/,",dh")
     6.8 +		if (/,0$/) sub(/,0/,",dh")
     6.9  		if (/movzx/) next
    6.10  		if (/fallback = base_himem/) { isload=0 }
    6.11  	}
     7.1 --- a/obex-data-server/receipt	Mon Jun 24 16:31:09 2019 +0200
     7.2 +++ b/obex-data-server/receipt	Wed Jun 26 17:24:54 2019 +0200
     7.3 @@ -6,7 +6,7 @@
     7.4  SHORT_DESC="D-Bus service providing high-level OBEX functionality."
     7.5  MAINTAINER="pascal.bellard@slitaz.org"
     7.6  LICENSE="GPL2"
     7.7 -WEB_SITE="http://tadas.dailyda.com/"
     7.8 +WEB_SITE="https://web.archive.org/web/20181010135741/http://wiki.muiline.com/obex-data-server"
     7.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
    7.10  WGET_URL="$WEB_SITE/software/$TARBALL"
    7.11  TAGS="bluetooth"