Compare commits

..

No commits in common. "factory" and "devel" have entirely different histories.

6 changed files with 106 additions and 0 deletions

View File

@ -0,0 +1,26 @@
https://bugs.gentoo.org/932459
https://github.com/boostorg/python/issues/431
https://github.com/boostorg/python/pull/432
From 33ac06ca59a68266d3d26edf08205d31ddab4a6c Mon Sep 17 00:00:00 2001
From: Alexis DUBURCQ <alexis.duburcq@gmail.com>
Date: Fri, 15 Mar 2024 14:10:16 +0100
Subject: [PATCH] Support numpy 2.0.0b1
--- a/libs/python/src/numpy/dtype.cpp
+++ b/libs/python/src/numpy/dtype.cpp
@@ -98,7 +98,13 @@ python::detail::new_reference dtype::convert(object const & arg, bool align)
return python::detail::new_reference(reinterpret_cast<PyObject*>(obj));
}
-int dtype::get_itemsize() const { return reinterpret_cast<PyArray_Descr*>(ptr())->elsize;}
+int dtype::get_itemsize() const {
+#if NPY_ABI_VERSION < 0x02000000
+ return reinterpret_cast<PyArray_Descr*>(ptr())->elsize;
+#else
+ return PyDataType_ELSIZE(reinterpret_cast<PyArray_Descr*>(ptr()));
+#endif
+}
bool equivalent(dtype const & a, dtype const & b) {
// On Windows x64, the behaviour described on

View File

@ -0,0 +1,17 @@
The quadmath detection is broken, see https://github.com/boostorg/charconv/issues/191.
Just disable quadmath.
--- a/boost/charconv/detail/config.hpp 2024-04-23 11:38:55.099806792 +0200
+++ b/boost/charconv/detail/config.hpp 2024-04-23 11:39:01.966514420 +0200
@@ -27,11 +27,6 @@
# define BOOST_CHARCONV_UINT128_MAX (2 * static_cast<boost::uint128_type>(BOOST_CHARCONV_INT128_MAX) + 1)
#endif
-#if defined(BOOST_HAS_FLOAT128) && !defined(__STRICT_ANSI__) && !defined(BOOST_CHARCONV_NO_QUADMATH)
-# define BOOST_CHARCONV_HAS_FLOAT128
-# include <quadmath.h>
-#endif
-
#ifndef BOOST_NO_CXX14_CONSTEXPR
# define BOOST_CHARCONV_CXX14_CONSTEXPR BOOST_CXX14_CONSTEXPR
# define BOOST_CHARCONV_CXX14_CONSTEXPR_NO_INLINE BOOST_CXX14_CONSTEXPR

34
boost-compute-uuid.patch Normal file
View File

@ -0,0 +1,34 @@
https://github.com/boostorg/uuid/issues/166
https://github.com/boostorg/compute/pull/887
https://github.com/boostorg/compute/pull/893
diff --git a/boost/compute/detail/sha1.hpp b/boost/compute/detail/sha1.hpp
index 5afe5f9c4..3a1820074 100644
--- a/boost/compute/detail/sha1.hpp
+++ b/boost/compute/detail/sha1.hpp
@@ -37,13 +37,22 @@ class sha1 {
}
operator std::string() {
+ #if BOOST_VERSION >= 108600
+ boost::uuids::detail::sha1::digest_type digest;
+ #else
unsigned int digest[5];
+ #endif
+
h.get_digest(digest);
std::ostringstream buf;
+ #if BOOST_VERSION >= 108600
+ for(int i = 0; i < 20; ++i)
+ buf << std::hex << std::setfill('0') << std::setw(2) << +digest[i];
+ #else
for(int i = 0; i < 5; ++i)
buf << std::hex << std::setfill('0') << std::setw(8) << digest[i];
-
+ #endif
return buf.str();
}
private:

23
boost-process.patch Normal file
View File

@ -0,0 +1,23 @@
From e08374ed95ac33865bda40602c94909e7cd9607f Mon Sep 17 00:00:00 2001
From: Eddie-cz <48474051+Eddie-cz@users.noreply.github.com>
Date: Mon, 2 Aug 2021 10:49:42 +0200
Subject: [PATCH] Update wchar_t.hpp
---
include/boost/process/detail/traits/wchar_t.hpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/boost/process/detail/traits/wchar_t.hpp b/include/boost/process/detail/traits/wchar_t.hpp
index 812a92c..98026d3 100644
--- a/include/boost/process/detail/traits/wchar_t.hpp
+++ b/include/boost/process/detail/traits/wchar_t.hpp
@@ -12,6 +12,8 @@
#include <boost/process/detail/traits/env.hpp>
#include <boost/process/locale.hpp>
+#include <algorithm>
+
namespace boost { namespace process { namespace detail {
//template

3
boost_1_85_0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617
size 124015250

3
boost_1_86_0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b
size 126220652