From 20ac3ea111aee0baca5aaad7cef79c47d960fa91 Mon Sep 17 00:00:00 2001 From: kth5 Date: Tue, 23 Jul 2024 21:06:15 +0200 Subject: [PATCH] * update hdf5 to 1.14.4.3-1 --- hdf5/.SRCINFO | 22 ++++++++ hdf5/PKGBUILD | 10 ++-- hdf5/hdf5-1.12.0-compat-1.6.patch | 89 ------------------------------- 3 files changed, 25 insertions(+), 96 deletions(-) create mode 100644 hdf5/.SRCINFO delete mode 100644 hdf5/hdf5-1.12.0-compat-1.6.patch diff --git a/hdf5/.SRCINFO b/hdf5/.SRCINFO new file mode 100644 index 0000000000..4df74cc03e --- /dev/null +++ b/hdf5/.SRCINFO @@ -0,0 +1,22 @@ +pkgbase = hdf5 + pkgdesc = General purpose library and file format for storing scientific data + pkgver = 1.14.4.3 + pkgrel = 1 + url = https://www.hdfgroup.org/hdf5 + arch = x86_64 + license = custom + makedepends = cmake + makedepends = time + makedepends = gcc-fortran + makedepends = java-environment + depends = zlib + depends = libaec + depends = bash + provides = hdf5-java + replaces = hdf5-java + source = https://github.com/HDFGroup/hdf5/archive/hdf5_1.14.4.3/hdf5-1.14.4.3.tar.gz + source = https://github.com/HDFGroup/hdf5/commit/ea760136.patch + sha256sums = 690c1db7ba0fed4ffac61709236675ffd99d95d191e8920ee79c58d7e7ea3361 + sha256sums = eac6786aa11e84090ce9b35d0eb3a8054d28d0d22debfe31c65845379325218d + +pkgname = hdf5 diff --git a/hdf5/PKGBUILD b/hdf5/PKGBUILD index 4902901744..a097f67172 100644 --- a/hdf5/PKGBUILD +++ b/hdf5/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Tom K pkgname=hdf5 -pkgver=1.14.4.2 -pkgrel=6 +pkgver=1.14.4.3 +pkgrel=1 pkgdesc="General purpose library and file format for storing scientific data" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://www.hdfgroup.org/hdf5" @@ -18,18 +18,14 @@ replaces=(hdf5-java) provides=(hdf5-java) #source=(https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2) source=(https://github.com/HDFGroup/hdf5/archive/hdf5_$pkgver/$pkgname-$pkgver.tar.gz - hdf5-fix-crash-partially-initialized-datatypes.patch https://github.com/HDFGroup/hdf5/commit/ea760136.patch) -sha256sums=('44c47120e8beeb69f83b2de10203dceb6ef63f253b7859063a60205c8f48ab80' - 'e3b096ac3e401b7af900eb5eacbcd9b7b5d83619bc7e2fad9cf6fa8420acf7c9' +sha256sums=('690c1db7ba0fed4ffac61709236675ffd99d95d191e8920ee79c58d7e7ea3361' 'eac6786aa11e84090ce9b35d0eb3a8054d28d0d22debfe31c65845379325218d') prepare() { cd ${pkgname}-${pkgname}_${pkgver/_/-} # Don't mess with build flags sed -e '/-Werror/d' -i configure - # Fix segfault in h5py tests - patch -p1 -i ../hdf5-fix-crash-partially-initialized-datatypes.patch # Fix operator= patch -p1 -i ../ea760136.patch } diff --git a/hdf5/hdf5-1.12.0-compat-1.6.patch b/hdf5/hdf5-1.12.0-compat-1.6.patch deleted file mode 100644 index eda1919dc9..0000000000 --- a/hdf5/hdf5-1.12.0-compat-1.6.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- 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) */