From bee4a18065d22111af638f950ea3fe2172f16ff6 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Tue, 18 Apr 2023 04:01:42 +0000
Subject: [PATCH] libc++utilities: Bump to 5.22.0

---
 packages/libc++utilities/build.sh          |  5 ++---
 packages/libc++utilities/io-copy.h.patch32 | 11 +++++++++++
 packages/libc++utilities/no-android.patch  |  6 +++---
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 packages/libc++utilities/io-copy.h.patch32

diff --git a/packages/libc++utilities/build.sh b/packages/libc++utilities/build.sh
index 641ca10469..7e184b42d0 100644
--- a/packages/libc++utilities/build.sh
+++ b/packages/libc++utilities/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/Martchus/cpp-utilities
 TERMUX_PKG_DESCRIPTION="Useful C++ classes and routines such as argument parser, IO and conversion utilities"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=5.21.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=5.22.0
 TERMUX_PKG_SRCURL=https://github.com/Martchus/cpp-utilities/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=8c94bead63eaa17346438f1ed7df13d58006ae753a39fe21185d48303df1aa27
+TERMUX_PKG_SHA256=ea68a894f9d5879dc247c1a08172319ca34d2a0022bbc0412e9428c011ffaba2
 TERMUX_PKG_DEPENDS="boost, libc++, libiconv"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/libc++utilities/io-copy.h.patch32 b/packages/libc++utilities/io-copy.h.patch32
new file mode 100644
index 0000000000..a9ecb6a73d
--- /dev/null
+++ b/packages/libc++utilities/io-copy.h.patch32
@@ -0,0 +1,11 @@
+--- a/io/copy.h
++++ b/io/copy.h
+@@ -155,7 +155,7 @@
+         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 bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, count < bufferSize ? count : bufferSize);
+             if (bytesCopied < 0) {
+                 throw std::ios_base::failure(argsToString("sendfile64() failed: ", std::strerror(errno)));
+             }
diff --git a/packages/libc++utilities/no-android.patch b/packages/libc++utilities/no-android.patch
index 74c1090fcf..95714e73fd 100644
--- a/packages/libc++utilities/no-android.patch
+++ b/packages/libc++utilities/no-android.patch
@@ -6,9 +6,9 @@
  # add target for building the application
 -if (ANDROID)
 +if (FALSE)
-     # create a shared library which can be loaded from the Java-side
-     add_library(${META_TARGET_NAME} SHARED ${ALL_FILES})
- else ()
+     # create a shared library which can be loaded from the Java-side, needs to be a module target to avoid
+     # "QT_ANDROID_GENERATE_DEPLOYMENT_SETTINGS only works on Module targets" when using
+     # `qt_android_generate_deployment_settings`.
 @@ -104,7 +104,7 @@
              TARGETS ${META_TARGET_NAME}
              RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"