From f2b70f352e7486d529620fb38703fa1c100ddb59 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Tue, 8 Feb 2022 14:24:26 +0900
Subject: [PATCH] boost: Update to 1.78.0

---
 ...ost-math-tools-header_deprecated.hpp.patch | 31 -------------------
 ...st-process-detail-posix-executor.hpp.patch | 13 ++++++++
 ...-process-detail-posix-shell_path.hpp.patch | 18 +++++++++++
 packages/boost/build.sh                       |  5 ++-
 .../tools-build-src-tools-stage.jam.patch     | 15 +++++++++
 5 files changed, 48 insertions(+), 34 deletions(-)
 delete mode 100644 packages/boost/boost-math-tools-header_deprecated.hpp.patch
 create mode 100644 packages/boost/boost-process-detail-posix-executor.hpp.patch
 create mode 100644 packages/boost/boost-process-detail-posix-shell_path.hpp.patch
 create mode 100644 packages/boost/tools-build-src-tools-stage.jam.patch

diff --git a/packages/boost/boost-math-tools-header_deprecated.hpp.patch b/packages/boost/boost-math-tools-header_deprecated.hpp.patch
deleted file mode 100644
index 5e16655b4..000000000
--- a/packages/boost/boost-math-tools-header_deprecated.hpp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/boost/math/tools/header_deprecated.hpp
-+++ b/boost/math/tools/header_deprecated.hpp
-@@ -6,12 +6,22 @@
- #ifndef BOOST_MATH_TOOLS_HEADER_DEPRECATED
- #define BOOST_MATH_TOOLS_HEADER_DEPRECATED
- 
--#ifdef _MSC_VER
--// Expands to "This header is deprecated; use expr instead."
--#define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
--#else // GNU, Clang, Intel, IBM, etc.
-+#ifndef BOOST_MATH_STANDALONE
-+
-+#   include <boost/config/header_deprecated.hpp>
-+#   define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_HEADER_DEPRECATED(expr)
-+
-+#else
-+
-+#   ifdef _MSC_VER
- // Expands to "This header is deprecated; use expr instead."
--#define BOOST_MATH_HEADER_DEPRECATED(expr) _Pragma("This header is deprecated; use " expr " instead.")
--#endif
-+#       define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
-+#   else // GNU, Clang, Intel, IBM, etc.
-+// Expands to "This header is deprecated use expr instead"
-+#       define BOOST_MATH_HEADER_DEPRECATED_MESSAGE(expr) _Pragma(#expr)
-+#       define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_MATH_HEADER_DEPRECATED_MESSAGE(message "This header is deprecated use " expr " instead")
-+#   endif
-+
-+#endif // BOOST_MATH_STANDALONE
- 
- #endif // BOOST_MATH_TOOLS_HEADER_DEPRECATED
diff --git a/packages/boost/boost-process-detail-posix-executor.hpp.patch b/packages/boost/boost-process-detail-posix-executor.hpp.patch
new file mode 100644
index 000000000..046c6df1e
--- /dev/null
+++ b/packages/boost/boost-process-detail-posix-executor.hpp.patch
@@ -0,0 +1,13 @@
+https://github.com/boostorg/process/issues/235
+
+--- a/boost/process/detail/posix/executor.hpp
++++ b/boost/process/detail/posix/executor.hpp
+@@ -153,7 +153,7 @@
+     {
+         //I am the child
+         const auto len = std::strlen(msg);
+-        int data[2] = {ec.value(), len + 1};
++        int data[2] = {ec.value(), static_cast<int>(len + 1)};
+ 
+         ::write(_pipe_sink, &data[0], sizeof(int) * 2);
+         ::write(_pipe_sink, msg, len);
diff --git a/packages/boost/boost-process-detail-posix-shell_path.hpp.patch b/packages/boost/boost-process-detail-posix-shell_path.hpp.patch
new file mode 100644
index 000000000..c289693ef
--- /dev/null
+++ b/packages/boost/boost-process-detail-posix-shell_path.hpp.patch
@@ -0,0 +1,18 @@
+--- a/boost/process/detail/posix/shell_path.hpp
++++ b/boost/process/detail/posix/shell_path.hpp
+@@ -18,13 +18,13 @@
+ 
+ inline boost::filesystem::path shell_path()
+ {
+-    return "/bin/sh";
++    return "@TERMUX_PREFIX@/bin/sh";
+ }
+ 
+ inline boost::filesystem::path shell_path(std::error_code &ec)
+ {
+     ec.clear();
+-    return "/bin/sh";
++    return "@TERMUX_PREFIX@/bin/sh";
+ }
+ 
+ }}}}
diff --git a/packages/boost/build.sh b/packages/boost/build.sh
index 0f9234c22..72e7977a0 100644
--- a/packages/boost/build.sh
+++ b/packages/boost/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://boost.org
 TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.77.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=1.78.0
 TERMUX_PKG_SRCURL=https://boostorg.jfrog.io/artifactory/main/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
-TERMUX_PKG_SHA256=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
+TERMUX_PKG_SHA256=8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
 TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib"
 TERMUX_PKG_BUILD_DEPENDS="python"
 TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2), boost-dev"
diff --git a/packages/boost/tools-build-src-tools-stage.jam.patch b/packages/boost/tools-build-src-tools-stage.jam.patch
new file mode 100644
index 000000000..ed660936e
--- /dev/null
+++ b/packages/boost/tools-build-src-tools-stage.jam.patch
@@ -0,0 +1,15 @@
+https://github.com/bfgroup/b2/commit/78fd284a42caabe8815cb0870b46e5567872e75b
+
+--- a/tools/build/src/tools/stage.jam
++++ b/tools/build/src/tools/stage.jam
+@@ -478,6 +478,10 @@ class install-target-class : basic-target
+         return [ sequence.unique $(result2) ] ;
+     }
+ 
++    rule skip-from-usage-requirements ( )
++    {
++    }
++
+     # Returns true iff 'type' is subtype of some element of 'types-to-include'.
+     #
+     local rule include-type ( type : types-to-include * )