From f0ded322005cdc288203afa5bce9d890bb20b909 Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Fri, 1 Apr 2022 03:39:46 +0200 Subject: [PATCH] Ports/libuv: Update libuv to version 1.44.1 Part of the build-Add-platform-specific-stubs-and-implementation was upstreamed. --- Ports/AvailablePorts.md | 2 +- Ports/libuv/package.sh | 4 +-- ...rm-specific-stubs-and-implementation.patch | 27 +------------------ 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index b2077520392..d1f1a828252 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -115,7 +115,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`libtiff`](libtiff/) | libtiff | 4.3.0 | http://www.libtiff.org/ | | [`libtool`](libtool/) | libtool | 2.4.7 | https://www.gnu.org/software/libtool/ | | [`libuuid`](libuuid/) | libuuid (from util-linux) | 2.38 | https://github.com/karelzak/util-linux/tree/master/libuuid | -| [`libuv`](libuv/) | libuv | 1.42.0 | https://github.com/libuv/libuv | +| [`libuv`](libuv/) | libuv | 1.44.1 | https://github.com/libuv/libuv | | [`libvorbis`](libvorbis/) | libvorbis | 1.3.7 | https://github.com/xiph/vorbis | | [`libxml2`](libxml2/) | libxml2 | 2.9.12 | http://www.xmlsoft.org/ | | [`libzip`](libzip/) | libzip | 1.7.3 | https://libzip.org/ | diff --git a/Ports/libuv/package.sh b/Ports/libuv/package.sh index 7dbaa076b37..05b4641f31d 100755 --- a/Ports/libuv/package.sh +++ b/Ports/libuv/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port=libuv -version=1.42.0 +version=1.44.1 useconfigure=true -files="https://github.com/libuv/libuv/archive/refs/tags/v$version.tar.gz $port-$version.tar.gz 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764" +files="https://github.com/libuv/libuv/archive/refs/tags/v$version.tar.gz $port-$version.tar.gz e91614e6dc2dd0bfdd140ceace49438882206b7a6fb00b8750914e67a9ed6d6b" auth_type=sha256 configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-GNinja" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=true") diff --git a/Ports/libuv/patches/0007-build-Add-platform-specific-stubs-and-implementation.patch b/Ports/libuv/patches/0007-build-Add-platform-specific-stubs-and-implementation.patch index ed2808eda5a..4fb9340f1ff 100644 --- a/Ports/libuv/patches/0007-build-Add-platform-specific-stubs-and-implementation.patch +++ b/Ports/libuv/patches/0007-build-Add-platform-specific-stubs-and-implementation.patch @@ -30,7 +30,7 @@ new file mode 100644 index 0000000..821cf37 --- /dev/null +++ b/src/unix/serenity-core.c -@@ -0,0 +1,137 @@ +@@ -0,0 +1,112 @@ +#include "uv.h" +#include "internal.h" + @@ -62,31 +62,6 @@ index 0000000..821cf37 + uv__free(addresses); +} + -+static int uv__slurp(const char* filename, char* buf, size_t len) { -+ ssize_t n; -+ int fd; -+ -+ assert(len > 0); -+ -+ fd = uv__open_cloexec(filename, O_RDONLY); -+ if (fd < 0) -+ return fd; -+ -+ do -+ n = read(fd, buf, len - 1); -+ while (n == -1 && errno == EINTR); -+ -+ if (uv__close_nocheckstdio(fd)) -+ abort(); -+ -+ if (n < 0) -+ return UV__ERR(errno); -+ -+ buf[n] = '\0'; -+ -+ return 0; -+} -+ + +static uint64_t uv__read_proc_memstat(const char* what) { + uint64_t rc;