CVS commit: pkgsrc/meta-pkgs/boost

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Aug  6 09:54:57 UTC 2024

Modified Files:
        pkgsrc/meta-pkgs/boost: distinfo
Added Files:
        pkgsrc/meta-pkgs/boost/patches: patch-libs_python_src_numpy_dtype.cpp

Log Message:
boost: fix for Numpy 2.0


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 pkgsrc/meta-pkgs/boost/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/meta-pkgs/boost/patches/patch-libs_python_src_numpy_dtype.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/meta-pkgs/boost/distinfo
diff -u pkgsrc/meta-pkgs/boost/distinfo:1.149 pkgsrc/meta-pkgs/boost/distinfo:1.150
--- pkgsrc/meta-pkgs/boost/distinfo:1.149       Sat Jul  6 09:26:35 2024
+++ pkgsrc/meta-pkgs/boost/distinfo     Tue Aug  6 09:54:56 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.149 2024/07/06 09:26:35 cheusov Exp $
+$NetBSD: distinfo,v 1.150 2024/08/06 09:54:56 adam Exp $
 
 BLAKE2s (boost_1_85_0.tar.bz2) = ed6d31f08fd41a929d85dd69e02f83e4066ef5435548c1472aa3004247e8eb9b
 SHA512 (boost_1_85_0.tar.bz2) = b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0
@@ -31,5 +31,6 @@ SHA1 (patch-libs_context_src_asm_jump_ar
 SHA1 (patch-libs_context_src_asm_ontop_arm_aapcs_elf_gas.S) = f4e9912a3101f10a3f7ac0151aac957f80fdc9cc
 SHA1 (patch-libs_fiber_build_Jamfile.v2) = 4b4a6698111042a3e54dc181b555516e0685796d
 SHA1 (patch-libs_filesystem_src_directory.cpp) = ec0ee191ae0ebc2324acef3e1cb7e471b904d620
+SHA1 (patch-libs_python_src_numpy_dtype.cpp) = 4c8cc12addfb6f42d534729cce0ed77ac84ae56f
 SHA1 (patch-tools_build_src_engine_build.sh) = 7a756f04a2f11fd06bfa69c5d8ad160926f7da95
 SHA1 (patch-tools_build_src_tools_gcc.jam) = 4d895f14965ee29e328dda15e9975ccc1c14673f

Added files:

Index: pkgsrc/meta-pkgs/boost/patches/patch-libs_python_src_numpy_dtype.cpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-libs_python_src_numpy_dtype.cpp:1.1
--- /dev/null   Tue Aug  6 09:54:57 2024
+++ pkgsrc/meta-pkgs/boost/patches/patch-libs_python_src_numpy_dtype.cpp        Tue Aug  6 09:54:56 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-libs_python_src_numpy_dtype.cpp,v 1.1 2024/08/06 09:54:56 adam Exp $
+
+Support numpy 2.0.0b1
+https://github.com/boostorg/python/pull/432
+
+--- libs/python/src/numpy/dtype.cpp.orig       2024-08-06 09:52:03.876685530 +0000
++++ libs/python/src/numpy/dtype.cpp
+@@ -98,7 +98,13 @@ python::detail::new_reference dtype::con
+   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