# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1668879468 0
# Node ID e9e2e1c1770c8d0fd5145158409aaab0a3c8b0e1
# Parent  2ccf00d9c1cdc72f27005b8ce128905669f51a3c
Add libgnt

diff -r 2ccf00d9c1cd -r e9e2e1c1770c libgnt-dev/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libgnt-dev/receipt	Sat Nov 19 17:37:48 2022 +0000
@@ -0,0 +1,20 @@
+# SliTaz package receipt.
+
+PACKAGE="libgnt-dev"
+VERSION="2.14.3"
+CATEGORY="development"
+SHORT_DESC="The GLib Ncurses Toolkit, development files"
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://keep.imfreedom.org/libgnt/libgnt"
+WANTED="libgnt"
+
+DEPENDS="libgnt pkgconfig"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/lib
+	cp -a $install/usr/include $fs/usr/
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+}
diff -r 2ccf00d9c1cd -r e9e2e1c1770c libgnt/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libgnt/receipt	Sat Nov 19 17:37:48 2022 +0000
@@ -0,0 +1,39 @@
+# SliTaz package receipt.
+
+PACKAGE="libgnt"
+VERSION="2.14.3"
+CATEGORY="base-system"
+SHORT_DESC="The GLib Ncurses Toolkit"
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://keep.imfreedom.org/libgnt/libgnt"
+
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="$WEB_SITE/archive/v$VERSION.tar.bz2"
+
+BUILD_DEPENDS="meson ninja gobject-introspection glib-dev libxml2-dev ncurses-dev"
+DEPENDS="libxml2 gobject-introspection glib ncurses"
+
+# What is the latest version available today?
+current_version()
+{
+	wget -O - $WEB_SITE 2>/dev/null | \
+	sed '/">v[0-9]/!d;s|.*>v||;s|</.*||;q'
+}
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	sed -i 's|value: true|value: false|' meson_options.txt
+	meson build --prefix=/usr &&
+	ninja -C build &&
+	ninja -C build install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/lib
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cp -a $install/usr/lib/gnt $fs/usr/lib
+}
diff -r 2ccf00d9c1cd -r e9e2e1c1770c memtest/stuff/unlz4.S
--- a/memtest/stuff/unlz4.S	Fri Nov 18 09:54:27 2022 +0000
+++ b/memtest/stuff/unlz4.S	Sat Nov 19 17:37:48 2022 +0000
@@ -43,16 +43,15 @@
 	lodsb			// get token
 	movb	%al, %bl
 	shrb	$4, %al
-	call	lz4len		// get literal length, %eax < 255
+	call	lz4len		// get literal length
 	subl	%ecx, %edx	// count literal
-	subl	$1+2, %edx	// count token & string address
-#if !defined(FLAT32) && !defined(FLAT16OUT)
-	pushf
+#if !defined(FLAT32) && !defined(FLAT16OUT) && (!defined(FLAT16) || !defined(PARANOIA))
+#define NeedLz4mov
 	call	lz4mov		// copy literals
-	popf
 #else
 	rep movsb
 #endif
+	subl	$1+2, %edx	// count token & string address
 	jle	lz4main
 	lodsw			// get string address
 	xchgw	%ax, %bx
@@ -67,8 +66,25 @@
 	jnc	axok
 	subb	$0x10, %ah
 axok:
+.macro norm	reg
+	movw	%si, \reg
+	andw	$0xF, %si
+	shrw	$4, \reg
+	addw	\reg, %ax
 	movw	%ax, %ds
-	call	lz4mov		// copy string
+	movw	%di, \reg
+	andw	$0xF, %di
+	shrw	$4, \reg
+	movw	%es, %ax
+	addw	\reg, %ax
+	movw	%ax, %es
+.endm 
+# if !defined (NeedLz4mov)
+	norm	%bp
+	rep movsb
+# else
+	call	lz4movStr	// copy string
+# endif
 	popw	%si
 	popw	%ds
 #else
@@ -80,7 +96,7 @@
 #endif
 	jmp	lz4chunk
 
-#if !defined(FLAT32) && !defined(FLAT16OUT)
+#if defined(NeedLz4mov)
 # if defined(PARANOIA)
 lz4movlp:
 	xchgw	%ax, %cx
@@ -90,18 +106,9 @@
 	sub	$0xF0, %ch
 # endif
 lz4mov:
-	movw	%di, %ax
-	andw	$0xF, %di
-	shrw	$4, %ax
-	movw	%es, %bp
-	addw	%ax, %bp
-	movw	%bp, %es
-	movw	%si, %ax
-	andw	$0xF, %si
-	shrw	$4, %ax
-	movw	%ds, %bp
-	addw	%ax, %bp
-	movw	%bp, %ds
+	movw	%ds, %ax
+lz4movStr:
+	norm	%bp
 # if defined(PARANOIA)
 	cmp	$0xFF, %ch	// catch FFFX case
 	jz	lz4movlp
