diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-02 00:07:23 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-02 00:07:23 +0100 |
| commit | 6657c680376cedf378fcf328e5fa03ed3b41d580 (patch) | |
| tree | 44ea8d174f647daca562b9bdcbcb527a85a77d0a /dev-libs/boost | |
| parent | 1551fe56fd6ba43a94509cffc61b6bf854b7ac9f (diff) | |
gentoo auto-resync : 02:06:2024 - 00:07:23
Diffstat (limited to 'dev-libs/boost')
| -rw-r--r-- | dev-libs/boost/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/boost/boost-1.85.0.ebuild | 3 | ||||
| -rw-r--r-- | dev-libs/boost/files/boost-1.85.0-python-numpy-2.patch | 26 |
3 files changed, 30 insertions, 2 deletions
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 332622108793..9f57ad68f816 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -5,8 +5,9 @@ AUX boost-1.83.0-math-gcc14.patch 936 BLAKE2B 8cf731affa3684692b773ed4941240616a AUX boost-1.84.0-signals2-patch1.patch 5250 BLAKE2B 6e620d8e9fe1dbd4b2dbf7aec8c1cc4bdd36935027e1648a3e51f3c11e31ebe13d8100dcdcc40009a4c356e87f0df01ad1ca38327b8926b5de230d81c322f4a8 SHA512 8ab253eb562587b7d796bc559934a1044b475698986f71d2a3c80d19758fd53eea213356a43dcb87861e198dfb0178f86ab7bbfc54d4e6e44092c1502dfec595 AUX boost-1.84.0-signals2-patch2.patch 783 BLAKE2B 76e989e7df011ecce99e5747ca73997f001d0e76e3453fe952f03b9b8adbcc1f5adbda2935c2a2761eef783e0317d56d36ab3bf63e11875466afa28507a09518 SHA512 4dc438ac7b19edb9640599add2859bd3dfdb58fa53e846c292e1c550e5737daa256d46e14d97ba8dc1e6ea01b0ad0d3075320211d4aba0a48048f0158004378f AUX boost-1.85.0-bcp-filesystem.patch 7299 BLAKE2B d2792ee52008955a6f4d233c0a130fe698df7d1e060e9a25a2c058fd7a1ba4c8f6b7a92af773183fa73b0511d7f85f5473d5f9cea1cd71ec08f2db92fa7bd09d SHA512 501f71fa1451af7699689c3befc477e6612612f11a3c33d350d680ce8c511ba9e6765e05aefa9608fe98eca0413a43755cf61fea1a4cd2d03ea0962f7884b452 +AUX boost-1.85.0-python-numpy-2.patch 986 BLAKE2B 5f4cd317c75f8eb3183f720ac76afeffeb4f1e2617f32a795a94d9db56c7c27cba7a1b2591f2f851223b85ce962293bf54733e0d3f830340d2ef174a869284ed SHA512 46b3831acbd89980abc8312d8ba0a991d9c8531f0f8b63f5218ef8920fcf18b1ff207748abef2f3753baf6ea0932dc0c4ef524daec7fb265f64e35c5335f7a96 DIST boost_1_84_0.tar.bz2 123110547 BLAKE2B a872ee00402be0383726020f4d13a7df6c2765c52eac2e09aab1604432931d26dd597503f5dcbbf788d7e7528d13c6d1dbfff1e85d22bf92c7828ef74cf2405d SHA512 5dfeb35198bb096e46cf9e131ef0334cb95bc0bf09f343f291b860b112598b3c36111bd8c232439c401a2b2fb832fa0c399a8d5b96afc60bd359dff070154497 DIST boost_1_85_0.tar.bz2 124015250 BLAKE2B dd72a9299cd78d2c260e1c94e28ba04daaa352f5bd023d99e43caa3540b1e0f8c09fc04b91f68db0ef8532e4a91fdef0b66a80bf0f9f838303bccaf0729bf581 SHA512 b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0 EBUILD boost-1.84.0-r3.ebuild 11406 BLAKE2B d0534d67b863800cf37d7e848c69e8b360554dffa8b009959b5b91c85ff69c73e671ac94c07f1e03ae2d52b4ccf6d577526e7402d4f0c95ea93e9e2578444382 SHA512 415ad4e0844fa377fbdfaff5100c44889f30080507a4aa747c866d79bf7aed8b96224c1608cc896c24fe89b6d8c6ba3003adf7789dfb06567465a03254e46ca9 -EBUILD boost-1.85.0.ebuild 11257 BLAKE2B 18f618fc025c4185cb3044a9b9ae7e1a6792aa33523fca975f0a2967aebd8846a40f36b2d8a83dc2bd2d9d0d9694cda546675b494327fd78f5720211adccc840 SHA512 b101dc7141418951015a5617b16cd11a4d5e75b8fb829e9a94e11eb4a259c97b075ba367a8172756c038b543bf5d4983e63f02e858a9f2d16cad5e82017dc850 +EBUILD boost-1.85.0.ebuild 11308 BLAKE2B d5875b770c73c6066343d2ea46d59c5645b0bf2ec14ce99a76b8682075f1f123fe71e9c79616a71faade44f81ea119accc3b6d1f9dae40201a9d52a9b61864ad SHA512 c46b9978b98604a9a670d269f5fc86f3c587db721fd44fe39c8097c5d7182034bc3140a2d3863dc86744b5ad2ecde4a5885de717bc33d7ada90fb7f73113d459 MISC metadata.xml 9162 BLAKE2B c8df087c7fe1e4af3a59f21763777d3f1318aebcd524e077b6a93c374e0910ff31b1e73b8b4908130d63c2bb7d060348602cffd215648f09afd8015c782e2340 SHA512 3c45d74e046e0fd09f152fcfa7af942c9097e3ed91a0915a2541caad14a8b94b9faceccdbc74bf8aa7c8f7b383db7e91e09babba9c2c28fd7855a7b809616839 diff --git a/dev-libs/boost/boost-1.85.0.ebuild b/dev-libs/boost/boost-1.85.0.ebuild index 30577a1da191..ef6dcf165f8c 100644 --- a/dev-libs/boost/boost-1.85.0.ebuild +++ b/dev-libs/boost/boost-1.85.0.ebuild @@ -40,7 +40,7 @@ RDEPEND=" mpi? ( virtual/mpi[${MULTILIB_USEDEP},cxx,threads] ) python? ( ${PYTHON_DEPS} - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + numpy? ( dev-python/numpy:=[${PYTHON_USEDEP}] ) ) zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" @@ -51,6 +51,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch "${FILESDIR}"/${PN}-1.85.0-bcp-filesystem.patch + "${FILESDIR}"/${PN}-1.85.0-python-numpy-2.patch ) create_user-config.jam() { diff --git a/dev-libs/boost/files/boost-1.85.0-python-numpy-2.patch b/dev-libs/boost/files/boost-1.85.0-python-numpy-2.patch new file mode 100644 index 000000000000..e7a7d98b8573 --- /dev/null +++ b/dev-libs/boost/files/boost-1.85.0-python-numpy-2.patch @@ -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 |