1.10.5

3 files changed, 9 insertions, 141 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69bed18bdf22..4b0dda1a54cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Jun 16 06:16:52 UTC 2018
 pkgbase = mingw-w64-hdf5
 	pkgdesc = General purpose library and file format for storing scientific data (mingw-w64)
-	pkgver = 1.10.2
+	pkgver = 1.10.5
 	pkgrel = 1
 	url = http://www.hdfgroup.org/HDF5/
 	arch = any
@@ -14,10 +12,8 @@ pkgbase = mingw-w64-hdf5
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.2/src/hdf5-1.10.2.tar.bz2
-	source = attribute-before-function.patch
-	sha256sums = 1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71
-	sha256sums = 951d81d98f855c2f81e2d6e3f349217d1c452b59aa5ae03ecfe6c6eeed49cb3a
+	source = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
+	sha256sums = 68d6ea8843d2a106ec6a7828564c1689c7a85714a35d8efafa2fee20ca366f44
 
 pkgname = mingw-w64-hdf5
 
diff --git a/PKGBUILD b/PKGBUILD
index 5689b9ac58cb..923264515ba5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-hdf5
-pkgver=1.10.2
+pkgver=1.10.5
 _pkgver=${pkgver}
 pkgrel=1
 arch=('any')
@@ -9,18 +9,16 @@ license=('custom')
 depends=('mingw-w64-crt' 'mingw-w64-zlib')
 makedepends=('mingw-w64-cmake' 'mingw-w64-wine')
 options=('!strip' '!buildflags' 'staticlibs')
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${pkgver:0:4}/hdf5-${pkgver/_/-}/src/hdf5-${pkgver/_/-}.tar.bz2"
-        attribute-before-function.patch)
-sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71'
-            '951d81d98f855c2f81e2d6e3f349217d1c452b59aa5ae03ecfe6c6eeed49cb3a')
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${pkgver:0:4}/hdf5-${pkgver/_/-}/src/hdf5-${pkgver/_/-}.tar.bz2")
+sha256sums=('68d6ea8843d2a106ec6a7828564c1689c7a85714a35d8efafa2fee20ca366f44')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare () {
   cd "$srcdir/hdf5-${pkgver/_/-}"
 
-  # run H5detect.exe, H5make_libsettings.exe through wine
-  sed -i "s|COMMAND \$<TARGET_FILE:H5|COMMAND \${CMAKE_CROSSCOMPILING_EMULATOR} \$<TARGET_FILE:H5|g" src/CMakeLists.txt
+  # https://bitbucket.hdfgroup.org/projects/HDFFV/repos/hdf5/commits/bc35bf6b3ede9c8069d9bda4c08dc7b7fb230cc5#src/CMakeLists.txt
+  sed -i "s|COMMAND \${CMAKE_CROSSCOMPILING_EMULATOR}\$<TARGET_FILE:H5|COMMAND \${CMAKE_CROSSCOMPILING_EMULATOR} \$<TARGET_FILE:H5|g" src/CMakeLists.txt
 
   # do not use msvc import suffix
   sed -i "s|MINGW AND \${libtype} MATCHES \"SHARED\"|0|g" config/cmake_ext_mod/HDFMacros.cmake
@@ -28,9 +26,6 @@ prepare () {
   # dont add twice the lib prefix
   sed -i 's|set (LIB_RELEASE_NAME "lib\${libname}")|set (LIB_RELEASE_NAME "\${libname}")|g' config/cmake_ext_mod/HDFMacros.cmake
 
-  # https://bitbucket.hdfgroup.org/projects/HDFFV/repos/hdf5/commits/d6ea76ac002cd8483ba8a6aaf55bbce5ed552937
-  patch -p1 -i "$srcdir"/attribute-before-function.patch
-
   # H5win32defs.h:57:66: error: expected expression before ‘)’ token
   sed -i "s|_O_BINARY, __VA_ARGS__)|_O_BINARY, ## __VA_ARGS__)|g" src/H5win32defs.h
 
@@ -57,7 +52,7 @@ build() {
 package() {
   for _arch in $_architectures; do
     cd "$srcdir/hdf5-${pkgver/_/-}/build-${_arch}"
-    make DESTDIR="${pkgdir}" install
+    LD_PRELOAD="" make DESTDIR="${pkgdir}" install
     rm "$pkgdir"/usr/${_arch}/share/{COPYING,*.txt}
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
     ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
diff --git a/attribute-before-function.patch b/attribute-before-function.patch
deleted file mode 100644
index f4c9d807d967..000000000000
--- a/attribute-before-function.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From d6ea76ac002cd8483ba8a6aaf55bbce5ed552937 Mon Sep 17 00:00:00 2001
-From: Allen Byrne <byrn@hdfgroup.org>
-Date: Wed, 9 May 2018 12:21:32 -0500
-Subject: [PATCH] GGC requires attribute before function
-
----
- src/H5detect.c | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/src/H5detect.c b/src/H5detect.c
-index ff163cff9e..1c5554e8e5 100644
---- a/src/H5detect.c
-+++ b/src/H5detect.c
-@@ -1360,8 +1360,8 @@ bit.\n";
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C89_integers(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C89_integers(void)
- {
-     DETECT_BYTE(signed char,      SCHAR,        d_g[nd_g]); nd_g++;
-     DETECT_BYTE(unsigned char,      UCHAR,        d_g[nd_g]); nd_g++;
-@@ -1388,8 +1388,8 @@ detect_C89_integers(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C89_floats(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C89_floats(void)
- {
-     DETECT_F(float,     FLOAT,      d_g[nd_g]); nd_g++;
-     DETECT_F(double,    DOUBLE,     d_g[nd_g]); nd_g++;
-@@ -1410,8 +1410,8 @@ detect_C89_floats(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers8(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers8(void)
- {
- #if H5_SIZEOF_INT8_T>0
-   #if H5_SIZEOF_INT8_T==1
-@@ -1472,8 +1472,8 @@ detect_C99_integers8(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers16(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers16(void)
- {
- #if H5_SIZEOF_INT16_T>0
-     DETECT_I(int16_t,           INT16,        d_g[nd_g]); nd_g++;
-@@ -1510,8 +1510,8 @@ detect_C99_integers16(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers32(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers32(void)
- {
- #if H5_SIZEOF_INT32_T>0
-     DETECT_I(int32_t,           INT32,        d_g[nd_g]); nd_g++;
-@@ -1548,8 +1548,8 @@ detect_C99_integers32(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers64(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers64(void)
- {
- #if H5_SIZEOF_INT64_T>0
-     DETECT_I(int64_t,           INT64,        d_g[nd_g]); nd_g++;
-@@ -1599,8 +1599,8 @@ detect_C99_integers64(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_integers(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_integers(void)
- {
-     /* break it down to more subroutines so that each module subroutine */
-     /* is smaller and takes less time to compile with optimization on.  */
-@@ -1625,8 +1625,8 @@ detect_C99_integers(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_C99_floats(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_C99_floats(void)
- {
- #if H5_SIZEOF_DOUBLE == H5_SIZEOF_LONG_DOUBLE
-     /*
-@@ -1656,8 +1656,8 @@ detect_C99_floats(void) HDF_NO_UBSAN
-  *
-  *-------------------------------------------------------------------------
-  */
--static void
--detect_alignments(void) HDF_NO_UBSAN
-+static void HDF_NO_UBSAN
-+detect_alignments(void)
- {
-     /* Detect structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
-     DETECT_M(void *,              POINTER,      m_g[na_g]); na_g++;
-@@ -1744,8 +1744,8 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
-  *
-  *-------------------------------------------------------------------------
-  */
--int
--main(void) HDF_NO_UBSAN
-+int HDF_NO_UBSAN
-+main(void)
- {
- 
- #if defined(H5_HAVE_SETSYSINFO) && defined(SSI_NVPAIRS)