cpp-utilities: update to 5.22.0.

This commit is contained in:
Andrew J. Hesford 2023-04-06 09:44:22 -04:00
parent aad7b7947a
commit 3ce43f880d
2 changed files with 28 additions and 2 deletions

View file

@ -0,0 +1,26 @@
From 92757f253113515e96bb4ddbb4627b314ada6b58 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
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<bufferSize>::callbackCopy(NativeFileStream &input, NativeFileStr
output.flush();
const auto totalBytes = static_cast<std::streamoff>(count);
while (count) {
- const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, std::min(count, bufferSize));
+ const auto bytesToCopy = static_cast<std::size_t>(std::min(count, static_cast<std::uint64_t>(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

View file

@ -1,6 +1,6 @@
# Template file for 'cpp-utilities'
pkgname=cpp-utilities
version=5.21.0
version=5.22.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
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=8c94bead63eaa17346438f1ed7df13d58006ae753a39fe21185d48303df1aa27
checksum=ea68a894f9d5879dc247c1a08172319ca34d2a0022bbc0412e9428c011ffaba2
cpp-utilities-devel_package() {
short_desc+=" - development files"