1.10.2

3 files changed, 145 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e0e3237643a..8c6ec3b79517 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri May 11 11:23:53 UTC 2018
+# Sat Jun  2 07:43:43 UTC 2018
 pkgbase = mingw-w64-hdf5
 	pkgdesc = General purpose library and file format for storing scientific data (mingw-w64)
-	pkgver = 1.10.1
+	pkgver = 1.10.2
 	pkgrel = 1
 	url = http://www.hdfgroup.org/HDF5/
 	arch = any
@@ -14,8 +14,10 @@ pkgbase = mingw-w64-hdf5
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.bz2
-	sha1sums = 22edee1f4ed603ea9544daec3492874fa3028bbb
+	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
 
 pkgname = mingw-w64-hdf5
 
diff --git a/PKGBUILD b/PKGBUILD
index 6c4f045a6595..eb01c9ccf897 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-hdf5
-pkgver=1.10.1
+pkgver=1.10.2
 _pkgver=${pkgver}
 pkgrel=1
 arch=('any')
@@ -9,8 +9,10 @@ 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")
-sha1sums=('22edee1f4ed603ea9544daec3492874fa3028bbb')
+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')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -26,6 +28,15 @@ 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
+
+  # fix cmake config location
+  sed -i 's|_INSTALL_DATA_DIR "."|_INSTALL_DATA_DIR share|g' config/cmake_ext_mod/HDFMacros.cmake
+  sed -i 's|_INSTALL_CMAKE_DIR cmake|_INSTALL_CMAKE_DIR share/cmake|g' config/cmake_ext_mod/HDFMacros.cmake
 }
 
 build() {
@@ -33,7 +44,7 @@ build() {
   for _arch in $_architectures; do
     cp -r hdf5-${pkgver/_/-} hdf5-${_arch} && pushd hdf5-${_arch}
     sed "s|@ARCH@|${_arch}|g" src/CMakeLists.txt.in > src/CMakeLists.txt
-    mkdir build-${_arch} && pushd build-${_arch}
+    mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake \
       -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
       -DBUILD_TESTING=OFF \
@@ -50,7 +61,7 @@ package() {
   for _arch in $_architectures; do
     cd "$srcdir/hdf5-${_arch}/build-${_arch}"
     make DESTDIR="${pkgdir}" install
-    rm "$pkgdir"/usr/${_arch}/{COPYING,*.txt}
+    rm "$pkgdir"/usr/${_arch}/share/{COPYING,*.txt}
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
     ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
   done
diff --git a/attribute-before-function.patch b/attribute-before-function.patch
new file mode 100644
index 000000000000..f4c9d807d967
--- /dev/null
+++ b/attribute-before-function.patch
@@ -0,0 +1,123 @@
+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)