@@ -123,4 +130,3 @@
 	je	lz4len2
 lz4quit:
 	ret
-
diff -r 2ccf00d9c1cd -r e9e2e1c1770c memtest/stuff/unlzsa1.S
--- a/memtest/stuff/unlzsa1.S	Fri Nov 18 09:54:27 2022 +0000
+++ b/memtest/stuff/unlzsa1.S	Sat Nov 19 17:37:48 2022 +0000
@@ -51,13 +51,13 @@
 	jns	lzsa1compressed
 #  if !defined(FLAT32) && !defined(FLAT16OUT)
 	movw	%cx, %dx
-	andb	$0x7F, %ch
-	andw	$0x8000, %dx
-copy32k:
+	movb	$0, %cl
+	movb	$0, %dh
+copytail:
 	call	lzsa1movStr
 	xchg	%dx, %cx
 	incw	%cx
-	loop	copy32k
+	loop	copytail
 #  else
 	movsb			// copy block
 copylp:
@@ -73,6 +73,7 @@
 # if !defined(FLAT32) && !defined(FLAT16)
 	xorw	%cx, %cx
 	call	normalize
+# define NeedNormalize
 # endif
 	addw	%si, %dx
 #endif
@@ -82,7 +83,7 @@
 	shrb	$4, %al		// shift literals length into place
 	movw	$LITERALS_RUN_LEN*256+MIN_LITERALS_SIZE, %cx
 	call	lzsa1len	// %ch = LITERALS_RUN_LEN
-#if !defined(FLAT32) && !defined(FLAT16OUT)
+#if defined(NeedNormalize) && defined(PARANOIA)
 	call	lzsa1movLit	// copy %cx literals from %ds:%si to %es:%di
 #else
 	rep	movsb		// copy %cx literals from %ds:%si to %es:%di
@@ -115,11 +116,29 @@
 	movw	%di, %si
 	addw	%bx, %si
 	movw	%es, %ax
-	jc	dxok
+	jc	axok
 	subb	$0x10, %ah
-dxok:
+axok:
+.macro norm	reg
+	movw	%si, \reg
+	andw	$0xF, %si
+	shrw	$4, \reg
+	addw	\reg, %ax
 	movw	%ax, %ds
+lzsa1movLit:
+	movw	%di, \reg
+	andw	$0xF, %di
+	shrw	$4, \reg
+	movw	%es, %ax
+	addw	\reg, %ax
+	movw	%ax, %es
+.endm 
+# if defined(NeedNormalize) || defined(PARANOIA)
 	call	lzsa1movStr	// copy string
+# else
+	norm	%bp
+	rep movsb
+# endif
 	popw	%si
 	popw	%ds
 #else
@@ -133,11 +152,12 @@
 lzsa1len:			// get length in %ecx
 	andb	%ch, %al
 	cbw			// clear %ah
-	cmpb	%al, %ch
+	cmpb	%ch, %al
 	jne	lzsa1minNumber	// S=0-6, L=0-14
 	lodsb
-	addb	%cl, %ch
-	addb	%ch, %al
+	addb	%ch, %cl
+lzsa1minNumber:
+	addb	%cl, %al
 	jnc	lzsa1gotNumber  // 0-255
 	movb	%al, %ah	// S=256-1791, L=256-3839 or S=256-511, L=256-511
 	jne	lzsa1midNumber
@@ -149,12 +169,8 @@
 	xchgw	%ax, %cx
 lzsa1quit:
 	ret
-lzsa1minNumber:
-	addb	%cl, %al
-	xchgw	%ax, %cx
-	ret
 
-#if !defined(FLAT32) && !defined(FLAT16OUT)
+#if defined(NeedNormalize) || defined(PARANOIA)
 # if defined(PARANOIA)
 lzsa1movlp:
 	decw	%ch
@@ -162,20 +178,9 @@
 	incw	%ch
 # endif
 normalize:
+	movw	%ds, %bp
 lzsa1movStr:
-	movw	%si, %ax
-	andw	$0xF, %si
-	shrw	$4, %ax
-	movw	%ds, %bp
-	addw	%ax, %bp
-	movw	%bp, %ds
-lzsa1movLit:
-	movw	%di, %ax
-	andw	$0xF, %di
-	shrw	$4, %ax
-	movw	%es, %bp
-	addw	%ax, %bp
-	movw	%bp, %es
+	norm	%bp
 # if defined(PARANOIA)
 	cmpb	$0xFF, %ch	// catch FFFX case
 	je	lzsa1movlp
