commit: c78c0960d494d8b9e8dd35f8606b47a295ad39ea
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 27 13:13:16 2025 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 27 13:13:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78c0960
sys-fs/cryfs: patch for boost 1.88
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../{cryfs-1.0.1.ebuild => cryfs-1.0.1-r1.ebuild} | 3 +++
sys-fs/cryfs/files/cryfs-1.0.1-boost-1.88.patch | 29 ++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/sys-fs/cryfs/cryfs-1.0.1.ebuild
b/sys-fs/cryfs/cryfs-1.0.1-r1.ebuild
similarity index 99%
rename from sys-fs/cryfs/cryfs-1.0.1.ebuild
rename to sys-fs/cryfs/cryfs-1.0.1-r1.ebuild
index 1898eb1bb318..1c1c90f4ce78 100644
--- a/sys-fs/cryfs/cryfs-1.0.1.ebuild
+++ b/sys-fs/cryfs/cryfs-1.0.1-r1.ebuild
@@ -51,6 +51,9 @@ BDEPEND="
PATCHES=(
# TODO: upstream:
"${FILESDIR}"/cryfs-1.0.1-unbundle-vendored-libs.patch
+
+ # backports
+ "${FILESDIR}"/cryfs-1.0.1-boost-1.88.patch
)
python_check_deps() {
diff --git a/sys-fs/cryfs/files/cryfs-1.0.1-boost-1.88.patch
b/sys-fs/cryfs/files/cryfs-1.0.1-boost-1.88.patch
new file mode 100644
index 000000000000..9a165333a1a8
--- /dev/null
+++ b/sys-fs/cryfs/files/cryfs-1.0.1-boost-1.88.patch
@@ -0,0 +1,29 @@
+https://github.com/cryfs/cryfs/pull/494
+https://github.com/cryfs/cryfs/commit/91e2c9b8fd5f7a1b0e57ad1310534606ce70c338
+
+From 91e2c9b8fd5f7a1b0e57ad1310534606ce70c338 Mon Sep 17 00:00:00 2001
+From: Michael Cho <[email protected]>
+Date: Sun, 13 Apr 2025 10:37:29 -0400
+Subject: [PATCH] Fix building with Boost 1.88
+
+--- a/src/cpp-utils/process/subprocess.cpp
++++ b/src/cpp-utils/process/subprocess.cpp
+@@ -1,7 +1,18 @@
+ #include "subprocess.h"
+ #include <array>
+ #include <boost/asio.hpp>
++#include <boost/version.hpp>
++#if BOOST_VERSION < 108800
+ #include <boost/process.hpp>
++#else
++#define BOOST_PROCESS_VERSION 1
++#include <boost/process/v1/args.hpp>
++#include <boost/process/v1/async_pipe.hpp>
++#include <boost/process/v1/child.hpp>
++#include <boost/process/v1/exe.hpp>
++#include <boost/process/v1/io.hpp>
++#include <boost/process/v1/search_path.hpp>
++#endif
+ #include <cerrno>
+ #include <cstddef>
+ #include <cstdio>
