Accepting request 1184037 from devel:libraries:c_c++
OBS-URL: https://build.opensuse.org/request/show/1184037 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=167
This commit is contained in:
commit
2c4d21e8ae
26
boost-1.85.0-python-numpy-2.patch
Normal file
26
boost-1.85.0-python-numpy-2.patch
Normal 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
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jun 29 09:13:57 CEST 2024 - Friedrich Haubensak <hsk17@mail.de>
|
||||||
|
|
||||||
|
- add patch boost-1.85.0-python-numpy-2.patch from upstream
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 23 09:50:52 CEST 2024 - aschnell@suse.com
|
Tue Apr 23 09:50:52 CEST 2024 - aschnell@suse.com
|
||||||
|
|
||||||
|
@ -244,6 +244,8 @@ Patch20: python_library_name.patch
|
|||||||
Patch21: boost-remove-cmakedir.patch
|
Patch21: boost-remove-cmakedir.patch
|
||||||
Patch22: boost-process.patch
|
Patch22: boost-process.patch
|
||||||
Patch23: boost-charconv-quadmath.patch
|
Patch23: boost-charconv-quadmath.patch
|
||||||
|
# PATCH-FIX-UPSTREAM boost-1.85.0-python-numpy-2.patch -- gh#boostorg/python/pull/432
|
||||||
|
Patch24: boost-1.85.0-python-numpy-2.patch
|
||||||
%{?suse_build_hwcaps_libs}
|
%{?suse_build_hwcaps_libs}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -1271,6 +1273,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
|
|||||||
%patch -P 21 -p1
|
%patch -P 21 -p1
|
||||||
%patch -P 22 -p2
|
%patch -P 22 -p2
|
||||||
%patch -P 23 -p1
|
%patch -P 23 -p1
|
||||||
|
%patch -P 24 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
find . -type f -exec chmod u+w {} +
|
find . -type f -exec chmod u+w {} +
|
||||||
|
Loading…
Reference in New Issue
Block a user