diff -r 2ccf00d9c1cd -r e9e2e1c1770c memtest/stuff/unlzsa2.S
--- a/memtest/stuff/unlzsa2.S	Fri Nov 18 09:54:27 2022 +0000
+++ b/memtest/stuff/unlzsa2.S	Sat Nov 19 17:37:48 2022 +0000
@@ -57,13 +57,13 @@
 	jns	lzsa2compressed
 #  if !defined(FLAT32) && !defined(FLAT16OUT)
 	movw	%cx, %dx
-	andb	$0x7F, %ch
-	andw	$0x8000, %dx
-copy32k:
-	call	lzsa2movStr
+	movb	$0, %cl
+	movb	$0, %dh
+copytail:
+	call	lzsa1movStr
 	xchg	%dx, %cx
 	incw	%cx
-	loop	copy32k
+	loop	copytail
 #  else
 	movsb			// copy block
 copylp:
@@ -79,39 +79,36 @@
 	movw	%cx, %dx
 	xorw	%cx, %cx
 	call	normalize
+# define NeedNormalize
 	addw	%si, %dx
 # else
 	movw	%si, %dx
 	addw	%cx, %dx
 # endif
-	shll	$16, %edx
 #else
 # if !defined(FLAT16)
 	xorw	%cx, %cx
 	call	normalize
+# define NeedNormalize
 # endif
 #endif
-	movb	$1, %dh		// no nibble stored
+	movb	$0, %bh		// no nibble stored
 lzsa2chunk:			// uncompress chunk
 	lodsb			// get token XYZ|LL|MMM
-#if !defined(FLAT32) && !defined(FLAT16OUT)
-	pushw	%ax
-#else
 	movb	%al, %bl	// keep token in bl
-#endif
-	shrb	$3, %al		// shift literals length into place
-	movw	$LITERALS_RUN_LEN*256+MIN_LITERALS_SIZE, %cx
-	call	lzsa2len	// %ch = LITERALS_RUN_LEN
-#if !defined(FLAT32) && !defined(FLAT16OUT)
+	movw	$LITERALS_RUN_LEN+256*MIN_LITERALS_SIZE, %cx
+	shrb	%cl, %al	// shift literals length into place
+	call	lzsa2len	// %cl = LITERALS_RUN_LEN
+#if defined(NeedNormalize) && defined(PARANOIA)
+	pushw	%bp
 	call	lzsa2movLit	// copy %cx literals from %ds:%si to %es:%di
-	popw	%bx
+	popw	%bp
 #else
 	rep	movsb		// copy %cx literals from %ds:%si to %es:%di
 #endif
 #ifndef RAW_FORMAT
 maxsi:
-	shld	$16, %edx, %eax
-	cmpw	%ax, %si
+	cmpw	%dx, %si
 	jae	lzsa2block	// bail if we hit EOD
 #endif
 #ifdef FLAT32
@@ -126,7 +123,7 @@
 	jne	offset_9_bit
 // 00Z 5-bit offset: read a nibble for offset bits 1-4 and use the inverted bit Z of the token as bit 0 of the offset.
 //                   set bits 5-15 of the offset to 1.
-	call	getByteFromNibble
+	call	getByteFromNibbleAndC
 	jmp	get_match_length
 offset_9_bit:
 // 01Z 9-bit offset: read a byte for offset bits 0-7 and use the inverted bit Z for bit 8 of the offset.
@@ -135,14 +132,14 @@
 	jmp	get_match_length_0
 
 getNibble:
-	negb	%dh
+	xorb	$0xF0, %bh	// toggle nibble stored flags
+	movb	%bh, %al
 	jns	gotnibble
 	lodsb
-	movb	%al, %dl
+	movb	$0xF0, %bh
+	orb	%al, %bh
+	shrb	$4, %al
 gotnibble:
-	rolb	$4, %dl
-	movb	%dl, %al
-	andb	$0xF, %al
 lzsa2quit:
 	ret
 
@@ -151,7 +148,7 @@
 //10Z 13-bit offset: read a nibble for offset bits 9-12 and use the inverted bit Z for bit 8 of the offset,
 //                   then read a byte for offset bits 0-7. set bits 13-15 of the offset to 1.
 //                   substract 512 from the offset to get the final value.
-	call	getByteFromNibble
+	call	getByteFromNibbleAndC
 	subb	$2, %al		// substract 512
 	jmp	get_match_length_1
 rep_match_or_16_bit:
@@ -167,8 +164,8 @@
 repeat_match:
 //111 repeat offset: reuse the offset value of the previous match command.
 
-	xchg	AX, BX		// %ax: original token
-	movw	$MATCH_RUN_LEN*256+MIN_MATCH_SIZE, %cx
+	movb	%bl, %al	// %al: original token
+	movw	$MATCH_RUN_LEN+256*MIN_MATCH_SIZE, %cx
 	call	lzsa2len
 #ifdef RAW_FORMAT
 	jz	lzsa2quit	// bail if we hit EOD
