automatic version update by autodist [release 1.87.0-1mamba;Sat Dec 21 2024]

This commit is contained in:
Automatic Build System 2025-02-17 19:56:05 +01:00
parent 880cad342c
commit af2bd2c93e
2 changed files with 8 additions and 31 deletions

View File

@ -1,28 +0,0 @@
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
---
src/numpy/dtype.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/numpy/dtype.cpp b/src/numpy/dtype.cpp
index 88a20a27b5..da30d1927b 100644
--- a/src/numpy/dtype.cpp
+++ b/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

@ -1,7 +1,7 @@
%define pckver %(echo %version | tr . _) %define pckver %(echo %version | tr . _)
%define pckmajver %(echo %version | cut -d. -f1-2 | tr . _) %define pckmajver %(echo %version | cut -d. -f1-2 | tr . _)
Name: libboost Name: libboost
Version: 1.86.0 Version: 1.87.0
Release: 1mamba Release: 1mamba
Summary: Free peer-reviewed portable C++ source libraries Summary: Free peer-reviewed portable C++ source libraries
Group: System/Libraries Group: System/Libraries
@ -10,7 +10,6 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.boost.org/ URL: https://www.boost.org/
Source: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/boost_%{pckver}.tar.bz2 Source: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/boost_%{pckver}.tar.bz2
Patch0: libboost-1.86.0-python-numpy-2.1.1.patch
License: Boost Software License License: Boost Software License
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -78,7 +77,6 @@ This package contains then Boost.python library for Python 3.
%setup -q -n boost_%{pckver} %setup -q -n boost_%{pckver}
#-D -T #-D -T
#:<< _EOF #:<< _EOF
%patch 0 -p1 -d libs/python -b .python-numpy-2.1.1
%build %build
#:<< _EOF #:<< _EOF
@ -159,6 +157,10 @@ done
%{_includedir}/boost/* %{_includedir}/boost/*
%{_libdir}/libboost_*.so %{_libdir}/libboost_*.so
%{_libdir}/libboost_*.a %{_libdir}/libboost_*.a
%dir %{_datadir}/boost_predef
%{_datadir}/boost_predef/build.jam
%dir %{_datadir}/boost_predef/tools
%{_datadir}/boost_predef/tools/*
%dir %{_libdir}/cmake/Boost-%{version} %dir %{_libdir}/cmake/Boost-%{version}
%{_libdir}/cmake/Boost-%{version}/Boost*.cmake %{_libdir}/cmake/Boost-%{version}/Boost*.cmake
%{_libdir}/cmake/Boost*.cmake %{_libdir}/cmake/Boost*.cmake
@ -172,6 +174,9 @@ done
%{_libdir}/libboost_numpy311.so.* %{_libdir}/libboost_numpy311.so.*
%changelog %changelog
* Sat Dec 21 2024 Automatic Build System <autodist@openmamba.org> 1.87.0-1mamba
- automatic version update by autodist
* Sun Sep 08 2024 Automatic Build System <autodist@openmamba.org> 1.86.0-1mamba * Sun Sep 08 2024 Automatic Build System <autodist@openmamba.org> 1.86.0-1mamba
- automatic version update by autodist - automatic version update by autodist