[arch-commits] Commit in python-h5py/trunk (2 files)

[Bruno Pagani]

    Date: Saturday, October 31, 2020 @ 14:26:03
  Author: archange
Revision: 737731

Remove upstreamed patches

Deleted:
  python-h5py/trunk/h5py-2.10.0-hdf5-v1.12-h5i.patch
  python-h5py/trunk/python-h5py-hd5-1.12.patch

----------------------------------+
 h5py-2.10.0-hdf5-v1.12-h5i.patch |   23 -----------------------
 python-h5py-hd5-1.12.patch       |   37 -------------------------------------
 2 files changed, 60 deletions(-)

Deleted: h5py-2.10.0-hdf5-v1.12-h5i.patch
===================================================================
--- h5py-2.10.0-hdf5-v1.12-h5i.patch	2020-10-31 14:25:51 UTC (rev 737730)
+++ h5py-2.10.0-hdf5-v1.12-h5i.patch	2020-10-31 14:26:03 UTC (rev 737731)
@@ -1,23 +0,0 @@
-diff --git a/h5py/api_types_hdf5.pxd b/h5py/api_types_hdf5.pxd
-index a282ecc..5bc76fa 100644
---- a/h5py/api_types_hdf5.pxd
-+++ b/h5py/api_types_hdf5.pxd
-@@ -297,7 +297,6 @@ cdef extern from "hdf5.h":
-     H5I_DATASPACE,          # group ID for Dataspace objects
-     H5I_DATASET,            # group ID for Dataset objects
-     H5I_ATTR,               # group ID for Attribute objects
--    H5I_REFERENCE,          # group ID for Reference objects
-     H5I_VFL,                # group ID for virtual file layer
-     H5I_GENPROP_CLS,        # group ID for generic property list classes
-     H5I_GENPROP_LST,        # group ID for generic property lists
-diff --git a/h5py/h5i.pyx b/h5py/h5i.pyx
-index 9033d50..bb5867c 100644
---- a/h5py/h5i.pyx
-+++ b/h5py/h5i.pyx
-@@ -23,6 +23,5 @@ DATASPACE   = H5I_DATASPACE
- DATASET     = H5I_DATASET
- ATTR        = H5I_ATTR
--REFERENCE   = H5I_REFERENCE
- GENPROP_CLS = H5I_GENPROP_CLS
- GENPROP_LST = H5I_GENPROP_LST
- DATATYPE    = H5I_DATATYPE

Deleted: python-h5py-hd5-1.12.patch
===================================================================
--- python-h5py-hd5-1.12.patch	2020-10-31 14:25:51 UTC (rev 737730)
+++ python-h5py-hd5-1.12.patch	2020-10-31 14:26:03 UTC (rev 737731)
@@ -1,37 +0,0 @@
-diff --git a/h5py/_conv.pyx b/h5py/_conv.pyx
-index 9bc8f5cf8..93cc6fdf4 100644
---- a/h5py/_conv.pyx
-+++ b/h5py/_conv.pyx
-@@ -400,7 +400,7 @@ cdef int conv_regref2pyref(void* ipt, void* opt, void* bkg, void* priv) except -
-     cdef PyObject* bkg_obj0
-
-     memcpy(&bkg_obj0, bkg_obj, sizeof(bkg_obj0));
--    memcpy(ref.ref.reg_ref, buf_ref, sizeof(hdset_reg_ref_t))
-+    memcpy(ref.ref.reg_ref.data, buf_ref, sizeof(hdset_reg_ref_t))
-
-     ref.typecode = H5R_DATASET_REGION
-
-@@ -430,7 +430,7 @@ cdef int conv_pyref2regref(void* ipt, void* opt, void* bkg, void* priv) except -
-         if not isinstance(obj, RegionReference):
-             raise TypeError("Can't convert incompatible object to HDF5 region reference")
-         ref = <RegionReference>(buf_obj0)
--        memcpy(buf_ref, ref.ref.reg_ref, sizeof(hdset_reg_ref_t))
-+        memcpy(buf_ref, ref.ref.reg_ref.data, sizeof(hdset_reg_ref_t))
-     else:
-         memset(buf_ref, c'\0', sizeof(hdset_reg_ref_t))
-
-diff --git a/h5py/h5r.pxd b/h5py/h5r.pxd
-index 53bbaf496..825b798fa 100644
---- a/h5py/h5r.pxd
-+++ b/h5py/h5r.pxd
-@@ -13,7 +13,9 @@ from .defs cimport *
- cdef extern from "hdf5.h":
- 
-   ctypedef haddr_t hobj_ref_t
--  ctypedef unsigned char hdset_reg_ref_t[12]
-+
-+cdef struct hdset_reg_ref_t:
-+    uint8_t data[12] # sizeof(haddr_t) + 4 == sizeof(signed long long) + 4
- 
- cdef union ref_u:
-     hobj_ref_t         obj_ref