# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1560070705 -7200
# Node ID 36cb14e87ba5173d010131c3437d12192d8a2497
# Parent  59c5f6ec84cab299856cd12e3c5b23b69db36475
get-LibreOffice: fix menu entries

diff -r 59c5f6ec84ca -r 36cb14e87ba5 get-LibreOffice/stuff/get-LibreOffice
--- a/get-LibreOffice/stuff/get-LibreOffice	Sat Jun 08 15:15:35 2019 +0100
+++ b/get-LibreOffice/stuff/get-LibreOffice	Sun Jun 09 10:58:25 2019 +0200
@@ -285,6 +285,10 @@
 
 	chmod +x \$path_libreoffice/share/xdg/*.desktop
 
+	# Fix menu entries
+	sed -i 's|^[Ee]xec=libreoffice[0-9\.]*|Exec=libreoffice|'	\
+		\$path_libreoffice/share/xdg/*.desktop
+
         # If necessary, recreate links for soffice
 	rm -f /usr/bin/soffice
 	rm -f /usr/bin/libreoffice
diff -r 59c5f6ec84ca -r 36cb14e87ba5 linld/stuff/src/CRTL.ASM
--- a/linld/stuff/src/CRTL.ASM	Sat Jun 08 15:15:35 2019 +0100
+++ b/linld/stuff/src/CRTL.ASM	Sun Jun 09 10:58:25 2019 +0200
@@ -952,7 +952,9 @@
 		jnz	@@next
 		mov	[(image_himem di).next_chunk],offset next_chunk
 @@next:
+		push	di
                 call	[(image_himem di).next_chunk]	; m->next_chunk()
+                pop	di
 		else
 @@next:
 		call	next_chunk
@@ -973,7 +975,9 @@
 		jnz	@@next
                 pop	[(image_himem di).state]
 		ifdef	EXTRA
+		push	di
                 call	[(image_himem di).next_chunk]	; m->next_chunk()
+                pop	di
 		else
 		call	next_chunk
 		endif