wok-6.x rev 21712
get-LibreOffice: fix menu entries
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Jun 09 10:58:25 2019 +0200 (2019-06-09) |
parents | 59c5f6ec84ca |
children | e12ece9707c2 |
files | get-LibreOffice/stuff/get-LibreOffice linld/stuff/src/CRTL.ASM |
line diff
1.1 --- a/get-LibreOffice/stuff/get-LibreOffice Sat Jun 08 15:15:35 2019 +0100 1.2 +++ b/get-LibreOffice/stuff/get-LibreOffice Sun Jun 09 10:58:25 2019 +0200 1.3 @@ -285,6 +285,10 @@ 1.4 1.5 chmod +x \$path_libreoffice/share/xdg/*.desktop 1.6 1.7 + # Fix menu entries 1.8 + sed -i 's|^[Ee]xec=libreoffice[0-9\.]*|Exec=libreoffice|' \ 1.9 + \$path_libreoffice/share/xdg/*.desktop 1.10 + 1.11 # If necessary, recreate links for soffice 1.12 rm -f /usr/bin/soffice 1.13 rm -f /usr/bin/libreoffice
2.1 --- a/linld/stuff/src/CRTL.ASM Sat Jun 08 15:15:35 2019 +0100 2.2 +++ b/linld/stuff/src/CRTL.ASM Sun Jun 09 10:58:25 2019 +0200 2.3 @@ -952,7 +952,9 @@ 2.4 jnz @@next 2.5 mov [(image_himem di).next_chunk],offset next_chunk 2.6 @@next: 2.7 + push di 2.8 call [(image_himem di).next_chunk] ; m->next_chunk() 2.9 + pop di 2.10 else 2.11 @@next: 2.12 call next_chunk 2.13 @@ -973,7 +975,9 @@ 2.14 jnz @@next 2.15 pop [(image_himem di).state] 2.16 ifdef EXTRA 2.17 + push di 2.18 call [(image_himem di).next_chunk] ; m->next_chunk() 2.19 + pop di 2.20 else 2.21 call next_chunk 2.22 endif