@@ -179,11 +176,31 @@
 	movw	%di, %si
 	addw	%bp, %si
 	movw	%es, %ax
-	jc	dxok
+	jc	axok
 	subb	$0x10, %ah
-dxok:
+axok:
+.macro norm	reg
+	movw	%si, \reg
+	andw	$0xF, %si
+	shrw	$4, \reg
+	addw	\reg, %ax
 	movw	%ax, %ds
+lzsa2movLit:
+	movw	%di, \reg
+	andw	$0xF, %di
+	shrw	$4, \reg
+	movw	%es, %ax
+	addw	\reg, %ax
+	movw	%ax, %es
+.endm 
+	pushw	%bp
+# if defined(NeedNormalize) || defined(PARANOIA)
 	call	lzsa2movStr	// copy string
+# else
+	norm	%bp
+	rep movsb
+# endif
+	popw	%bp
 	popw	%si
 	popw	%ds
 #else
@@ -194,7 +211,7 @@
 #endif
 	jmp	lzsa2chunk
 
-getByteFromNibble:
+getByteFromNibbleAndC:
 	pushfw
 	call	getNibble	// get nibble for offset bits 0-3
 	popfw
@@ -202,20 +219,20 @@
 	xorb	$0xE1, %al	// set offset bits 7-5 to 1
 	ret
 
-lzsa2len:			// get length in %ecx
-	andb	%ch, %al
+lzsa2len:			// get length in %cx
+	andb	%cl, %al
 	cbw			// clear %ah
-	cmpb	%al, %ch
+	cmpb	%al, %cl
 	jne	lzsa2minNumber	// S=0-2, L=0-6
 	call	getNibble
 	cmp	$0xF, %al
 	jne	lzsa2noExtraByte
+	addb	%al, %ch
 	lodsb
-	addb	$0xF, %cl
 lzsa2noExtraByte:
-	addb	%ch, %cl
+	addb	%cl, %ch
 lzsa2minNumber:
-	addb	%cl, %al
+	addb	%ch, %al
 	jnc	lzsa2gotNumber  // 0-255
 #if 0
 	je	lzsa2BigNumber
@@ -229,7 +246,7 @@
 	xchgw	%ax, %cx
 	ret
 
-#if !defined(FLAT32) && !defined(FLAT16OUT)
+#if defined(NeedNormalize) || defined(PARANOIA)
 # if defined(PARANOIA)
 lzsa2movlp:
 	decw	%ch
@@ -237,20 +254,9 @@
 	incw	%ch
 # endif
 normalize:
+	movw	%ds, %bp
 lzsa2movStr:
-	movw	%si, %ax
-	andw	$0xF, %si
-	shrw	$4, %ax
-	movw	%ds, %bx
-	addw	%ax, %bx
-	movw	%bx, %ds
-lzsa2movLit:
-	movw	%di, %ax
-	andw	$0xF, %di
-	shrw	$4, %ax
-	movw	%es, %bx
-	addw	%ax, %bx
-	movw	%bx, %es
+	norm	%bp
 # if defined(PARANOIA)
 	cmpb	$0xFF, %ch	// catch FFFX case
 	je	lzsa2movlp
diff -r 2ccf00d9c1cd -r e9e2e1c1770c p2c/receipt
--- a/p2c/receipt	Fri Nov 18 09:54:27 2022 +0000
+++ b/p2c/receipt	Sat Nov 19 17:37:48 2022 +0000
@@ -8,7 +8,7 @@
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://users.fred.net/tds/lab/p2c/"
-WGET_URL="http://users.fred.net/tds/lab/p2c/$TARBALL"
+WGET_URL="http://users.fred.net/tds/lab/p2c/archive/$TARBALL"
 TAGS="pascal"
 
 DEPENDS="perl"
diff -r 2ccf00d9c1cd -r e9e2e1c1770c pidgin/receipt
--- a/pidgin/receipt	Fri Nov 18 09:54:27 2022 +0000
+++ b/pidgin/receipt	Sat Nov 19 17:37:48 2022 +0000
@@ -17,7 +17,7 @@
 BUILD_DEPENDS="cyrus-sasl-dev expat-dev GConf gmp-dev gnutls-dev gtk+-dev
 	intltool libgcrypt-dev libgpg-error-dev libidn-dev libtasn1-dev
 	libxcb-dev libxml2-dev ncursesw-dev nss-dev startup-notification-dev
-	xcb-util-dev"
+	libgnt-dev xcb-util-dev"
 
 # @maintainer:	Please update also libpurple-dev
 
@@ -62,6 +62,8 @@
 		$CONFIGURE_ARGS &&
 	make &&
 	make install
+	cd finch
+	make
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.