diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-01 20:53:45 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-01 20:53:45 +0000 |
| commit | 896d6a8a88861c42b5d531a2f147c8a29a149bd8 (patch) | |
| tree | 081fe10813721a96088dca6b54bc35bcac18afc6 /dev-python/h5py | |
| parent | 3059f20995d5ac642b7b4a38d538fdf1cc45d90d (diff) | |
gentoo auto-resync : 01:12:2022 - 20:53:45
Diffstat (limited to 'dev-python/h5py')
| -rw-r--r-- | dev-python/h5py/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/h5py/files/h5py-3.7.0-types.patch | 36 | ||||
| -rw-r--r-- | dev-python/h5py/h5py-3.7.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/h5py/metadata.xml | 1 |
4 files changed, 44 insertions, 2 deletions
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest index ec2d1048b69b..a8f9acd741cc 100644 --- a/dev-python/h5py/Manifest +++ b/dev-python/h5py/Manifest @@ -1,3 +1,4 @@ +AUX h5py-3.7.0-types.patch 1285 BLAKE2B 13433f524dadbff797fc1668d0ac2954867d3c9c7e56e7f09137b5f180545981620498ad2504c2523005c73dbd61510475eb0874f2d880926b31632f2d978c27 SHA512 d7abc39ee2b1399b0f656e91944ee471f89d0030eb0378dce68232e70209b609c2cf9e62124e4124cf0c089584865357321dc5a641ccb33dbb27f97ad885ccde DIST h5py-3.7.0.tar.gz 392355 BLAKE2B efc974ff14457ef00329c6b2adf5b926e2dff33bbb4b9e9d60773760a973214c5279bfafca87c6fcab02bbffb85b780c708d26fb55a1e7a401d8d676f20acc15 SHA512 c10a9a623c88dbc965238cb2057b8924492c762c29610cfdb24f26f878a7322e414d3e5c90d750c2f5cfe1b4949f884bc17f09a126b01a4721ad6e14761174a2 -EBUILD h5py-3.7.0.ebuild 1476 BLAKE2B 9ad0c8e02a5ebe58bca6c3049880015cf86a5f4dcccaf0066c9d736708d276dfd09b7950c8149f653f2ef94dda95752bc9df57941576e579cd48bfc6746e6007 SHA512 8bb2b6710c0a2b4269a61b8c36c9542f6e26f2a711425c98285830bb3e30c701b5a43b59af7b557cc00e68cfda7f508853370b20105b29da4abe95651ec2ba34 -MISC metadata.xml 1018 BLAKE2B 0468b8a84848f5080a7951aa4639c9e7427fb7c6264863bb671194fcb96ebf1be434a881f1b06daeef6ec771db0d4b15a507a57334848d8969c62b85ebce872c SHA512 8e9149733004a5d2a0b0b5afe196be0ae3f6a1aa2018e8079c63987844612e7fa5ab576fcff36733b04098888103d967e5c2de4c548f091db96f72c79d35e0b5 +EBUILD h5py-3.7.0.ebuild 1530 BLAKE2B 31d244883d7b29a88ea5c2784c54a10d2d23d73bdc9687788fd0eb6231e9c4d561a1ae19c3bf4c1cfc51c768e4599a3bdffd4914417b6f5f243cd4039d3e7528 SHA512 07167239174305db3517ddf09006ca738571da477aa28c5210f7b381ba27109ddfb3233940c9719f2aacfb3c7b72f403c250362f4d58f5249ace7c1fc4ec4965 +MISC metadata.xml 1069 BLAKE2B 0f3ef8e7af7f4bb493824427a238588c019c04c28fe8a4b9c0b9af1c986158eb3dae3b7d7937713cc4c87374ef80686603ccdbae2baff5b1150d814ab108d973 SHA512 47a6074e383cc922234ebb9f67aaa5863421eaeb2003444587bb8499b3bf845da93ac8d8d267717bea01300691df10f67c9389248fbe228afe07c17fba3a64f3 diff --git a/dev-python/h5py/files/h5py-3.7.0-types.patch b/dev-python/h5py/files/h5py-3.7.0-types.patch new file mode 100644 index 000000000000..47058879445f --- /dev/null +++ b/dev-python/h5py/files/h5py-3.7.0-types.patch @@ -0,0 +1,36 @@ +From 873077a5b132c4294f0ea6af2eb29d61352c6688 Mon Sep 17 00:00:00 2001 +From: Gyeongjae Choi <def6488@gmail.com> +Date: Fri, 2 Sep 2022 07:54:44 +0000 +Subject: [PATCH] Fix incompatible pointer type + +--- + h5py/_errors.pxd | 2 +- + h5py/_errors.pyx | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/h5py/_errors.pxd b/h5py/_errors.pxd +index 13b299e27..e7791a6bd 100644 +--- a/h5py/_errors.pxd ++++ b/h5py/_errors.pxd +@@ -412,7 +412,7 @@ cdef extern from "hdf5.h": + + herr_t H5Eprint(hid_t estack_id, void *stream) + +- ctypedef herr_t (*H5E_walk_t)(int n, H5E_error_t *err_desc, void* client_data) ++ ctypedef herr_t (*H5E_walk_t)(unsigned int n, const H5E_error_t *err_desc, void* client_data) + herr_t H5Ewalk(hid_t estack_id, H5E_direction_t direction, H5E_walk_t func, void* client_data) + + # --- Functions for managing the HDF5 error callback mechanism --- +diff --git a/h5py/_errors.pyx b/h5py/_errors.pyx +index 612052fb2..ca7b1c48c 100644 +--- a/h5py/_errors.pyx ++++ b/h5py/_errors.pyx +@@ -94,7 +94,7 @@ cdef struct err_data_t: + H5E_error_t err + int n + +-cdef herr_t walk_cb(int n, H5E_error_t *desc, void *e) nogil: ++cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) nogil: + + cdef err_data_t *ee = <err_data_t*>e + diff --git a/dev-python/h5py/h5py-3.7.0.ebuild b/dev-python/h5py/h5py-3.7.0.ebuild index 4181426a752b..69050a69bde6 100644 --- a/dev-python/h5py/h5py-3.7.0.ebuild +++ b/dev-python/h5py/h5py-3.7.0.ebuild @@ -52,6 +52,10 @@ distutils_enable_sphinx docs \ #} python_prepare_all() { + local PATCHES=( + "${FILESDIR}"/${P}-types.patch + ) + # avoid pytest-mpi dep, we do not use mpi anyway sed -i -e 's:pytest-mpi::' pytest.ini || die distutils-r1_python_prepare_all diff --git a/dev-python/h5py/metadata.xml b/dev-python/h5py/metadata.xml index fd83f27a5b90..efccd0f8f324 100644 --- a/dev-python/h5py/metadata.xml +++ b/dev-python/h5py/metadata.xml @@ -19,6 +19,7 @@ datasets and recursive iteration over entire files. </longdescription> <upstream> + <remote-id type="github">h5py/h5py</remote-id> <remote-id type="google-code">h5py</remote-id> <remote-id type="pypi">h5py</remote-id> </upstream> |