Date: Friday, April 24, 2020 @ 21:10:29 Author: archange Revision: 619595
Fix 1.6 compatibility API for h5py Added: hdf5/trunk/hdf5-1.12.0-compat-1.6.patch Modified: hdf5/trunk/PKGBUILD ------------------------------+ PKGBUILD | 11 +++-- hdf5-1.12.0-compat-1.6.patch | 89 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-24 21:09:46 UTC (rev 619594) +++ PKGBUILD 2020-04-24 21:10:29 UTC (rev 619595) @@ -6,7 +6,7 @@ pkgname=hdf5 pkgver=1.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="General purpose library and file format for storing scientific data" arch=(x86_64) url="https://www.hdfgroup.org/hdf5" @@ -16,8 +16,10 @@ replaces=(hdf5-cpp-fortran) provides=(hdf5-cpp-fortran) options=(staticlibs) -source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2") -sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61') +source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2" + hdf5-1.12.0-compat-1.6.patch) +sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61' + '72ad497c56760bb3af8193c88d3fa264125829850b843697de55d934c56f7f44') build() { # Crazy workaround: run CMake to generate pkg-config file @@ -68,4 +70,7 @@ install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname} # Install pkg-config files from CMake tree install -Dm644 ../build/CMakeFiles/hdf5{,_hl}{,_cpp}-${pkgver}.pc -t "${pkgdir}"/usr/lib/pkgconfig/ + # Fix 1.6 compatibility for h5py + cd "${pkgdir}"/usr/include/ + patch -p1 -i "${srcdir}"/hdf5-1.12.0-compat-1.6.patch } Added: hdf5-1.12.0-compat-1.6.patch =================================================================== --- hdf5-1.12.0-compat-1.6.patch (rev 0) +++ hdf5-1.12.0-compat-1.6.patch 2020-04-24 21:10:29 UTC (rev 619595) @@ -0,0 +1,89 @@ +--- a/H5version.h ++++ b/H5version.h +@@ -97,6 +97,10 @@ + #define H5Ewalk_vers 1 + #endif /* !defined(H5Ewalk_vers) */ + ++#if !defined(H5Fget_info_vers) ++ #define H5Fget_info_vers 1 ++#endif /* !defined(H5Fget_info_vers) */ ++ + #if !defined(H5Gcreate_vers) + #define H5Gcreate_vers 1 + #endif /* !defined(H5Gcreate_vers) */ +@@ -105,6 +109,38 @@ + #define H5Gopen_vers 1 + #endif /* !defined(H5Gopen_vers) */ + ++#if !defined(H5Lget_info_vers) ++ #define H5Lget_info_vers 1 ++#endif /* !defined(H5Lget_info_vers) */ ++ ++#if !defined(H5Lget_info_by_idx_vers) ++ #define H5Lget_info_by_idx_vers 1 ++#endif /* !defined(H5Lget_info_by_idx_vers) */ ++ ++#if !defined(H5Oget_info_vers) ++ #define H5Oget_info_vers 1 ++#endif /* !defined(H5Oget_info_vers) */ ++ ++#if !defined(H5Oget_info_by_idx_vers) ++ #define H5Oget_info_by_idx_vers 1 ++#endif /* !defined(H5Oget_info_by_idx_vers) */ ++ ++#if !defined(H5Oget_info_by_name_vers) ++ #define H5Oget_info_by_name_vers 1 ++#endif /* !defined(H5Oget_info_by_name_vers) */ ++ ++#if !defined(H5Ovisit_vers) ++ #define H5Ovisit_vers 1 ++#endif /* !defined(H5Ovisit_vers) */ ++ ++#if !defined(H5Ovisit_by_name_vers) ++ #define H5Ovisit_by_name_vers 1 ++#endif /* !defined(H5Ovisit_by_name_vers) */ ++ ++#if !defined(H5Pencode_vers) ++ #define H5Pencode_vers 1 ++#endif /* !defined(H5Pencode_vers) */ ++ + #if !defined(H5Pget_filter_vers) + #define H5Pget_filter_vers 1 + #endif /* !defined(H5Pget_filter_vers) */ +@@ -133,6 +169,10 @@ + #define H5Tarray_create_vers 1 + #endif /* !defined(H5Tarray_create_vers) */ + ++#if !defined(H5Sencode_vers) ++ #define H5Sencode_vers 1 ++#endif /* !defined(H5Sencode_vers) */ ++ + #if !defined(H5Tcommit_vers) + #define H5Tcommit_vers 1 + #endif /* !defined(H5Tcommit_vers) */ +@@ -153,6 +193,14 @@ + #define H5E_auto_t_vers 1 + #endif /* !defined(H5E_auto_t_vers) */ + ++#if !defined(H5O_info_t_vers) ++ #define H5O_info_t_vers 1 ++#endif /* !defined(H5O_info_t_vers) */ ++ ++#if !defined(H5O_iterate_t_vers) ++ #define H5O_iterate_t_vers 1 ++#endif /* !defined(H5O_iterate_t_vers) */ ++ + #if !defined(H5Z_class_t_vers) + #define H5Z_class_t_vers 1 + #endif /* !defined(H5Z_class_t_vers) */ +@@ -261,6 +309,10 @@ + #define H5Ovisit_by_name_vers 1 + #endif /* !defined(H5Ovisit_by_name_vers) */ + ++#if !defined(H5Pencode_vers) ++ #define H5Pencode_vers 1 ++#endif /* !defined(H5Pencode_vers) */ ++ + #if !defined(H5Pget_filter_vers) + #define H5Pget_filter_vers 2 + #endif /* !defined(H5Pget_filter_vers) */