From 6bafc05c88f69fa9795dd687ae04c61084f4f093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 15 Aug 2024 22:53:50 -0300
Subject: [PATCH] hdf5: update to 1.14.6, fix cross.

---
 common/shlibs                                 | 12 ++++-----
 ...68f4091f1c35f621d2acdeadd34db6756976.patch | 24 ++++++++++++++++++
 .../patches/workaround-broken-test-i686.patch | 13 ++++++++++
 srcpkgs/hdf5/template                         | 25 +++++++++++++------
 4 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/hdf5/patches/0af668f4091f1c35f621d2acdeadd34db6756976.patch
 create mode 100644 srcpkgs/hdf5/patches/workaround-broken-test-i686.patch

diff --git a/common/shlibs b/common/shlibs
index eab9adbbf5d..a6b26f6e9e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2646,12 +2646,12 @@ libpjsip-ua.so.2 pjproject-2.8_5
 libpjsip.so.2 pjproject-2.8_5
 libpjsua.so.2 pjproject-2.8_5
 libpjsua2.so.2 pjproject-2.8_5
-libhdf5_hl.so.100 hdf5-1.10.1_2
-libhdf5.so.103 hdf5-1.10.4_1
-libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
-libhdf5_cpp.so.103 hdf5-1.10.4_1
-libhdf5hl_fortran.so.100 hdf5-1.10.1_2
-libhdf5_fortran.so.102 hdf5-1.10.5_1
+libhdf5_hl.so.310 hdf5-1.14.6_1
+libhdf5.so.310 hdf5-1.14.6_1
+libhdf5_hl_cpp.so.310 hdf5-1.14.6_1
+libhdf5_cpp.so.310 hdf5-1.14.6_1
+libhdf5hl_fortran.so.310 hdf5-1.14.6_1
+libhdf5_fortran.so.310 hdf5-1.14.6_1
 libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
diff --git a/srcpkgs/hdf5/patches/0af668f4091f1c35f621d2acdeadd34db6756976.patch b/srcpkgs/hdf5/patches/0af668f4091f1c35f621d2acdeadd34db6756976.patch
new file mode 100644
index 00000000000..580c94d353c
--- /dev/null
+++ b/srcpkgs/hdf5/patches/0af668f4091f1c35f621d2acdeadd34db6756976.patch
@@ -0,0 +1,24 @@
+Fix for 32 bit, see: https://github.com/HDFGroup/hdf5/issues/4916
+
+From 0af668f4091f1c35f621d2acdeadd34db6756976 Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <orion@nwra.com>
+Date: Fri, 4 Oct 2024 13:33:15 -0600
+Subject: [PATCH] Re-add call to AC_CHECK_SIZEOF([__float128]). Fixes #4916.
+ (#4924)
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index af6c974a2a0..c5bfe4276af 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -854,6 +854,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
+   if test "$MY_FLT128_DIG" -gt "$MY_LDBL_DIG" ; then
+     AC_MSG_RESULT([yes])
+     AC_DEFINE([HAVE_FLOAT128], [1], [Determine if __float128 will be used in the Fortran wrappers])
++    AC_CHECK_SIZEOF([__float128])
+   else
+     ## Can't use __float128, but write an undef line anyway
+     AC_MSG_RESULT([no])
diff --git a/srcpkgs/hdf5/patches/workaround-broken-test-i686.patch b/srcpkgs/hdf5/patches/workaround-broken-test-i686.patch
new file mode 100644
index 00000000000..1246996c447
--- /dev/null
+++ b/srcpkgs/hdf5/patches/workaround-broken-test-i686.patch
@@ -0,0 +1,13 @@
+This test is broken on i686, see: https://github.com/HDFGroup/hdf5/issues/4926
+
+--- a/fortran/test/tH5R.F90
++++ b/fortran/test/tH5R.F90
+@@ -668,7 +668,7 @@
+   CALL verify("h5rget_obj_name_f", TRIM(buf_big), "/"//groupname1, total_error)
+ 
+   ! getting path to dataset
+-  CALL h5rget_obj_name_f(C_LOC(ref_ptr(2)), "", error, name_len=buf_size )
++  CALL h5rget_obj_name_f(C_LOC(ref_ptr(2)), "A long string is needed here", error, name_len=buf_size )
+   CALL check("H5Rget_name_f", error, total_error)
+   CALL verify("H5Rget_name_f2", INT(buf_size),LEN("/"//groupname1//"/"//groupname2),total_error)
+ 
diff --git a/srcpkgs/hdf5/template b/srcpkgs/hdf5/template
index a2ea9fcd797..787227ad42a 100644
--- a/srcpkgs/hdf5/template
+++ b/srcpkgs/hdf5/template
@@ -1,22 +1,31 @@
 # Template file for 'hdf5'
 pkgname=hdf5
-version=1.10.11
+version=1.14.6
 revision=1
 build_style=gnu-configure
-configure_args="--enable-cxx --enable-fortran"
-hostmakedepends="gcc-fortran"
+configure_args="--enable-cxx"
+hostmakedepends="perl autoconf"
 makedepends="zlib-devel"
 short_desc="Data model, library, and file format for storing and managing data"
 maintainer="pulux <pulux@pf4sh.de>"
 license="custom:BSD-3-Clause-LBNL-alike"
-homepage="https://hdfgroup.org"
-distfiles="https://github.com/HDFGroup/hdf5/archive/hdf5-${version//./_}.tar.gz"
-checksum=4ef6375fc7d8c54dcd66e9bc35a7a3580d33cd8878bdf21ad1eb388a43863159
-nocross="https://web.archive.org/web/20230924050239/https://portal.hdfgroup.org/pages/viewpage.action?pageId=48808266"
+homepage="https://www.hdfgroup.org/solutions/hdf5/"
+changelog="https://github.com/HDFGroup/hdf5/releases"
+distfiles="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_${version}.tar.gz"
+checksum=09ee1c671a87401a5201c06106650f62badeea5a3b3941e9b1e2e1e08317357f
+
+if [ -z "$CROSS_BUILD" ]; then
+	# fortran support needs to run programs to configure
+	configure_args+=" --enable-fortran"
+	hostmakedepends+=" gcc-fortran"
+fi
+
+pre_configure() {
+	autoconf
+}
 
 post_install() {
 	vlicense COPYING
-	rm -rf ${DESTDIR}/usr/lib/libdynlib*.so
 }
 
 hdf5-devel_package() {