From 4e232bff5b8c1919f49d1d5a6e67b3979eb3a097 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 7 Jun 2023 10:09:23 -0400 Subject: [PATCH] cpp-utilities: update to 5.23.0. --- .../patches/fix-32bit-sendfile.patch | 26 ------------------- srcpkgs/cpp-utilities/template | 4 +-- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch diff --git a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch b/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch deleted file mode 100644 index 0c8cc562f86..00000000000 --- a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 92757f253113515e96bb4ddbb4627b314ada6b58 Mon Sep 17 00:00:00 2001 -From: "Andrew J. Hesford" -Date: Thu, 6 Apr 2023 11:33:41 -0400 -Subject: [PATCH] Fix use of `sendfile()` on 32-bit systems - ---- - io/copy.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/io/copy.h b/io/copy.h -index 4abbe8d..0635a8e 100644 ---- a/io/copy.h -+++ b/io/copy.h -@@ -155,7 +155,8 @@ void CopyHelper::callbackCopy(NativeFileStream &input, NativeFileStr - output.flush(); - const auto totalBytes = static_cast(count); - while (count) { -- const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, std::min(count, bufferSize)); -+ const auto bytesToCopy = static_cast(std::min(count, static_cast(bufferSize))); -+ const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, bytesToCopy); - if (bytesCopied < 0) { - throw std::ios_base::failure(argsToString("sendfile64() failed: ", std::strerror(errno))); - } --- -2.40.0 - diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template index d4d2d10eb9a..4e164a09fac 100644 --- a/srcpkgs/cpp-utilities/template +++ b/srcpkgs/cpp-utilities/template @@ -1,6 +1,6 @@ # Template file for 'cpp-utilities' pkgname=cpp-utilities -version=5.22.0 +version=5.23.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/cpp-utilities" distfiles="https://github.com/Martchus/cpp-utilities/archive/v${version}.tar.gz" -checksum=ea68a894f9d5879dc247c1a08172319ca34d2a0022bbc0412e9428c011ffaba2 +checksum=2a0564afb3c5c2f9119ef4ea434001d4ee67a88a99484c412253b3f9ae4147bc cpp-utilities-devel_package() { short_desc+=" - development files"