# HG changeset patch # User Pascal Bellard # Date 1664785731 0 # Node ID 4c101652eb9065ab7f7ae4e6b3f34ac6d8322398 # Parent 942f66f3875874a184f0fcdcd6e3722c65c0b290 Up gnumeric (1.12.53) diff -r 942f66f38758 -r 4c101652eb90 BootProg/stuff/boot16.asm --- a/BootProg/stuff/boot16.asm Sat Oct 01 09:32:27 2022 +0000 +++ b/BootProg/stuff/boot16.asm Mon Oct 03 08:28:51 2022 +0000 @@ -90,6 +90,7 @@ Over2GB equ 1 ; +5 bytes GeometryCheck equ 1 ; +18 bytes SectorOf512Bytes equ 1 ; -4/-6 bytes +CheckAttrib equ 0 ; +6 bytes [BITS 16] [CPU 8086] @@ -271,6 +272,13 @@ mov cl, NameLength mov si, ProgramName ; ds:si -> program name repe cmpsb +%if CheckAttrib != 0 +VolumeLabel equ 8 +SubDirectory equ 10h + jnz SkipFindName + test byte [es:di], VolumeLabel+SubDirectory +SkipFindName: +%endif pop di je FindNameFound %if NullEntryCheck != 0 diff -r 942f66f38758 -r 4c101652eb90 BootProg/stuff/boot32.asm --- a/BootProg/stuff/boot32.asm Sat Oct 01 09:32:27 2022 +0000 +++ b/BootProg/stuff/boot32.asm Mon Oct 03 08:28:51 2022 +0000 @@ -88,6 +88,7 @@ CHSupTo32MB equ 1 ; +7 bytes SectorOf512Bytes equ 1 ; -5 bytes Always2FATs equ 0 ; -4 bytes +CheckAttrib equ 0 ; +6 bytes [BITS 16] @@ -234,6 +235,13 @@ mov cl, NameLength mov si, ProgramName ; ds:si -> program name repe cmpsb +%if CheckAttrib != 0 +VolumeLabel equ 8 +SubDirectory equ 10h + jnz SkipFindName + test byte [es:di], VolumeLabel+SubDirectory +SkipFindName: +%endif je FindNameFound popa add di, byte 32 diff -r 942f66f38758 -r 4c101652eb90 BootProg/stuff/bootex.asm --- a/BootProg/stuff/bootex.asm Sat Oct 01 09:32:27 2022 +0000 +++ b/BootProg/stuff/bootex.asm Mon Oct 03 08:28:51 2022 +0000 @@ -81,6 +81,7 @@ NullEntryCheck equ 1 ; +3 bytes ReadRetry equ 1 ; +8 bytes SectorOf512Bytes equ 1 ; -13 bytes +CheckAttrib equ 0 ; +6 bytes [BITS 16] [CPU 386] @@ -197,7 +198,8 @@ ;; dword [bx+FileSize] file size ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -CurNameSize equ 3 ; 1 byte +CurNameSize equ 03h ; 1 byte +Attributes equ 0Bh ; 1 byte StartCluster equ 14h ; 4 bytes FileSize equ 18h ; 8 bytes @@ -208,11 +210,10 @@ xor ax, ax or al, [es:di] je FindNameFailed + cmp al, 0c0h ; EXFAT_ENTRY_FILE_INFO ? %else - movzx ax, byte [es:di] + cmp byte [es:di], 0c0h ; EXFAT_ENTRY_FILE_INFO ? %endif - - cmp al, 0c0h ; EXFAT_ENTRY_FILE_INFO ? jne NotFileInfo mov bl, 31 @@ -223,13 +224,24 @@ jnz CopyInfo ; keep BIOS boot drive number NotFileInfo: +%if NullEntryCheck != 0 mov al, 0c1h ; EXFAT_ENTRY_FILE_NAME ? +%else + mov ax, 0c1h ; EXFAT_ENTRY_FILE_NAME ? +%endif mov cx, NameLength+1 mov si, ProgramName ; ds:si -> program name CheckName: scasw ; compare UTF-16 lodsb ; with ASCII loope CheckName +%if CheckAttrib != 0 +VolumeLabel equ 8 +SubDirectory equ 10h + jnz SkipFindName + test byte [bx+Attributes], VolumeLabel+SubDirectory +SkipFindName: +%endif je FindNameFound ; cx = 0 popa ; restore ax, cx, si, di diff -r 942f66f38758 -r 4c101652eb90 gnumeric/receipt --- a/gnumeric/receipt Sat Oct 01 09:32:27 2022 +0000 +++ b/gnumeric/receipt Mon Oct 03 08:28:51 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gnumeric" -VERSION="1.12.32" +VERSION="1.12.53" CATEGORY="office" SHORT_DESC="Office Spreadsheet application." MAINTAINER="pankso@slitaz.org" @@ -20,6 +20,7 @@ xorg-libXrandr xorg-libXrender zlib" BUILD_DEPENDS="bison goffice-dev gtk-doc gtk+3-dev libcroco-dev rarian" +# What is the latest version available today? current_version() { wget -O - $(dirname $WGET_URL) 2>/dev/null | \ @@ -29,6 +30,8 @@ # Rules to configure and make the package. compile_rules() { + sed 's|^gnm_cell_has_expr|gnm_cell_has_expr (GnmCell const *cell);\ninline gboolean\n&|' \ + -i src/cell.h ./configure \ --without-perl \ --without-python \ @@ -55,6 +58,4 @@ cp -a $install/usr/share/glib-2.0 $fs/usr/share cp -a $install/usr/share/gnumeric $fs/usr/share cp -a $install/usr/share/icons $fs/usr/share - cp -a $install/usr/share/pixmaps $fs/usr/share - find $fs/usr/share/pixmaps -name '*.ico' -delete } diff -r 942f66f38758 -r 4c101652eb90 goffice-dev/receipt --- a/goffice-dev/receipt Sat Oct 01 09:32:27 2022 +0000 +++ b/goffice-dev/receipt Mon Oct 03 08:28:51 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="goffice-dev" -VERSION="0.10.46" +VERSION="0.10.53" CATEGORY="development" SHORT_DESC="GOffice development files." MAINTAINER="pankso@slitaz.org" diff -r 942f66f38758 -r 4c101652eb90 goffice/receipt --- a/goffice/receipt Sat Oct 01 09:32:27 2022 +0000 +++ b/goffice/receipt Mon Oct 03 08:28:51 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="goffice" -VERSION="0.10.46" +VERSION="0.10.53" CATEGORY="libs" SHORT_DESC="A library of document-centric objects and utilities." MAINTAINER="pankso@slitaz.org" diff -r 942f66f38758 -r 4c101652eb90 gtkspell/receipt --- a/gtkspell/receipt Sat Oct 01 09:32:27 2022 +0000 +++ b/gtkspell/receipt Mon Oct 03 08:28:51 2022 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="provides highlighting and replacement of misspelled words" MAINTAINER="allan316@gmail.com" LICENSE="GPL2" -WEB_SITE="http://gtkspell.sourceforge.net" +WEB_SITE="https://gtkspell.sourceforge.net" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$WEB_SITE/download/$TARBALL"