diff --git a/cross/bat/Makefile b/cross/bat/Makefile index 510a4d1ed35..fa83bbd4fbe 100644 --- a/cross/bat/Makefile +++ b/cross/bat/Makefile @@ -9,6 +9,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/zlib UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) +# package `home v0.5.11` cannot be built because it requires rustc 1.81 or newer, while the latest supported rustc version is 1.77.2 +# a build with rustc 1.83.0 fails with: +# /rustc/90b35a6239c3d8bdabc530a6a0816f7ff89a0aaf/library/std/src/sys/pal/unix/stack_overflow.rs:270: undefined reference to `getauxval' +UNSUPPORTED_ARCHS += $(ARMv5_ARCHS) HOMEPAGE = https://github.com/sharkdp/bat COMMENT = A cat(1) clone with wings. diff --git a/cross/eza/Makefile b/cross/eza/Makefile index 790735f914a..ede8eacad7e 100644 --- a/cross/eza/Makefile +++ b/cross/eza/Makefile @@ -1,5 +1,5 @@ PKG_NAME = eza -PKG_VERS = 0.20.7 +PKG_VERS = 0.20.15 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/eza-community/eza/archive diff --git a/cross/eza/digests b/cross/eza/digests index 76def8717d0..9e8864844eb 100644 --- a/cross/eza/digests +++ b/cross/eza/digests @@ -1,3 +1,3 @@ -eza-0.20.7.tar.gz SHA1 777e3d547424c18f075cb263d87759054ae6dc69 -eza-0.20.7.tar.gz SHA256 981af52e7a0d5ab374ed2a58b0bb9542acc81235ff479bb1f08d61941f65b18b -eza-0.20.7.tar.gz MD5 90e36737da120d84b6a999526e0d81fa +eza-0.20.15.tar.gz SHA1 17d5343e82713ec933b0e4988adf8b5bedce0375 +eza-0.20.15.tar.gz SHA256 cbb50e61b35b06ccf487ee6cc88d3b624931093546194dd5a2bbd509ed1786d6 +eza-0.20.15.tar.gz MD5 29d640f75265e7327bd67a21202eaef0 diff --git a/cross/fd/Makefile b/cross/fd/Makefile index 23fedb3b6e6..7d06133bd91 100644 --- a/cross/fd/Makefile +++ b/cross/fd/Makefile @@ -6,24 +6,15 @@ PKG_DIST_SITE = https://github.com/sharkdp/fd/archive PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -# PKG_VERS = 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS) -# PKG_VERS >= 9 still fails for$(ARMv7L_ARCHS) +# PKG_VERS >= 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS) # PKG_VERS <= 8.7.0 fails with newer rustc 1.80.1 # see: https://github.com/sharkdp/fd/issues/1428 +# we can no longer downgrade to rust 1.77.2 for ARMv7L to build fd 8.7.0 UNSUPPORTED_ARCHS = $(ARMv7L_ARCHS) # powerpc archs (except qoriq) are not supported # undefined reference to 'pipe2' UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS) -include ../../mk/spksrc.archs.mk -# This is still an issue with rustc 1.77.2 (25ef9e3d8 2024-04-09): -# issue with ARMv5: https://github.com/sharkdp/fd/issues/1049#issue-1283491635 -# workaround for: https://github.com/rust-lang/compiler-builtins/issues/420 -# fix documented in comment: https://github.com/rust-lang/compiler-builtins/issues/420#issuecomment-1335159456 -ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH)) -ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" -endif - HOMEPAGE = https://github.com/sharkdp/fd COMMENT = fd is a program to find entries in your filesystem. It is a simple, fast and user-friendly alternative to find. While it does not aim to support all of find's powerful functionality, it provides sensible (opinionated) defaults for a majority of use cases. LICENSE = Apache 2.0 / MIT diff --git a/cross/fd_8.7.0/Makefile b/cross/fd_8.7.0/Makefile deleted file mode 100644 index 27e2c0e2d9e..00000000000 --- a/cross/fd_8.7.0/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -PKG_NAME = fd -PKG_VERS = 8.7.0 -PKG_EXT = tar.gz -PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/sharkdp/fd/archive -PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) - -# PKG_VERS = 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS) -# PKG_VERS <= 8.7.0 fails with newer rustc 1.80.1 - rust version to 1.77.2 for hi3535 -# see: https://github.com/sharkdp/fd/issues/1428 - -# powerpc archs (except qoriq) are not supported -# undefined reference to 'pipe2' -UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS) - -include ../../mk/spksrc.archs.mk -# issue with ARMv5: https://github.com/sharkdp/fd/issues/1049#issue-1283491635 -# workaround for: https://github.com/rust-lang/compiler-builtins/issues/420 -# fix documented in comment: https://github.com/rust-lang/compiler-builtins/issues/420#issuecomment-1335159456 -ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH)) -ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" -endif - -HOMEPAGE = https://github.com/sharkdp/fd -COMMENT = fd is a program to find entries in your filesystem. It is a simple, fast and user-friendly alternative to find. While it does not aim to support all of find's powerful functionality, it provides sensible (opinionated) defaults for a majority of use cases. -LICENSE = Apache 2.0 / MIT - -include ../../mk/spksrc.cross-rust.mk diff --git a/cross/fd_8.7.0/PLIST b/cross/fd_8.7.0/PLIST deleted file mode 100644 index edc78231755..00000000000 --- a/cross/fd_8.7.0/PLIST +++ /dev/null @@ -1 +0,0 @@ -bin:bin/fd diff --git a/cross/fd_8.7.0/digests b/cross/fd_8.7.0/digests deleted file mode 100644 index 8217ca1b2d7..00000000000 --- a/cross/fd_8.7.0/digests +++ /dev/null @@ -1,3 +0,0 @@ -fd-8.7.0.tar.gz SHA1 258ad4bc76758da1fe6a88777caae11eade2e95b -fd-8.7.0.tar.gz SHA256 13da15f3197d58a54768aaad0099c80ad2e9756dd1b0c7df68c413ad2d5238c9 -fd-8.7.0.tar.gz MD5 053987b4ff53af8fb9b05affd0cfa011 diff --git a/cross/fd_9.0.0/Makefile b/cross/fd_9.0.0/Makefile deleted file mode 100644 index eb972868e1d..00000000000 --- a/cross/fd_9.0.0/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -PKG_NAME = fd -PKG_VERS = 9.0.0 -PKG_EXT = tar.gz -PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/sharkdp/fd/archive -PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) - -# PKG_VERS = 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS) -# PKG_VERS >= 9 still fails for$(ARMv7L_ARCHS) -# PKG_VERS <= 8.7.0 fails with newer rustc 1.80.1 -# see: https://github.com/sharkdp/fd/issues/1428 -UNSUPPORTED_ARCHS = $(ARMv7L_ARCHS) -# powerpc archs (except qoriq) are not supported -# undefined reference to 'pipe2' -UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS) - -include ../../mk/spksrc.archs.mk -# This is still an issue with rustc 1.77.2 (25ef9e3d8 2024-04-09): -# issue with ARMv5: https://github.com/sharkdp/fd/issues/1049#issue-1283491635 -# workaround for: https://github.com/rust-lang/compiler-builtins/issues/420 -# fix documented in comment: https://github.com/rust-lang/compiler-builtins/issues/420#issuecomment-1335159456 -ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH)) -ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" -endif - -HOMEPAGE = https://github.com/sharkdp/fd -COMMENT = fd is a program to find entries in your filesystem. It is a simple, fast and user-friendly alternative to find. While it does not aim to support all of find's powerful functionality, it provides sensible (opinionated) defaults for a majority of use cases. -LICENSE = Apache 2.0 / MIT - -include ../../mk/spksrc.cross-rust.mk diff --git a/cross/fd_9.0.0/PLIST b/cross/fd_9.0.0/PLIST deleted file mode 100644 index edc78231755..00000000000 --- a/cross/fd_9.0.0/PLIST +++ /dev/null @@ -1 +0,0 @@ -bin:bin/fd diff --git a/cross/fd_9.0.0/digests b/cross/fd_9.0.0/digests deleted file mode 100644 index 7ffdc33d224..00000000000 --- a/cross/fd_9.0.0/digests +++ /dev/null @@ -1,3 +0,0 @@ -fd-9.0.0.tar.gz SHA1 397e4a5efcd3730fa036f058a6a7432dbf1dac71 -fd-9.0.0.tar.gz SHA256 306d7662994e06e23d25587246fa3fb1f528579e42a84f5128e75feec635a370 -fd-9.0.0.tar.gz MD5 3ee72ca77c9a6b0ad108f48338206f05 diff --git a/cross/file/Makefile b/cross/file/Makefile index 9c891493498..fb347281f22 100644 --- a/cross/file/Makefile +++ b/cross/file/Makefile @@ -1,5 +1,5 @@ PKG_NAME = file -PKG_VERS = 5.45 +PKG_VERS = 5.46 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://ftp.astron.com/pub/file diff --git a/cross/file/digests b/cross/file/digests index 3eedd482019..d55d5e07755 100644 --- a/cross/file/digests +++ b/cross/file/digests @@ -1,3 +1,3 @@ -file-5.45.tar.gz SHA1 e8ee39339e5d3d68b7da9c45580f2ca5faf0db54 -file-5.45.tar.gz SHA256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82 -file-5.45.tar.gz MD5 26b2a96d4e3a8938827a1e572afd527a +file-5.46.tar.gz SHA1 af74daeac411a665b071a71ec89d3a3020647309 +file-5.46.tar.gz SHA256 c9cc77c7c560c543135edc555af609d5619dbef011997e988ce40a3d75d86088 +file-5.46.tar.gz MD5 459da2d4b534801e2e2861611d823864 diff --git a/cross/fzf/Makefile b/cross/fzf/Makefile index ed361d5cf57..53e5e211971 100644 --- a/cross/fzf/Makefile +++ b/cross/fzf/Makefile @@ -1,5 +1,5 @@ PKG_NAME = fzf -PKG_VERS = 0.56.0 +PKG_VERS = 0.57.0 PKG_EXT = tar.gz PKG_REVISION = $(shell date +%m/%d/%Y) PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) diff --git a/cross/fzf/digests b/cross/fzf/digests index 58393394311..f54dd4c96f6 100644 --- a/cross/fzf/digests +++ b/cross/fzf/digests @@ -1,3 +1,3 @@ -fzf-0.56.0.tar.gz SHA1 9b577eb9fc1192a65048230cdc4ef54fcd8320d3 -fzf-0.56.0.tar.gz SHA256 45880ac4175535bf1b298598fbc404ae8ad455ebde804ed5336237759507dc76 -fzf-0.56.0.tar.gz MD5 79d5d8ab724fabd52a3e9ac5a152e0dd +fzf-0.57.0.tar.gz SHA1 5c15a21083621fc2629ed7b483328810d75f9f8b +fzf-0.57.0.tar.gz SHA256 d4e8e25fad2d3f75943b403c40b61326db74b705bf629c279978fdd0ceb1f97c +fzf-0.57.0.tar.gz MD5 a90a9212ec21aeab508d9618c83bd9f8 diff --git a/cross/nano/Makefile b/cross/nano/Makefile index 0ac2606b99e..e575c95951f 100644 --- a/cross/nano/Makefile +++ b/cross/nano/Makefile @@ -1,5 +1,5 @@ PKG_NAME = nano -PKG_VERS = 8.2 +PKG_VERS = 8.3 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.nano-editor.org/dist/v$(firstword $(subst ., ,$(PKG_VERS))) diff --git a/cross/nano/digests b/cross/nano/digests index b62a065d7be..276c95b19f1 100644 --- a/cross/nano/digests +++ b/cross/nano/digests @@ -1,3 +1,3 @@ -nano-8.2.tar.xz SHA1 33bc9c6bc8f84a8d551fd9d118a3495db5f419c7 -nano-8.2.tar.xz SHA256 d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb -nano-8.2.tar.xz MD5 382baf871963ac2c31c1e8043c70776e +nano-8.3.tar.xz SHA1 91b2cfc2d04a69b4f0ea46cfc4f789f257f70a18 +nano-8.3.tar.xz SHA256 551b717b2e28f7e90f749323686a1b5bbbd84cfa1390604d854a3ca3778f111e +nano-8.3.tar.xz MD5 e64276780e23efb273480c4279050f74 diff --git a/cross/nnn/Makefile b/cross/nnn/Makefile index 609f888b931..a765265ba78 100644 --- a/cross/nnn/Makefile +++ b/cross/nnn/Makefile @@ -1,35 +1,14 @@ PKG_NAME = nnn -PKG_VERS = 4.8 +PKG_VERS = 5.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/jarun/nnn/releases/download/v$(PKG_VERS) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -# REMARKS: -# currently stay on version 4.8 -# versions 4.9 and 5.0 fail with the following error for all DSM 6 (even 64 bit): -# error " cannot be used with -D_FILE_OFFSET_BITS==64" -# we will have to decide whether we -# - fall back to version 4.0 for all packages with DSM < 7 -# - keep nnn version 4.8 for DSM 6 and x64, x86 and aarch64 -# - patch version > 4.8 for DSM 6 and x64, x86 and aarch64 to remove the definition of _FILE_OFFSET_BITS==64 -# (we would have to verify that 64 bit/largefile support is working when built without -D_FILE_OFFSET_BITS==64) -# - DEPENDS = cross/ncursesw cross/readline -# compiler too old (-std=c11 required) -UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS) - -# 32 bit archs require DSM >= 7 -# error " cannot be used with -D_FILE_OFFSET_BITS==64" -include ../../mk/spksrc.common.mk -ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) -UNSUPPORTED_ARCHS += $(32bit_ARCHS) -else -# comcerto2k is not even supported on DSM>=7 -UNSUPPORTED_ARCHS += comcerto2k -endif +REQUIRED_MIN_DSM = 7 +UNSUPPORTED_ARCHS = comcerto2k HOMEPAGE = https://github.com/jarun/nnn COMMENT = n³ The unorthodox terminal file manager. diff --git a/cross/nnn/digests b/cross/nnn/digests index f51d114cfb3..df56c39ffb0 100644 --- a/cross/nnn/digests +++ b/cross/nnn/digests @@ -1,3 +1,3 @@ -nnn-v4.8.tar.gz SHA1 b00433baab8ea3777c237f7e7b61064dd750ae03 -nnn-v4.8.tar.gz SHA256 7027f830329ff3451b844d1f5fbeb1d866bed1af6f24a360d5c51888cb1ae8f0 -nnn-v4.8.tar.gz MD5 c87c132342b1ca0ce8f2b051bb67c832 +nnn-v5.0.tar.gz SHA1 f0f33436942ad99d37bb458618e1b6a80cd61159 +nnn-v5.0.tar.gz SHA256 ba82d6c685bb3687521de2f576244f82558a4af9afeeedda434d5ecb1c029520 +nnn-v5.0.tar.gz MD5 28b6afb4056c738a8c5a60d4b9d41941 diff --git a/cross/nnn_4.0/Makefile b/cross/nnn_4.0/Makefile index 5c0362be9ba..73073bb4197 100644 --- a/cross/nnn_4.0/Makefile +++ b/cross/nnn_4.0/Makefile @@ -5,8 +5,8 @@ PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/jarun/nnn/releases/download/v$(PKG_VERS) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -# PKG_VERS 4.0 is the latest version for DSM<7 and comcerto2k - +# REMARKS: +# nnn version 4.0 is the latest version for 32-bit archs on DSM 6 and for comcerto2k DEPENDS = cross/ncursesw cross/readline # compiler too old (-std=c11 required) diff --git a/cross/nnn_4.8/Makefile b/cross/nnn_4.8/Makefile new file mode 100644 index 00000000000..08db18cd309 --- /dev/null +++ b/cross/nnn_4.8/Makefile @@ -0,0 +1,41 @@ +PKG_NAME = nnn +PKG_VERS = 4.8 +PKG_EXT = tar.gz +PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/jarun/nnn/releases/download/v$(PKG_VERS) +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +# REMARKS: +# nnn version 4.0 is the latest version for 32-bit archs on DSM 6 and for comcerto2k +# nnn version 4.8 is the latest version for 64-bit archs on DSM 6 +# later versions fail with the following error for all DSM 6 (even 64 bit): +# error " cannot be used with -D_FILE_OFFSET_BITS==64" + +# All DSM 6 toolchains (and DSM 7 of comcerto2k) have identical fts.h file (usr/inluce/fts.h) with this guard: +# /* The fts interface is incompatible with the LFS interface which +# transparently uses the 64-bit file access functions. */ +# #ifdef __USE_FILE_OFFSET64 +# # error " cannot be used with -D_FILE_OFFSET_BITS==64" +# #endif + +DEPENDS = cross/ncursesw cross/readline + +# compiler too old (-std=c11 required) +UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) +# comcerto2k is not supported on DSM 6 and DSM 7 +UNSUPPORTED_ARCHS += comcerto2k + +# 32 bit archs require DSM >= 7 +include ../../mk/spksrc.common.mk +ifeq ($(call version_lt, ${TCVERSION}, 7.0),1) +UNSUPPORTED_ARCHS += $(32bit_ARCHS) +endif + +HOMEPAGE = https://github.com/jarun/nnn +COMMENT = n³ The unorthodox terminal file manager. +LICENSE = 2-clause BSD + +CONFIGURE_TARGET = nop +INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX) + +include ../../mk/spksrc.cross-cc.mk diff --git a/cross/nnn_4.8/PLIST b/cross/nnn_4.8/PLIST new file mode 100644 index 00000000000..47a47d5a7b5 --- /dev/null +++ b/cross/nnn_4.8/PLIST @@ -0,0 +1,2 @@ +bin:bin/nnn + diff --git a/cross/nnn_4.8/digests b/cross/nnn_4.8/digests new file mode 100644 index 00000000000..f51d114cfb3 --- /dev/null +++ b/cross/nnn_4.8/digests @@ -0,0 +1,3 @@ +nnn-v4.8.tar.gz SHA1 b00433baab8ea3777c237f7e7b61064dd750ae03 +nnn-v4.8.tar.gz SHA256 7027f830329ff3451b844d1f5fbeb1d866bed1af6f24a360d5c51888cb1ae8f0 +nnn-v4.8.tar.gz MD5 c87c132342b1ca0ce8f2b051bb67c832 diff --git a/cross/tree/Makefile b/cross/tree/Makefile index dca407d9a29..eb73717c457 100644 --- a/cross/tree/Makefile +++ b/cross/tree/Makefile @@ -1,13 +1,14 @@ PKG_NAME = tree -PKG_VERS = 2.1.3 +PKG_VERS = 2.2.1 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://fossies.org/linux/misc +PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/Old-Man-Programmer/tree/archive +PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = -HOMEPAGE = http://mama.indstate.edu/users/ice/tree/ +HOMEPAGE = https://oldmanprogrammer.net/source.php?dir=projects/tree COMMENT = Tree is a recursive directory listing command that produces a depth indented listing of files, which is colorized ala dircolors if the LS_COLORS environment variable is set and output is to tty. LICENSE = GPLv2 diff --git a/cross/tree/digests b/cross/tree/digests index c19bf1d6d48..21efbb97d28 100644 --- a/cross/tree/digests +++ b/cross/tree/digests @@ -1,3 +1,3 @@ -tree-2.1.3.tar.gz SHA1 58ada247679751dd797cf30bdee7bc608d673a9d -tree-2.1.3.tar.gz SHA256 3ffe2c8bb21194b088ad1e723f0cf340dd434453c5ff9af6a38e0d47e0c2723b -tree-2.1.3.tar.gz MD5 e37b8b15a8d87801c35ffd82a619848f +tree-2.2.1.tar.gz SHA1 5eb45590d0289d31b8673aadc45549a85a3709af +tree-2.2.1.tar.gz SHA256 5caddcbca805131ff590b126d3218019882e4ca10bc9eb490bba51c05b9b3b75 +tree-2.2.1.tar.gz MD5 e2815dfff9bd6b91e828ed5b17d8e36d diff --git a/cross/tree/patches/001-enable-cross-compiler-definitions.patch b/cross/tree/patches/001-enable-cross-compiler-definitions.patch index 9c865495343..5758bae6ca1 100644 --- a/cross/tree/patches/001-enable-cross-compiler-definitions.patch +++ b/cross/tree/patches/001-enable-cross-compiler-definitions.patch @@ -1,20 +1,11 @@ ---- Makefile.orig 2024-07-09 22:41:41.000000000 +0000 -+++ Makefile 2024-10-13 06:32:13.939839865 +0000 -@@ -18,7 +18,7 @@ +--- Makefile.orig 2024-11-26 00:55:17.000000000 +0000 ++++ Makefile 2025-01-03 23:05:51.677704322 +0000 +@@ -36,7 +36,7 @@ + LDFLAGS?=-s + #CFLAGS?=-ggdb + CFLAGS?=-O3 +-CFLAGS+=-std=c11 -Wpedantic -Wall -Wextra -Wstrict-prototypes -Wshadow -Wconversion ++#CFLAGS+=-std=c11 -Wpedantic -Wall -Wextra -Wstrict-prototypes -Wshadow -Wconversion + # _LARGEFILE64_SOURCE may be considered obsolete + CPPFLAGS+=-DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - PREFIX=/usr/local - --CC=gcc -+#CC=gcc - INSTALL=install - - VERSION=2.1.3 -@@ -33,7 +33,7 @@ - - # Linux defaults: - #CFLAGS+=-ggdb -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+#CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - #LDFLAGS+=-s - - # Uncomment for FreeBSD: diff --git a/diyspk/eza/Makefile b/diyspk/eza/Makefile index af4df1fbe7f..90c97e80d5c 100644 --- a/diyspk/eza/Makefile +++ b/diyspk/eza/Makefile @@ -1,5 +1,5 @@ SPK_NAME = eza -SPK_VERS = 0.20.7 +SPK_VERS = 0.20.15 SPK_REV = 1 DEPENDS = cross/eza diff --git a/diyspk/fd/Makefile b/diyspk/fd/Makefile index fd0ed7a9ab0..267deb1acf9 100644 --- a/diyspk/fd/Makefile +++ b/diyspk/fd/Makefile @@ -5,6 +5,10 @@ SPK_REV = 1 DEPENDS = cross/fd UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) +# fd 8.7.0 with rust 1.77.2: use of deprecated method `chrono::TimeZone::datetime_from_str +UNSUPPORTED_ARCHS += $(ARMv5_ARCHS) +# we can't no longer downgrade to rust 1.77.2 for ARMv7L to build fd 8.7.0 +UNSUPPORTED_ARCHS += $(ARMv7L_ARCHS) MAINTAINER = SynoCommunity DESCRIPTION = fd is a program to find entries in your filesystem. It is a simple, fast and user-friendly alternative to find. While it does not aim to support all of find's powerful functionality, it provides sensible (opinionated) defaults for a majority of use cases. @@ -16,14 +20,3 @@ LICENSE = Apache 2.0 / MIT SPK_COMMANDS = bin/fd include ../../mk/spksrc.spk.mk - -ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH)) -DEPENDS += cross/fd_8.7.0 -SPK_VERS = 8.7.0 -else ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH)) -DEPENDS += cross/fd_9.0.0 -SPK_VERS = 9.0.0 -else -DEPENDS += cross/fd -endif - diff --git a/diyspk/file/Makefile b/diyspk/file/Makefile index dfb01fe7f53..2872d42dceb 100644 --- a/diyspk/file/Makefile +++ b/diyspk/file/Makefile @@ -1,5 +1,5 @@ SPK_NAME = file -SPK_VERS = 5.45 +SPK_VERS = 5.46 SPK_REV = 1 DEPENDS = cross/file diff --git a/diyspk/fzf/Makefile b/diyspk/fzf/Makefile index 275f384f558..5954bb99953 100644 --- a/diyspk/fzf/Makefile +++ b/diyspk/fzf/Makefile @@ -1,9 +1,11 @@ SPK_NAME = fzf -SPK_VERS = 0.56.0 +SPK_VERS = 0.57.0 SPK_REV = 1 SPK_ICON = src/fzf.png -DEPENDS = cross/fzf +DEPENDS = cross/fzf_update + +UNSUPPORTED_ARCHS = $(PPC_ARCHS) MAINTAINER = SynoCommunity DESCRIPTION = A command-line fuzzy finder. diff --git a/diyspk/nano/Makefile b/diyspk/nano/Makefile index 3209f8176cc..577750e549a 100755 --- a/diyspk/nano/Makefile +++ b/diyspk/nano/Makefile @@ -1,5 +1,5 @@ SPK_NAME = nano -SPK_VERS = 8.2 +SPK_VERS = 8.3 SPK_REV = 1 SPK_ICON = src/nano.png diff --git a/diyspk/nnn/Makefile b/diyspk/nnn/Makefile index 35f832953e2..7e36d157bee 100644 --- a/diyspk/nnn/Makefile +++ b/diyspk/nnn/Makefile @@ -1,12 +1,27 @@ SPK_NAME = nnn -SPK_VERS = 4.8 +SPK_VERS = 5.0 SPK_REV = 1 SPK_ICON = src/nnn.png -DEPENDS = cross/nnn +UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) + +include ../../mk/spksrc.common.mk -# for those use cross/nnn_4.0 -UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS) +ifeq ($(call version_ge, ${TCVERSION}, 7.0),1) +ifneq ($(findstring $(ARCH),comcerto2k),$(ARCH)) +DEPENDS = cross/nnn +else +# comcerto2k for DSM>=7 +DEPENDS = cross/nnn_4.0 +SPK_VERS = 4.0 +endif +else ifeq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH)) +DEPENDS = cross/nnn_4.8 +SPK_VERS = 4.8 +else +DEPENDS = cross/nnn_4.0 +SPK_VERS = 4.0 +endif MAINTAINER = SynoCommunity DESCRIPTION = n³ The unorthodox terminal file manager. diff --git a/diyspk/tree/Makefile b/diyspk/tree/Makefile index 176e6a25ab3..f96a51aae0a 100644 --- a/diyspk/tree/Makefile +++ b/diyspk/tree/Makefile @@ -1,5 +1,5 @@ SPK_NAME = tree -SPK_VERS = 2.1.3 +SPK_VERS = 2.2.1 SPK_REV = 1 DEPENDS = cross/tree @@ -8,7 +8,7 @@ MAINTAINER = MrSpoocy DESCRIPTION = Tree is a recursive directory listing command that produces a depth indented listing of files, which is colorized ala dircolors if the LS_COLORS environment variable is set and output is to tty. STARTABLE = no -HOMEPAGE = http://mama.indstate.edu/users/ice/tree/index.html +HOMEPAGE = https://oldmanprogrammer.net/source.php?dir=projects/tree LICENSE = GPLv2 SPK_COMMANDS = bin/tree diff --git a/mk/spksrc.cross-rust-env.mk b/mk/spksrc.cross-rust-env.mk index 262355fafbe..f6eb603c0fd 100644 --- a/mk/spksrc.cross-rust-env.mk +++ b/mk/spksrc.cross-rust-env.mk @@ -47,7 +47,6 @@ ifeq ($(findstring $(RUST_ARCH), $(ARMv7_ARCHS)),$(RUST_ARCH)) RUST_TARGET = armv7-unknown-linux-gnueabihf endif ifeq ($(findstring $(RUST_ARCH), $(ARMv7L_ARCHS)),$(RUST_ARCH)) -RUSTUP_DEFAULT_TOOLCHAIN = 1.77.2 RUST_TARGET = armv7-unknown-linux-gnueabi endif ifeq ($(findstring $(RUST_ARCH), $(ARMv8_ARCHS)),$(RUST_ARCH)) diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile index e65f314e836..dfdb9de44d2 100644 --- a/spk/synocli-file/Makefile +++ b/spk/synocli-file/Makefile @@ -1,6 +1,6 @@ SPK_NAME = synocli-file -SPK_VERS = 3.4 -SPK_REV = 24 +SPK_VERS = 4.0 +SPK_REV = 25 SPK_ICON = src/synocli-file.png # cross/libblkid must be built before cross/e2fsprogs or cross/libext2fs @@ -25,11 +25,11 @@ OPTIONAL_DEPENDS += cross/rnm OPTIONAL_DEPENDS += cross/micro OPTIONAL_DEPENDS += cross/fzf OPTIONAL_DEPENDS += cross/ripgrep -OPTIONAL_DEPENDS += cross/fd cross/fd_8.7.0 +OPTIONAL_DEPENDS += cross/fd OPTIONAL_DEPENDS += cross/sd OPTIONAL_DEPENDS += cross/bat OPTIONAL_DEPENDS += cross/eza -OPTIONAL_DEPENDS += cross/nnn cross/nnn_4.0 +OPTIONAL_DEPENDS += cross/nnn cross/nnn_4.8 cross/nnn_4.0 OPTIONAL_DEPENDS += cross/lsd OPTIONAL_DEPENDS += cross/xstow @@ -51,8 +51,8 @@ else # comcerto2k for DSM>=7 DEPENDS += cross/nnn_4.0 endif -else ifneq ($(findstring $(ARCH),$(32bit_ARCHS)),$(ARCH)) -DEPENDS += cross/nnn +else ifeq ($(findstring $(ARCH),$(64bit_ARCHS)),$(ARCH)) +DEPENDS += cross/nnn_4.8 else # 32-bit archs for DSM<7 DEPENDS += cross/nnn_4.0 @@ -73,16 +73,18 @@ endif # OLD_PPC archs are not supported with rust ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) -DEPENDS += cross/bat cross/eza -OPTIONAL_DESC := $(OPTIONAL_DESC)", bat, eza" +ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH)) +DEPENDS += cross/bat +OPTIONAL_DESC := $(OPTIONAL_DESC)", bat" +endif +DEPENDS += cross/eza +OPTIONAL_DESC := $(OPTIONAL_DESC)", eza" DEPENDS += cross/ripgrep OPTIONAL_DESC := $(OPTIONAL_DESC)", rg (ripgrep)" -ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH)) -DEPENDS += cross/fd_8.7.0 -else +ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS)),$(ARCH)) DEPENDS += cross/fd -endif OPTIONAL_DESC := $(OPTIONAL_DESC)", fd (fd-find)" +endif DEPENDS += cross/sd OPTIONAL_DESC := $(OPTIONAL_DESC)", sd (sed alternative)" DEPENDS += cross/lsd @@ -108,25 +110,13 @@ DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities: detox, iconv, dos2unix tools, \ patch$(OPTIONAL_DESC)." STARTABLE = no -CHANGELOG = "1. Update detox to v2.0.0.
" -CHANGELOG += "2. Update eza to v0.20.7.
" -CHANGELOG += "3. Update fd to v10.2.0.
" -CHANGELOG += "4. Update fdupes to v2.3.2 and add sqlite for optional caches.
" -CHANGELOG += "5. Update jdupes to v1.28.0.
" -CHANGELOG += "6. Update fzf to v0.56.0.
" -CHANGELOG += "7. Update less to v668.
" -CHANGELOG += "8. Update lsd to v1.1.5.
" -CHANGELOG += "9. Update lzip to v1.24.1.
" -CHANGELOG += "10. Update mc to v4.8.32.
" -CHANGELOG += "11. Update micro to v2.0.14.
" -CHANGELOG += "12. Update nano to v8.2.
" -CHANGELOG += "13. Update pcre2 to v10.44.
" -CHANGELOG += "14. Update rhash to v1.4.5.
" -CHANGELOG += "15. Update ripgrep to v14.1.1.
" -CHANGELOG += "16. Update tree to v2.1.3.
" -CHANGELOG += "17. Update zstd to v1.5.6.
" -CHANGELOG += "18. Update openssl to v3.1.7.
" -CHANGELOG += "19. Add pixz v1.0.7." +CHANGELOG = "1. Remove fd (fd-find) v8.7.0 used for VS and NVR models (ARMv7L archs) and for ARMv5 archs.
" +CHANGELOG += "2. Update eza to v0.20.15.
" +CHANGELOG += "3. Update file to v5.46.
" +CHANGELOG += "4. Update fzf to v0.57.0.
" +CHANGELOG += "5. Update nano to v8.3.
" +CHANGELOG += "6. Update nnn to v5.0 (DSM 7 only).
" +CHANGELOG += "7. Update tree to v2.2.1." SERVICE_SETUP = src/service-setup.sh