automatic version update by autodist [release 1.86.0-1mamba;Sun Sep 08 2024]

This commit is contained in:
Automatic Build System 2024-09-21 13:51:23 +02:00
parent e26855dc17
commit 880cad342c
2 changed files with 35 additions and 4 deletions

View File

@ -0,0 +1,28 @@
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,8 +1,8 @@
%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.85.0 Version: 1.86.0
Release: 4mamba Release: 1mamba
Summary: Free peer-reviewed portable C++ source libraries Summary: Free peer-reviewed portable C++ source libraries
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
@ -10,6 +10,7 @@ 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
@ -77,6 +78,7 @@ 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
@ -142,8 +144,6 @@ done
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -172,6 +172,9 @@ done
%{_libdir}/libboost_numpy311.so.* %{_libdir}/libboost_numpy311.so.*
%changelog %changelog
* Sun Sep 08 2024 Automatic Build System <autodist@openmamba.org> 1.86.0-1mamba
- automatic version update by autodist
* Mon May 06 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.85.0-4mamba * Mon May 06 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.85.0-4mamba
- remove and provide/obsolete boost-jam requirement - remove and provide/obsolete boost-jam requirement