diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 048f7e89ef2..f0ece1d27db 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -360,4 +360,4 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`zig`](zig/) | Zig programming language | 0.15.0-dev.1380+e98aeeb73 | https://ziglang.org/ | | [`zlib`](zlib/) | zlib | 1.3.1 | https://www.zlib.net/ | | [`zsh`](zsh/) | Z Shell (Zsh) | 5.9 | https://www.zsh.org | -| [`zstd`](zstd/) | Zstandard | 1.5.6 | https://facebook.github.io/zstd/ | +| [`zstd`](zstd/) | Zstandard | 1.5.7 | https://facebook.github.io/zstd/ | diff --git a/Ports/zstd/package.sh b/Ports/zstd/package.sh index 0cfe56ddd20..97541335d7e 100755 --- a/Ports/zstd/package.sh +++ b/Ports/zstd/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port='zstd' -version='1.5.6' +version='1.5.7' files=( - "https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz#8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1" + "https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz#eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3" ) useconfigure='true' diff --git a/Ports/zstd/patches/0001-Fix-linker-soname-flags.patch b/Ports/zstd/patches/0001-Fix-linker-soname-flags.patch index f03cda147da..cbc95afcdfc 100644 --- a/Ports/zstd/patches/0001-Fix-linker-soname-flags.patch +++ b/Ports/zstd/patches/0001-Fix-linker-soname-flags.patch @@ -5,24 +5,26 @@ Subject: [PATCH] Fix linker soname flags Co-Authored-By: EWouters <6179932+EWouters@users.noreply.github.com> --- - lib/Makefile | 20 ++++---------------- - 1 file changed, 4 insertions(+), 16 deletions(-) + lib/Makefile | 22 ++++------------------ + 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/lib/Makefile b/lib/Makefile -index ef20218..e4766c9 100644 +index a6a0eb09d821823487d89512e042859d5a6d1b95..22abb4dd831819e6983a8759d6ff1489e687b0ab 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -69,22 +69,10 @@ endif +@@ -73,24 +73,10 @@ endif # macOS linker doesn't support -soname, and use different extension # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html --ifeq ($(UNAME), Darwin) +-UNAME_TARGET_SYSTEM ?= $(UNAME) +- +-ifeq ($(UNAME_TARGET_SYSTEM), Darwin) - SHARED_EXT = dylib - SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT) - SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT) - SONAME_FLAGS = -install_name $(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER) -else -- ifeq ($(UNAME), AIX) +- ifeq ($(UNAME_TARGET_SYSTEM), AIX) - SONAME_FLAGS = - else - SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR) diff --git a/Ports/zstd/patches/0002-Make-platform.h-understand-that-serenity-is-posix-co.patch b/Ports/zstd/patches/0002-Make-platform.h-understand-that-serenity-is-posix-co.patch index a2ce1079499..ea849a3b751 100644 --- a/Ports/zstd/patches/0002-Make-platform.h-understand-that-serenity-is-posix-co.patch +++ b/Ports/zstd/patches/0002-Make-platform.h-understand-that-serenity-is-posix-co.patch @@ -9,10 +9,10 @@ Co-Authored-By: Brian Callahan 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/platform.h b/programs/platform.h -index b858e3b..8628c05 100644 +index e2cc1c3e65f6c6d6a9e49948ca577520acbdb0a7..c85864506d2efa49efa2c9adb1b44e0d39f161c8 100644 --- a/programs/platform.h +++ b/programs/platform.h -@@ -98,7 +98,11 @@ extern "C" { +@@ -91,7 +91,11 @@ # endif # include /* declares _POSIX_VERSION */ # if defined(_POSIX_VERSION) /* POSIX compliant */ diff --git a/Ports/zstd/patches/0003-Include-stdio.h-in-programs-util.h.patch b/Ports/zstd/patches/0003-Include-stdio.h-in-programs-util.h.patch deleted file mode 100644 index 5b962fd7af9..00000000000 --- a/Ports/zstd/patches/0003-Include-stdio.h-in-programs-util.h.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: EWouters <6179932+EWouters@users.noreply.github.com> -Date: Sat, 2 Sep 2023 19:05:41 +0200 -Subject: [PATCH] Include stdio.h in `programs/util.h` - ---- - programs/util.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/programs/util.h b/programs/util.h -index 8234646bf3dc61e482f8331795b8bf54a7aa0746..4a8596169126b19f7612a743a0b4576c5c97c414 100644 ---- a/programs/util.h -+++ b/programs/util.h -@@ -24,6 +24,7 @@ extern "C" { - #include /* stat, utime */ - #include /* stat, chmod */ - #include "../lib/common/mem.h" /* U64 */ -+#include - - - /*-************************************************************ diff --git a/Ports/zstd/patches/ReadMe.md b/Ports/zstd/patches/ReadMe.md index 53addc750b1..c13f176d18c 100644 --- a/Ports/zstd/patches/ReadMe.md +++ b/Ports/zstd/patches/ReadMe.md @@ -10,8 +10,3 @@ Fix linker soname flags Make platform.h understand that serenity is posix-compliant -## `0003-Include-stdio.h-in-programs-util.h.patch` - -Include stdio.h in `programs/util.h` - -