[arch-commits] Commit in hdf5/trunk (PKGBUILD hdf5-1.12.0-compat-1.6.patch)

2020-04-24 Thread Bruno Pagani via arch-commits
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
===
--- PKGBUILD2020-04-24 21:09:46 UTC (rev 619594)
+++ PKGBUILD2020-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.patch2020-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) */


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2020-04-10 Thread Bruno Pagani via arch-commits
Date: Friday, April 10, 2020 @ 21:42:51
  Author: archange
Revision: 613185

upgpkg: hdf5 1.12.0-1

Use new upstream configure switch for examples dir.

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   27 ++-
 1 file changed, 10 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-10 21:31:13 UTC (rev 613184)
+++ PKGBUILD2020-04-10 21:42:51 UTC (rev 613185)
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Ronald van Haren 
 # Maintainer: Bruno Pagani 
 # Contributor: Stefan Husmann 
@@ -6,19 +5,19 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.5
+pkgver=1.12.0
 pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data"
-arch=('x86_64')
+arch=(x86_64)
 url="https://www.hdfgroup.org/hdf5;
-license=('custom')
-depends=('zlib' 'libaec' 'bash')
-makedepends=('cmake' 'time' 'gcc-fortran')
-replaces=('hdf5-cpp-fortran')
-provides=('hdf5-cpp-fortran')
-options=('staticlibs')
+license=(custom)
+depends=(zlib libaec bash)
+makedepends=(cmake time gcc-fortran)
+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=('68d6ea8843d2a106ec6a7828564c1689c7a85714a35d8efafa2fee20ca366f44')
+sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61')
 
 build() {
 # Crazy workaround: run CMake to generate pkg-config file
@@ -38,6 +37,7 @@
 ./configure \
 --prefix=/usr \
 --docdir=/usr/share/doc/hdf5/ \
+--with-examplesdir='${DESTDIR}/${prefix}/share/doc/hdf5/examples' \
 --enable-static \
 --disable-sharedlib-rpath \
 --enable-build-mode=production \
@@ -64,15 +64,8 @@
 
 package() {
 cd ${pkgname}-${pkgver/_/-}
-
 make DESTDIR="${pkgdir}" install
-
-# Move examples to a proper place
-install -dm755 "${pkgdir}"/usr/share/doc/${pkgname}
-mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${pkgname}/examples}
-
 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/
 }


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2019-03-16 Thread Bruno Pagani via arch-commits
Date: Saturday, March 16, 2019 @ 20:44:45
  Author: archange
Revision: 442237

upgpkg: hdf5 1.10.5-1

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-16 18:06:38 UTC (rev 442236)
+++ PKGBUILD2019-03-16 20:44:45 UTC (rev 442237)
@@ -6,7 +6,7 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.4
+pkgver=1.10.5
 pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
@@ -18,7 +18,7 @@
 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=('1267ff06aaedc04ca25f7c6026687ea2884b837043431195f153401d942b28df')
+sha256sums=('68d6ea8843d2a106ec6a7828564c1689c7a85714a35d8efafa2fee20ca366f44')
 
 build() {
 # Crazy workaround: run CMake to generate pkg-config file
@@ -67,9 +67,6 @@
 
 make DESTDIR="${pkgdir}" install
 
-# Remove leftover test files
-rm "${pkgdir}"/usr/include/tst{ds,image,lite,table}{,_tests}.mod
-
 # Move examples to a proper place
 install -dm755 "${pkgdir}"/usr/share/doc/${pkgname}
 mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${pkgname}/examples}


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2018-10-22 Thread Bruno Pagani via arch-commits
Date: Monday, October 22, 2018 @ 15:28:58
  Author: archange
Revision: 398407

upgpkg: hdf5 1.10.4-1

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 15:21:44 UTC (rev 398406)
+++ PKGBUILD2018-10-22 15:28:58 UTC (rev 398407)
@@ -6,8 +6,8 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.3
-pkgrel=2
+pkgver=1.10.4
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5;
@@ -18,9 +18,7 @@
 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;)
-# 
https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.md5
-md5sums=('56c5039103c51a40e493b43c504ce982')
-sha256sums=('c65cdcce4724a57fd3f8da9f0d109b497be30092acb9fac634d1291190d905a9')
+sha256sums=('1267ff06aaedc04ca25f7c6026687ea2884b837043431195f153401d942b28df')
 
 build() {
 # Crazy workaround: run CMake to generate pkg-config file


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2018-09-24 Thread Bruno Pagani via arch-commits
Date: Monday, September 24, 2018 @ 15:51:48
  Author: archange
Revision: 384632

Work around autotools and CMake differences

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   53 -
 1 file changed, 40 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-24 15:24:26 UTC (rev 384631)
+++ PKGBUILD2018-09-24 15:51:48 UTC (rev 384632)
@@ -1,3 +1,4 @@
+# $Id$
 # Maintainer: Ronald van Haren 
 # Maintainer: Bruno Pagani 
 # Contributor: Stefan Husmann 
@@ -6,7 +7,7 @@
 
 pkgname=hdf5
 pkgver=1.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5;
@@ -21,12 +22,9 @@
 md5sums=('56c5039103c51a40e493b43c504ce982')
 sha256sums=('c65cdcce4724a57fd3f8da9f0d109b497be30092acb9fac634d1291190d905a9')
 
-prepare() {
-mkdir -p build
-}
-
 build() {
-cd build
+# Crazy workaround: run CMake to generate pkg-config file
+mkdir -p build && cd build
 cmake ../${pkgname}-${pkgver/_/-} \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DBUILD_SHARED_LIBS=ON \
@@ -37,20 +35,49 @@
 -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
 -DHDF5_ENABLE_SZIP_SUPPORT=ON \
 -DHDF5_ENABLE_SZIP_ENCODING=ON
-cmake --build . --config Release
+# But don’t build with it, it’s quite broken
+cd ../${pkgname}-${pkgver/_/-}
+./configure \
+--prefix=/usr \
+--docdir=/usr/share/doc/hdf5/ \
+--enable-static \
+--disable-sharedlib-rpath \
+--enable-build-mode=production \
+--enable-hl \
+--enable-cxx \
+--enable-fortran \
+--with-pic \
+--with-zlib \
+--with-szlib
+make
 }
 
 check() {
-cd build
-ctest . -C Release
+cd ${pkgname}-${pkgver/_/-}
+# Without this, checks are failing with messages like “error while loading 
shared libraries: libhdf5.so.101: cannot open shared object file: No such file 
or directory”
+export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
+make check
 }
 
 package() {
-cd build
+cd ${pkgname}-${pkgver/_/-}
 
 make DESTDIR="${pkgdir}" install
 
-install -d "${pkgdir}"/usr/share/licenses/${pkgname}
-mv "${pkgdir}"/usr/share/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
-rm "${pkgdir}"/usr/share/{RELEASE,USING_HDF5_CMake}.txt
+# Remove leftover test files
+rm "${pkgdir}"/usr/include/tst{ds,image,lite,table}{,_tests}.mod
+
+# Move examples to a proper place
+install -dm755 "${pkgdir}"/usr/share/doc/${pkgname}
+mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${pkgname}/examples}
+
+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/
 }


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2018-08-23 Thread Bruno Pagani via arch-commits
Date: Thursday, August 23, 2018 @ 17:34:17
  Author: archange
Revision: 373459

upgpkg: hdf5 1.10.3-1

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   64 -
 1 file changed, 26 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-23 17:18:17 UTC (rev 373458)
+++ PKGBUILD2018-08-23 17:34:17 UTC (rev 373459)
@@ -6,64 +6,52 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.2
-pkgrel=3
+pkgver=1.10.3
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
-url="https://www.hdfgroup.org/hdf5/;
+url="https://www.hdfgroup.org/hdf5;
 license=('custom')
 depends=('zlib' 'libaec' 'bash')
-makedepends=('time' 'gcc-fortran')
+makedepends=('cmake' 'time' 'gcc-fortran')
 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;)
 # 
https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.md5
-md5sums=('41fb9347801b546fba323523a1c1af51')
-sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71')
+md5sums=('56c5039103c51a40e493b43c504ce982')
+sha256sums=('c65cdcce4724a57fd3f8da9f0d109b497be30092acb9fac634d1291190d905a9')
 
 prepare() {
-cd ${pkgname}-${pkgver/_/-}
-# Fix building with GCC 8.1
-sed 's/\(.*\)(void) HDF_NO_UBSAN/HDF_NO_UBSAN \1(void)/' -i src/H5detect.c
+mkdir -p build
 }
 
 build() {
-cd ${pkgname}-${pkgver/_/-}
-./configure \
---prefix=/usr \
---docdir=/usr/share/doc/hdf5/ \
---disable-static \
---disable-sharedlib-rpath \
---enable-build-mode=production \
---enable-hl \
---enable-cxx \
---enable-fortran \
---with-pic \
---with-zlib \
---with-szlib
-make
+cd build
+cmake ../${pkgname}-${pkgver/_/-} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DBUILD_SHARED_LIBS=ON \
+-DCMAKE_BUILD_TYPE=Release \
+-DHDF5_BUILD_HL_LIB=ON \
+-DHDF5_BUILD_CPP_LIB=ON \
+-DHDF5_BUILD_FORTRAN=ON \
+-DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
+-DHDF5_ENABLE_SZIP_SUPPORT=ON \
+-DHDF5_ENABLE_SZIP_ENCODING=ON
+cmake --build . --config Release
 }
 
 check() {
-cd ${pkgname}-${pkgver/_/-}
-# Without this, checks are failing with messages like “error while loading 
shared libraries: libhdf5.so.101: cannot open shared object file: No such file 
or directory”
-export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
-export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
-make check
+cd build
+ctest . -C Release
 }
 
 package() {
-cd ${pkgname}-${pkgver/_/-}
+cd build
 
 make DESTDIR="${pkgdir}" install
 
-install -dm755 "${pkgdir}"/usr/share/doc/${pkgname}
-mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${pkgname}/examples}
-
-install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+mv "${pkgdir}"/usr/share/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+rm "${pkgdir}"/usr/share/{RELEASE,USING_HDF5_CMake}.txt
 }
-


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2018-05-23 Thread Bruno Pagani via arch-commits
Date: Wednesday, May 23, 2018 @ 13:50:59
  Author: archange
Revision: 328210

Move examples to /usr/share/doc

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-23 13:35:05 UTC (rev 328209)
+++ PKGBUILD2018-05-23 13:50:59 UTC (rev 328210)
@@ -7,7 +7,7 @@
 
 pkgname=hdf5
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5/;
@@ -23,7 +23,7 @@
 
 prepare() {
 cd ${pkgname}-${pkgver/_/-}
-# Fix building
+# Fix building with GCC 8.1
 sed 's/\(.*\)(void) HDF_NO_UBSAN/HDF_NO_UBSAN \1(void)/' -i src/H5detect.c
 }
 
@@ -61,8 +61,8 @@
 
 make DESTDIR="${pkgdir}" install
 
-install -dm755 "${pkgdir}"/usr/share/${pkgname}
-mv "${pkgdir}"/usr/share/{hdf5_examples,${pkgname}/examples}
+install -dm755 "${pkgdir}"/usr/share/doc/${pkgname}
+mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${pkgname}/examples}
 
 install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2018-05-23 Thread Bruno Pagani via arch-commits
Date: Wednesday, May 23, 2018 @ 13:29:10
  Author: archange
Revision: 328202

upgpkg: hdf5 1.10.2-2

Upstream update + fix GCC 8.1 build + fix tests

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   31 +--
 1 file changed, 21 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-23 13:13:35 UTC (rev 328201)
+++ PKGBUILD2018-05-23 13:29:10 UTC (rev 328202)
@@ -6,8 +6,8 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.1
-pkgrel=3
+pkgver=1.10.2
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5/;
@@ -18,8 +18,15 @@
 provides=('hdf5-cpp-fortran')
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2;)
 # 
https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.md5
-md5sums=('d89893c05ee7ea8611b51bb39450d64e')
+md5sums=('41fb9347801b546fba323523a1c1af51')
+sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71')
 
+prepare() {
+cd ${pkgname}-${pkgver/_/-}
+# Fix building
+sed 's/\(.*\)(void) HDF_NO_UBSAN/HDF_NO_UBSAN \1(void)/' -i src/H5detect.c
+}
+
 build() {
 cd ${pkgname}-${pkgver/_/-}
 ./configure \
@@ -37,11 +44,17 @@
 make
 }
 
-# Check are failing with error while loading shared libraries: libhdf5.so.101: 
cannot open shared object file: No such file or directory
-#check() {
-#cd ${pkgname}-${pkgver/_/-}
-#make check
-#}
+check() {
+cd ${pkgname}-${pkgver/_/-}
+# Without this, checks are failing with messages like “error while loading 
shared libraries: libhdf5.so.101: cannot open shared object file: No such file 
or directory”
+export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
+export 
LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
+make check
+}
 
 package() {
 cd ${pkgname}-${pkgver/_/-}
@@ -48,8 +61,6 @@
 
 make DESTDIR="${pkgdir}" install
 
-rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
-
 install -dm755 "${pkgdir}"/usr/share/${pkgname}
 mv "${pkgdir}"/usr/share/{hdf5_examples,${pkgname}/examples}
 


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2018-05-02 Thread Bruno Pagani via arch-commits
Date: Wednesday, May 2, 2018 @ 22:23:04
  Author: archange
Revision: 318700

GCC 8.1 rebuild

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   60 +++-
 1 file changed, 31 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-02 21:48:23 UTC (rev 318699)
+++ PKGBUILD2018-05-02 22:23:04 UTC (rev 318700)
@@ -6,51 +6,53 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.2
-pkgrel=1
+pkgver=1.10.1
+pkgrel=3
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5/;
 license=('custom')
 depends=('zlib' 'libaec' 'bash')
-makedepends=('cmake' 'time' 'gcc-fortran')
+makedepends=('time' 'gcc-fortran')
 replaces=('hdf5-cpp-fortran')
 provides=('hdf5-cpp-fortran')
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2;)
 # 
https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.md5
-md5sums=('41fb9347801b546fba323523a1c1af51')
-sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71')
+md5sums=('d89893c05ee7ea8611b51bb39450d64e')
 
-prepare() {
-mkdir -p build
-}
-
 build() {
-cd build
-cmake ../${pkgname}-${pkgver/_/-} \
--DCMAKE_INSTALL_PREFIX=/usr \
--DBUILD_SHARED_LIBS=ON \
--DCMAKE_BUILD_TYPE=Release \
--DHDF5_BUILD_HL_LIB=ON \
--DHDF5_BUILD_CPP_LIB=ON \
--DHDF5_BUILD_FORTRAN=ON \
--DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
--DHDF5_ENABLE_SZIP_SUPPORT=ON \
--DHDF5_ENABLE_SZIP_ENCODING=ON
-cmake --build . --config Release
+cd ${pkgname}-${pkgver/_/-}
+./configure \
+--prefix=/usr \
+--docdir=/usr/share/doc/hdf5/ \
+--disable-static \
+--disable-sharedlib-rpath \
+--enable-build-mode=production \
+--enable-hl \
+--enable-cxx \
+--enable-fortran \
+--with-pic \
+--with-zlib \
+--with-szlib
+make
 }
 
-check() {
-cd build
-ctest . -C Release
-}
+# Check are failing with error while loading shared libraries: libhdf5.so.101: 
cannot open shared object file: No such file or directory
+#check() {
+#cd ${pkgname}-${pkgver/_/-}
+#make check
+#}
 
 package() {
-cd build
+cd ${pkgname}-${pkgver/_/-}
 
 make DESTDIR="${pkgdir}" install
 
-install -d "${pkgdir}"/usr/share/licenses/${pkgname}
-mv "${pkgdir}"/usr/share/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
-rm "${pkgdir}"/usr/share/{RELEASE,USING_HDF5_CMake}.txt
+rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
+
+install -dm755 "${pkgdir}"/usr/share/${pkgname}
+mv "${pkgdir}"/usr/share/{hdf5_examples,${pkgname}/examples}
+
+install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
+


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2018-04-05 Thread Bruno Pagani via arch-commits
Date: Thursday, April 5, 2018 @ 14:52:49
  Author: archange
Revision: 314434

upgpkg: hdf5 1.10.2-1

Switch to CMake, which now provides pkg-config and thus fixing FS#56370.

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   59 +--
 1 file changed, 29 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-05 14:17:51 UTC (rev 314433)
+++ PKGBUILD2018-04-05 14:52:49 UTC (rev 314434)
@@ -6,52 +6,51 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.1
-pkgrel=2
+pkgver=1.10.2
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5/;
 license=('custom')
 depends=('zlib' 'libaec' 'bash')
-makedepends=('time' 'gcc-fortran')
+makedepends=('cmake' 'time' 'gcc-fortran')
 replaces=('hdf5-cpp-fortran')
 provides=('hdf5-cpp-fortran')
 
source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2;)
 # 
https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.md5
-md5sums=('d89893c05ee7ea8611b51bb39450d64e')
+md5sums=('41fb9347801b546fba323523a1c1af51')
+sha256sums=('1cad5b7bfdf128dfc53cd16fba48f6e7ae4e93c75c371d9ec8dfc4df0c1fcb71')
 
+prepare() {
+mkdir -p build
+}
+
 build() {
-cd ${pkgname}-${pkgver/_/-}
-./configure \
---prefix=/usr \
---docdir=/usr/share/doc/hdf5/ \
---disable-static \
---disable-sharedlib-rpath \
---enable-build-mode=production \
---enable-hl \
---enable-cxx \
---enable-fortran \
---with-pic \
---with-zlib \
---with-szlib
-make
+cd build
+cmake ../${pkgname}-${pkgver/_/-} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DBUILD_SHARED_LIBS=ON \
+-DCMAKE_BUILD_TYPE=Release \
+-DHDF5_BUILD_HL_LIB=ON \
+-DHDF5_BUILD_CPP_LIB=ON \
+-DHDF5_BUILD_FORTRAN=ON \
+-DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
+-DHDF5_ENABLE_SZIP_SUPPORT=ON \
+-DHDF5_ENABLE_SZIP_ENCODING=ON
+cmake --build . --config Release
 }
 
-# Check are failing with error while loading shared libraries: libhdf5.so.101: 
cannot open shared object file: No such file or directory
-#check() {
-#cd ${pkgname}-${pkgver/_/-}
-#make check
-#}
+check() {
+cd build
+ctest . -C Release
+}
 
 package() {
-cd ${pkgname}-${pkgver/_/-}
+cd build
 
 make DESTDIR="${pkgdir}" install
 
-rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
-
-install -dm755 "${pkgdir}"/usr/share/${pkgname}
-mv "${pkgdir}"/usr/share/{hdf5_examples,${pkgname}/examples}
-
-install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+mv "${pkgdir}"/usr/share/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+rm "${pkgdir}"/usr/share/{RELEASE,USING_HDF5_CMake}.txt
 }


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2018-01-17 Thread Bruno Pagani via arch-commits
Date: Wednesday, January 17, 2018 @ 13:46:00
  Author: archange
Revision: 283665

Enable SZip support via libaec

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-17 13:44:32 UTC (rev 283664)
+++ PKGBUILD2018-01-17 13:46:00 UTC (rev 283665)
@@ -1,6 +1,6 @@
 # $Id$
 # Maintainer: Ronald van Haren 
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) 
+# Maintainer: Bruno Pagani 
 # Contributor: Stefan Husmann 
 # Contributor: damir 
 # Contributor: Tom K 
@@ -7,12 +7,12 @@
 
 pkgname=hdf5
 pkgver=1.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('x86_64')
 url="https://www.hdfgroup.org/hdf5/;
 license=('custom')
-depends=('zlib' 'bash')
+depends=('zlib' 'libaec' 'bash')
 makedepends=('time' 'gcc-fortran')
 replaces=('hdf5-cpp-fortran')
 provides=('hdf5-cpp-fortran')
@@ -22,25 +22,31 @@
 
 build() {
 cd ${pkgname}-${pkgver/_/-}
-
 ./configure \
 --prefix=/usr \
+--docdir=/usr/share/doc/hdf5/ \
 --disable-static \
+--disable-sharedlib-rpath \
+--enable-build-mode=production \
 --enable-hl \
---enable-build-mode=production \
---with-pic \
---docdir=/usr/share/doc/hdf5/ \
---disable-sharedlib-rpath \
 --enable-cxx \
 --enable-fortran \
---with-zlib
+--with-pic \
+--with-zlib \
+--with-szlib
 make
 }
 
+# Check are failing with error while loading shared libraries: libhdf5.so.101: 
cannot open shared object file: No such file or directory
+#check() {
+#cd ${pkgname}-${pkgver/_/-}
+#make check
+#}
+
 package() {
 cd ${pkgname}-${pkgver/_/-}
 
-make -j1 DESTDIR="${pkgdir}" install
+make DESTDIR="${pkgdir}" install
 
 rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
 


[arch-commits] Commit in hdf5/trunk (PKGBUILD hdf51.10-CVE2016.patch)

2017-06-17 Thread Bruno Pagani
Date: Saturday, June 17, 2017 @ 13:55:22
  Author: archange
Revision: 237878

upgpkg: hdf5 1.10.1-1

Remove CVE patch, fixed upstream in this release.

Modified:
  hdf5/trunk/PKGBUILD
Deleted:
  hdf5/trunk/hdf51.10-CVE2016.patch

+
 PKGBUILD   |   19 +--
 hdf51.10-CVE2016.patch |  280 ---
 2 files changed, 6 insertions(+), 293 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-17 13:41:02 UTC (rev 237877)
+++ PKGBUILD2017-06-17 13:55:22 UTC (rev 237878)
@@ -6,9 +6,8 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-_patch=patch1
-pkgver=1.10.0_${_patch}
-pkgrel=2
+pkgver=1.10.1
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('i686' 'x86_64')
 url="https://www.hdfgroup.org/hdf5/;
@@ -17,18 +16,10 @@
 makedepends=('time' 'gcc-fortran')
 replaces=('hdf5-cpp-fortran')
 provides=('hdf5-cpp-fortran')
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2;
-'hdf51.10-CVE2016.patch')
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2;)
 # 
https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.md5
-md5sums=('f6d980febe2c35c11670a9b34fa3b487'
- 'ebc0db3fe6d55dc39f63143ebb6327d4')
+md5sums=('d89893c05ee7ea8611b51bb39450d64e')
 
-prepare() {
-cd ${pkgname}-${pkgver/_/-}
-
-patch -p0 -i ../hdf51.10-CVE2016.patch
-}
-
 build() {
 cd ${pkgname}-${pkgver/_/-}
 
@@ -51,6 +42,8 @@
 
 make -j1 DESTDIR="${pkgdir}" install
 
+rm -rf "${pkgdir}"/usr/lib/libdynlib*.so
+
 install -dm755 "${pkgdir}"/usr/share/${pkgname}
 mv "${pkgdir}"/usr/share/{hdf5_examples,${pkgname}/examples}
 

Deleted: hdf51.10-CVE2016.patch
===
--- hdf51.10-CVE2016.patch  2017-06-17 13:41:02 UTC (rev 237877)
+++ hdf51.10-CVE2016.patch  2017-06-17 13:55:22 UTC (rev 237878)
@@ -1,280 +0,0 @@
-diff --git src/H5Ocache.c src/H5Ocache.c
-index 831b08a..eab0fd2 100644
 src/H5Ocache.c
-+++ src/H5Ocache.c
-@@ -1433,6 +1433,10 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t 
len, const uint8_t *image
- HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination 
for message")
- if((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && !(flags & 
H5O_MSG_FLAG_MARK_IF_UNKNOWN))
- HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination 
for message")
-+if((flags & H5O_MSG_FLAG_SHAREABLE)
-+&& H5O_msg_class_g[id]
-+&& !(H5O_msg_class_g[id]->share_flags & 
H5O_SHARE_IS_SHARABLE))
-+HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message of unsharable 
class flagged as sharable")
- 
- /* Reserved bytes/creation index */
- if(oh->version == H5O_VERSION_1)
-diff --git src/H5Odtype.c src/H5Odtype.c
-index e51d319..799f475 100644
 src/H5Odtype.c
-+++ src/H5Odtype.c
-@@ -311,7 +311,11 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned 
*ioflags/*in,out*/, const uint8_t **p
- if(version == H5O_DTYPE_VERSION_1) {
- /* Decode the number of dimensions */
- ndims = *(*pp)++;
--HDassert(ndims <= 4);
-+
-+/* Check that ndims is valid */
-+if(ndims > 4)
-+HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, 
"invalid number of dimensions for array")
-+
- *pp += 3; /*reserved bytes */
- 
- /* Skip dimension permutation */
-@@ -519,7 +523,8 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned 
*ioflags/*in,out*/, const uint8_t **p
- dt->shared->u.array.ndims = *(*pp)++;
- 
- /* Double-check the number of dimensions */
--HDassert(dt->shared->u.array.ndims <= H5S_MAX_RANK);
-+if(dt->shared->u.array.ndims > H5S_MAX_RANK)
-+HGOTO_ERROR(H5E_DATATYPE, H5E_CANTLOAD, FAIL, "too many 
dimensions for array datatype")
- 
- /* Skip reserved bytes, if version has them */
- if(version < H5O_DTYPE_VERSION_3)
-diff --git src/H5Opkg.h src/H5Opkg.h
-index 7473397..0fefa21 100644
 src/H5Opkg.h
-+++ src/H5Opkg.h
-@@ -212,6 +212,7 @@
-   
\
- /* Set the message's "shared info", if it's shareable */\
- if((MSG)->flags & H5O_MSG_FLAG_SHAREABLE) {   
\
-+HDassert(msg_type->share_flags & H5O_SHARE_IS_SHARABLE);  
\
- H5O_UPDATE_SHARED((H5O_shared_t *)(MSG)->native, 

[arch-commits] Commit in hdf5/trunk (PKGBUILD hdf51.10-CVE2016.patch)

2017-06-16 Thread Bruno Pagani
Date: Friday, June 16, 2017 @ 13:13:24
  Author: archange
Revision: 237626

Fix several CVEs

The following CVE are fixed in this release:
   CVE-2016-4330:  HDF5 bug  HDFFV-9992 (TALOS-2016-176)
   CVE-2016-4331:  HDF5 bug  HDFFV-9951 (TALOS-2016-177)
   CVE-2016-4332:  HDF5 bug  HDFFV-9950 (TALOS-2016-178)
   CVE-2016-4333:  HDF5 bug  HDFFV-9993 (TALOS-2016-179)

Added:
  hdf5/trunk/hdf51.10-CVE2016.patch
Modified:
  hdf5/trunk/PKGBUILD

+
 PKGBUILD   |   14 +-
 hdf51.10-CVE2016.patch |  280 +++
 2 files changed, 291 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-16 13:06:55 UTC (rev 237625)
+++ PKGBUILD2017-06-16 13:13:24 UTC (rev 237626)
@@ -8,7 +8,7 @@
 pkgname=hdf5
 _patch=patch1
 pkgver=1.10.0_${_patch}
-pkgrel=1
+pkgrel=2
 pkgdesc="General purpose library and file format for storing scientific data"
 arch=('i686' 'x86_64')
 url="https://www.hdfgroup.org/hdf5/;
@@ -17,10 +17,18 @@
 makedepends=('time' 'gcc-fortran')
 replaces=('hdf5-cpp-fortran')
 provides=('hdf5-cpp-fortran')
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2;)
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2;
+'hdf51.10-CVE2016.patch')
 # 
https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.md5
-md5sums=('f6d980febe2c35c11670a9b34fa3b487')
+md5sums=('f6d980febe2c35c11670a9b34fa3b487'
+ 'ebc0db3fe6d55dc39f63143ebb6327d4')
 
+prepare() {
+cd ${pkgname}-${pkgver/_/-}
+
+patch -p0 -i ../hdf51.10-CVE2016.patch
+}
+
 build() {
 cd ${pkgname}-${pkgver/_/-}
 

Added: hdf51.10-CVE2016.patch
===
--- hdf51.10-CVE2016.patch  (rev 0)
+++ hdf51.10-CVE2016.patch  2017-06-16 13:13:24 UTC (rev 237626)
@@ -0,0 +1,280 @@
+diff --git src/H5Ocache.c src/H5Ocache.c
+index 831b08a..eab0fd2 100644
+--- src/H5Ocache.c
 src/H5Ocache.c
+@@ -1433,6 +1433,10 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t 
len, const uint8_t *image
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination 
for message")
+ if((flags & H5O_MSG_FLAG_WAS_UNKNOWN) && !(flags & 
H5O_MSG_FLAG_MARK_IF_UNKNOWN))
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "bad flag combination 
for message")
++if((flags & H5O_MSG_FLAG_SHAREABLE)
++&& H5O_msg_class_g[id]
++&& !(H5O_msg_class_g[id]->share_flags & 
H5O_SHARE_IS_SHARABLE))
++HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message of unsharable 
class flagged as sharable")
+ 
+ /* Reserved bytes/creation index */
+ if(oh->version == H5O_VERSION_1)
+diff --git src/H5Odtype.c src/H5Odtype.c
+index e51d319..799f475 100644
+--- src/H5Odtype.c
 src/H5Odtype.c
+@@ -311,7 +311,11 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned 
*ioflags/*in,out*/, const uint8_t **p
+ if(version == H5O_DTYPE_VERSION_1) {
+ /* Decode the number of dimensions */
+ ndims = *(*pp)++;
+-HDassert(ndims <= 4);
++
++/* Check that ndims is valid */
++if(ndims > 4)
++HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, 
"invalid number of dimensions for array")
++
+ *pp += 3; /*reserved bytes */
+ 
+ /* Skip dimension permutation */
+@@ -519,7 +523,8 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned 
*ioflags/*in,out*/, const uint8_t **p
+ dt->shared->u.array.ndims = *(*pp)++;
+ 
+ /* Double-check the number of dimensions */
+-HDassert(dt->shared->u.array.ndims <= H5S_MAX_RANK);
++if(dt->shared->u.array.ndims > H5S_MAX_RANK)
++HGOTO_ERROR(H5E_DATATYPE, H5E_CANTLOAD, FAIL, "too many 
dimensions for array datatype")
+ 
+ /* Skip reserved bytes, if version has them */
+ if(version < H5O_DTYPE_VERSION_3)
+diff --git src/H5Opkg.h src/H5Opkg.h
+index 7473397..0fefa21 100644
+--- src/H5Opkg.h
 src/H5Opkg.h
+@@ -212,6 +212,7 @@
+   
\
+ /* Set the message's "shared info", if it's shareable */\
+ if((MSG)->flags & H5O_MSG_FLAG_SHAREABLE) {   
\
++HDassert(msg_type->share_flags & H5O_SHARE_IS_SHARABLE);  
\
+ H5O_UPDATE_SHARED((H5O_shared_t *)(MSG)->native, 
H5O_SHARE_TYPE_HERE, (F), msg_type->id, (MSG)->crt_idx, (OH)->chunk[0].addr) \
+ } 

[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2017-06-16 Thread Bruno Pagani
Date: Friday, June 16, 2017 @ 12:48:53
  Author: archange
Revision: 237623

Reunify hdf5 and hdf5-cpp-fortran now that thread-safety is gone

Also some cleaning in the PKGBUILD.

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   55 +++
 1 file changed, 31 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-16 10:28:01 UTC (rev 237622)
+++ PKGBUILD2017-06-16 12:48:53 UTC (rev 237623)
@@ -1,43 +1,50 @@
 # $Id$
 # Maintainer: Ronald van Haren 
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) 
 # Contributor: Stefan Husmann 
 # Contributor: damir 
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.0_patch1
-_pkgver=1.10.0-patch1
+_patch=patch1
+pkgver=1.10.0_${_patch}
 pkgrel=1
+pkgdesc="General purpose library and file format for storing scientific data"
 arch=('i686' 'x86_64')
-pkgdesc="General purpose library and file format for storing scientific data"
-url="http://www.hdfgroup.org/HDF5/;
+url="https://www.hdfgroup.org/hdf5/;
 license=('custom')
-depends=('zlib' 'sh')
-makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/releases/${pkgname}-1.10/${pkgname}-${_pkgver}/src/${pkgname}-${_pkgver}.tar.bz2)
-sha1sums=('2f34251186fa9e59887d8f094bc0bc90187d0aa4')
+depends=('zlib' 'bash')
+makedepends=('time' 'gcc-fortran')
+replaces=('hdf5-cpp-fortran')
+provides=('hdf5-cpp-fortran')
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.tar.bz2;)
+# 
https://support.hdfgroup.org/ftp/HDF5/releases/${pkgname}-${pkgver:0:4}/${pkgname}-${pkgver/_/-}/src/${pkgname}-${pkgver/_/-}.md5
+md5sums=('f6d980febe2c35c11670a9b34fa3b487')
 
 build() {
-  cd "$srcdir/${pkgname}-${pkgver/_/-}"
+cd ${pkgname}-${pkgver/_/-}
 
-  ./configure --prefix=/usr --disable-static \
---enable-hl \
---enable-linux-lfs \
---enable-build-mode=production \
---with-pic \
---docdir=/usr/share/doc/hdf5/ \
---with-pthread=/usr/lib/ \
---disable-sharedlib-rpath
-  make
+./configure \
+--prefix=/usr \
+--disable-static \
+--enable-hl \
+--enable-build-mode=production \
+--with-pic \
+--docdir=/usr/share/doc/hdf5/ \
+--disable-sharedlib-rpath \
+--enable-cxx \
+--enable-fortran \
+--with-zlib
+make
 }
 
 package() {
-  cd "$srcdir/${pkgname}-${pkgver/_/-}"
+cd ${pkgname}-${pkgver/_/-}
 
-  make -j1 DESTDIR="${pkgdir}" install
+make -j1 DESTDIR="${pkgdir}" install
 
-  install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
-  install -m644 "$srcdir/${pkgname}-${pkgver/_/-}/COPYING" \
-  "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" 
+install -dm755 "${pkgdir}"/usr/share/${pkgname}
+mv "${pkgdir}"/usr/share/{hdf5_examples,${pkgname}/examples}
+
+install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
-


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2016-09-06 Thread Ronald van Haren
Date: Tuesday, September 6, 2016 @ 07:29:40
  Author: ronald
Revision: 275782

upgpkg: hdf5 1.10.0_patch1-1

update to 1.10.0-patch1

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-06 06:55:17 UTC (rev 275781)
+++ PKGBUILD2016-09-06 07:29:40 UTC (rev 275782)
@@ -5,7 +5,8 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.10.0
+pkgver=1.10.0_patch1
+_pkgver=1.10.0-patch1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -13,8 +14,8 @@
 license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/releases/${pkgname}-1.10/${pkgname}-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('5866dbbcd24485f6b206413e73f7205cb3c1196e')
+source=(ftp://ftp.hdfgroup.org/HDF5/releases/${pkgname}-1.10/${pkgname}-${_pkgver}/src/${pkgname}-${_pkgver}.tar.bz2)
+sha1sums=('2f34251186fa9e59887d8f094bc0bc90187d0aa4')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver/_/-}"


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2016-04-12 Thread Ronald van Haren
Date: Tuesday, April 12, 2016 @ 15:00:54
  Author: ronald
Revision: 264713

upgpkg: hdf5 1.10.0-1

update to 1.10.0

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-12 12:28:55 UTC (rev 264712)
+++ PKGBUILD2016-04-12 13:00:54 UTC (rev 264713)
@@ -5,7 +5,7 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.8.15_patch1
+pkgver=1.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -13,8 +13,8 @@
 license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('82ed248e5d0293bc1dba4c13c9b2880a26643ee0')
+source=(ftp://ftp.hdfgroup.org/HDF5/releases/${pkgname}-1.10/${pkgname}-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('5866dbbcd24485f6b206413e73f7205cb3c1196e')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver/_/-}"
@@ -21,9 +21,8 @@
 
   ./configure --prefix=/usr --disable-static \
 --enable-hl \
---enable-threadsafe \
 --enable-linux-lfs \
---enable-production \
+--enable-build-mode=production \
 --with-pic \
 --docdir=/usr/share/doc/hdf5/ \
 --with-pthread=/usr/lib/ \


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2015-10-27 Thread Anatol Pomozov
Date: Wednesday, October 28, 2015 @ 01:46:45
  Author: anatolik
Revision: 249813

upgpkg: hdf5 1.8.15_patch1-1

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-27 23:53:12 UTC (rev 249812)
+++ PKGBUILD2015-10-28 00:46:45 UTC (rev 249813)
@@ -5,7 +5,7 @@
 # Contributor: Tom K 
 
 pkgname=hdf5
-pkgver=1.8.14
+pkgver=1.8.15_patch1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -14,13 +14,11 @@
 depends=('zlib' 'sh')
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('3c48bcb0d5fb21a3aa425ed035c08d8da3d5483a')
+sha1sums=('82ed248e5d0293bc1dba4c13c9b2880a26643ee0')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver/_/-}"
 
-  export CFLAGS="${CFLAGS/O2/O0}"
-  export CXXFLAGS="${CFLAGS}"
   ./configure --prefix=/usr --disable-static \
 --enable-hl \
 --enable-threadsafe \


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2014-11-24 Thread Felix Yan
Date: Monday, November 24, 2014 @ 17:07:37
  Author: fyan
Revision: 227053

upgpkg: hdf5 1.8.14-1

upstream new release

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-24 15:33:55 UTC (rev 227052)
+++ PKGBUILD2014-11-24 16:07:37 UTC (rev 227053)
@@ -5,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.13
+pkgver=1.8.14
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -14,7 +14,7 @@
 depends=('zlib' 'sh')
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('712955025f03db808f000d8f4976b8df0c0d37b5')
+sha1sums=('3c48bcb0d5fb21a3aa425ed035c08d8da3d5483a')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}


[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2014-09-20 Thread Bartłomiej Piotrowski
Date: Saturday, September 20, 2014 @ 11:03:46
  Author: bpiotrowski
Revision: 222157

upgpkg: hdf5 1.8.13-1

new upstream release

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-20 08:40:52 UTC (rev 222156)
+++ PKGBUILD2014-09-20 09:03:46 UTC (rev 222157)
@@ -5,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.12
+pkgver=1.8.13
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -14,7 +14,7 @@
 depends=('zlib' 'sh')
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f')
+sha1sums=('712955025f03db808f000d8f4976b8df0c0d37b5')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}



[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2014-01-29 Thread Ronald van Haren
Date: Wednesday, January 29, 2014 @ 19:59:58
  Author: ronald
Revision: 204866

upgpkg: hdf5 1.8.12-1

update to 1.8.12

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-29 18:43:38 UTC (rev 204865)
+++ PKGBUILD2014-01-29 18:59:58 UTC (rev 204866)
@@ -5,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.11
+pkgver=1.8.12
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -14,10 +14,10 @@
 depends=('zlib' 'sh')
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e')
+sha1sums=('8414ca0e6ff7d08e423955960d641ec5f309a55f')
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver/_/-}
+  cd $srcdir/${pkgname}-${pkgver/_/-}
 
   export CFLAGS=${CFLAGS/O2/O0}
   export CXXFLAGS=${CFLAGS}
@@ -34,12 +34,12 @@
 }
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver/_/-}
+  cd $srcdir/${pkgname}-${pkgver/_/-}
 
-  make -j1 DESTDIR=${pkgdir} install
+  make -j1 DESTDIR=${pkgdir} install
 
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
-  install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
-  $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
+  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
+  install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
+  $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
 }
 



[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2013-09-11 Thread Bartłomiej Piotrowski
Date: Wednesday, September 11, 2013 @ 10:12:39
  Author: bpiotrowski
Revision: 194236

upgpkg: hdf5 1.8.11-1

- new upstream release

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-11 07:58:33 UTC (rev 194235)
+++ PKGBUILD2013-09-11 08:12:39 UTC (rev 194236)
@@ -5,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.10_patch1
+pkgver=1.8.11
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -15,7 +15,7 @@
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb')
+sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}



[arch-commits] Commit in hdf5/trunk (PKGBUILD mpi.patch)

2013-05-11 Thread Ronald van Haren
Date: Saturday, May 11, 2013 @ 10:30:46
  Author: ronald
Revision: 185111

upgpkg: hdf5 1.8.10_patch1-1

update to 1.8.10_patch1; FS#33343 include mpi header

Added:
  hdf5/trunk/mpi.patch
Modified:
  hdf5/trunk/PKGBUILD

---+
 PKGBUILD  |   12 +---
 mpi.patch |   18 ++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-11 08:04:24 UTC (rev 185110)
+++ PKGBUILD2013-05-11 08:30:46 UTC (rev 185111)
@@ -5,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.10
+pkgver=1.8.10_patch1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -13,12 +13,18 @@
 license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2
 
+mpi.patch)
 options=('!libtool')
-sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
+sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
+  '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
+
+  # FS#33343
+  patch -Np1 -i ${srcdir}/mpi.patch 
+
   export CFLAGS=${CFLAGS/O2/O0}
   export CXXFLAGS=${CFLAGS}
   ./configure --prefix=/usr --disable-static \

Added: mpi.patch
===
--- mpi.patch   (rev 0)
+++ mpi.patch   2013-05-11 08:30:46 UTC (rev 185111)
@@ -0,0 +1,18 @@
+Prevent accidental inclusion of mpi c++ headers 
+when hdf5.h is included third party library
+
+https://bugs.gentoo.org/show_bug.cgi?id=420777
+https://bugs.archlinux.org/task/33343
+
+--- a/src/H5public.h
 b/src/H5public.h
+@@ -58,6 +58,8 @@
+ #   include stddef.h
+ #endif
+ #ifdef H5_HAVE_PARALLEL
++#   define OMPI_SKIP_MPICXX   /* Make sure that cxx specific headers are not 
included */
++#   define MPICH_SKIP_MPICXX
+ #   include mpi.h
+ #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already   */
+ #   include mpio.h
+



[arch-commits] Commit in hdf5/trunk (PKGBUILD mpi.patch)

2013-05-11 Thread Ronald van Haren
Date: Saturday, May 11, 2013 @ 11:31:07
  Author: ronald
Revision: 185119

upgpkg: hdf5 1.8.10_patch1-1

don't need the mpi patch in the regular hdf5 package

Modified:
  hdf5/trunk/PKGBUILD
Deleted:
  hdf5/trunk/mpi.patch

---+
 PKGBUILD  |9 ++---
 mpi.patch |   18 --
 2 files changed, 2 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-11 09:27:57 UTC (rev 185118)
+++ PKGBUILD2013-05-11 09:31:07 UTC (rev 185119)
@@ -13,18 +13,13 @@
 license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2
 
-mpi.patch)
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
-  '658d4a3e537c9c76da3200effa8f95b656a21936')
+sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
 
-  # FS#33343
-  patch -Np1 -i ${srcdir}/mpi.patch 
-
   export CFLAGS=${CFLAGS/O2/O0}
   export CXXFLAGS=${CFLAGS}
   ./configure --prefix=/usr --disable-static \

Deleted: mpi.patch
===
--- mpi.patch   2013-05-11 09:27:57 UTC (rev 185118)
+++ mpi.patch   2013-05-11 09:31:07 UTC (rev 185119)
@@ -1,18 +0,0 @@
-Prevent accidental inclusion of mpi c++ headers 
-when hdf5.h is included third party library
-
-https://bugs.gentoo.org/show_bug.cgi?id=420777
-https://bugs.archlinux.org/task/33343
-
 a/src/H5public.h
-+++ b/src/H5public.h
-@@ -58,6 +58,8 @@
- #   include stddef.h
- #endif
- #ifdef H5_HAVE_PARALLEL
-+#   define OMPI_SKIP_MPICXX   /* Make sure that cxx specific headers are not 
included */
-+#   define MPICH_SKIP_MPICXX
- #   include mpi.h
- #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already   */
- #   include mpio.h
-



[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2013-01-07 Thread Ronald van Haren
Date: Monday, January 7, 2013 @ 14:57:53
  Author: ronald
Revision: 174838

upgpkg: hdf5 1.8.10-1

update to 1.8.10

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-07 19:45:06 UTC (rev 174837)
+++ PKGBUILD2013-01-07 19:57:53 UTC (rev 174838)
@@ -5,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.8
+pkgver=1.8.10
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -15,7 +15,7 @@
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-sha1sums=('1bc16883ecd631840b70857bea637a06eb0155da')
+sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}



[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2012-01-29 Thread Ronald van Haren
Date: Sunday, January 29, 2012 @ 06:25:36
  Author: ronald
Revision: 147982

upgpkg: hdf5 1.8.8-1

update to 1.8.8

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-29 11:20:08 UTC (rev 147981)
+++ PKGBUILD2012-01-29 11:25:36 UTC (rev 147982)
@@ -5,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.7
+pkgver=1.8.8
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -15,7 +15,7 @@
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-sha1sums=('be1daff26f066aca0b5be52d86dada6757fc4b95')
+sha1sums=('1bc16883ecd631840b70857bea637a06eb0155da')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}



[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2011-07-09 Thread Ronald van Haren
Date: Saturday, July 9, 2011 @ 04:59:26
  Author: ronald
Revision: 130965

upgpkg: hdf5 1.8.7-1
update to 1.8.7

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-09 08:57:11 UTC (rev 130964)
+++ PKGBUILD2011-07-09 08:59:26 UTC (rev 130965)
@@ -5,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.6
+pkgver=1.8.7
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -15,7 +15,7 @@
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-sha1sums=('348bd881c03a9568ac4ea9071833d6119c733757')
+sha1sums=('be1daff26f066aca0b5be52d86dada6757fc4b95')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}



[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2011-05-04 Thread Ronald van Haren
Date: Wednesday, May 4, 2011 @ 07:32:45
  Author: ronald
Revision: 122530

upgpkg: hdf5 1.8.6-1
update to 1.8.6; use DESTDIR in make install

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-04 11:30:39 UTC (rev 122529)
+++ PKGBUILD2011-05-04 11:32:45 UTC (rev 122530)
@@ -1,3 +1,4 @@
+# $Id$
 # Maintainer: Ronald van Haren ronald.archlinux.org
 # Contributor: Stefan Husmann stefan-husm...@t-online.de
 # Contributor: damir da...@archlinux.org
@@ -4,7 +5,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.5_patch1
+pkgver=1.8.6
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -14,7 +15,7 @@
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
 options=('!libtool')
-md5sums=('27308a145e6c208d57db3f6f2634a0f6')
+sha1sums=('348bd881c03a9568ac4ea9071833d6119c733757')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
@@ -29,13 +30,13 @@
 --docdir=/usr/share/doc/hdf5/ \
 --with-pthread=/usr/lib/ \
 --disable-sharedlib-rpath
-  make || return 1
+  make
 }
 
 package() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
 
-  make -j1 prefix=$pkgdir/usr install
+  make -j1 DESTDIR=${pkgdir} install
 
   install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
   install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \



[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2010-10-07 Thread Ronald van Haren
Date: Thursday, October 7, 2010 @ 08:35:31
  Author: ronald
Revision: 94495

upgpkg: hdf5 1.8.5_patch1-1
bump to latest version

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-07 12:28:33 UTC (rev 94494)
+++ PKGBUILD2010-10-07 12:35:31 UTC (rev 94495)
@@ -4,7 +4,7 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.4_patch1
+pkgver=1.8.5_patch1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
@@ -13,13 +13,11 @@
 depends=('zlib' 'sh')
 makedepends=('time')
 
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-md5sums=('b19f4dfbf654a2af3653c492fc1c7513')
 options=('!libtool')
+md5sums=('27308a145e6c208d57db3f6f2634a0f6')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
-#  unset CFLAGS
-#  unset CXXFLAGS
   export CFLAGS=${CFLAGS/O2/O0}
   export CXXFLAGS=${CFLAGS}
   ./configure --prefix=/usr --disable-static \
@@ -32,10 +30,15 @@
 --with-pthread=/usr/lib/ \
 --disable-sharedlib-rpath
   make || return 1
-  make -j1 prefix=$pkgdir/usr install || return 1
+}
 
-  install -d -m755 $pkgdir/usr/share/licenses/${pkgname} || return 1
+package() {
+  cd $srcdir/${pkgname}-${pkgver/_/-}
+
+  make -j1 prefix=$pkgdir/usr install
+
+  install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
   install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
-  $pkgdir/usr/share/licenses/${pkgname}/LICENSE || return 1
+  $pkgdir/usr/share/licenses/${pkgname}/LICENSE 
 }
 



[arch-commits] Commit in hdf5/trunk (PKGBUILD)

2010-05-02 Thread andyrtr
Date: Sunday, May 2, 2010 @ 09:32:32
  Author: andyrtr
Revision: 79253

upgpkg: hdf5 1.8.4_patch1-1
new version 1.8.4-patch1; #19184; enable -O0 optimization taken from Fedora; 
disable useless space wasting static libs

Modified:
  hdf5/trunk/PKGBUILD

--+
 PKGBUILD |   20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-02 13:04:43 UTC (rev 79252)
+++ PKGBUILD2010-05-02 13:32:32 UTC (rev 79253)
@@ -4,23 +4,25 @@
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.4
-pkgrel=3
+pkgver=1.8.4_patch1
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
 url=http://www.hdfgroup.org/HDF5/;
 license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver}.tar.gz)
-md5sums=('971cc81ef10f50d2bb63cd6879fca7bc')
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
+md5sums=('b19f4dfbf654a2af3653c492fc1c7513')
 options=('!libtool')
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  unset CFLAGS
-  unset CXXFLAGS
-  ./configure --prefix=/usr \
+  cd $srcdir/${pkgname}-${pkgver/_/-}
+#  unset CFLAGS
+#  unset CXXFLAGS
+  export CFLAGS=${CFLAGS/O2/O0}
+  export CXXFLAGS=${CFLAGS}
+  ./configure --prefix=/usr --disable-static \
 --enable-hl \
 --enable-threadsafe \
 --enable-linux-lfs \
@@ -33,7 +35,7 @@
   make -j1 prefix=$pkgdir/usr install || return 1
 
   install -d -m755 $pkgdir/usr/share/licenses/${pkgname} || return 1
-  install -m644 $srcdir/${pkgname}-${pkgver}/COPYING \
+  install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
   $pkgdir/usr/share/licenses/${pkgname}/LICENSE || return 1
 }
 



[arch-commits] Commit in hdf5/trunk (PKGBUILD gcc-4.3.patch)

2010-02-16 Thread Ronald van Haren
Date: Tuesday, February 16, 2010 @ 08:32:06
  Author: ronald
Revision: 69046

upgpkg: hdf5 1.8.4-3
move back to repos as new dependency of netcdf

Modified:
  hdf5/trunk/PKGBUILD
Deleted:
  hdf5/trunk/gcc-4.3.patch

---+
 PKGBUILD  |  106 +---
 gcc-4.3.patch |   41 -
 2 files changed, 26 insertions(+), 121 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-16 13:30:35 UTC (rev 69045)
+++ PKGBUILD2010-02-16 13:32:06 UTC (rev 69046)
@@ -1,93 +1,39 @@
-# $Id$
-# Maintainer: damir da...@archlinux.org
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: Stefan Husmann stefan-husm...@t-online.de
+# Contributor: damir da...@archlinux.org
 # Contributor: Tom K t...@runbox.com
 
 pkgname=hdf5
-pkgver=1.8.0
+pkgver=1.8.4
 pkgrel=3
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 pkgdesc=General purpose library and file format for storing scientific data
-url=http://hdf.ncsa.uiuc.edu/HDF5/;
-license=(custom)
-depends=('zlib' 'openssl' 'gcc-libs=4.3.0')
-makedepends=('gcc' 'time')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver}.tar.gz
-   gcc-4.3.patch)
-options=(!libtool)
-md5sums=('e68e13685a56b50cab237fd58dc7a59c' '0c59e6004536914e62324037ad49d82e')
-md5sums=('e68e13685a56b50cab237fd58dc7a59c'
- '4af864c222a9cf4b924ce7ff0f371cc5')
+url=http://www.hdfgroup.org/HDF5/;
+license=('custom')
+depends=('zlib' 'sh')
+makedepends=('time')
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver}.tar.gz)
+md5sums=('971cc81ef10f50d2bb63cd6879fca7bc')
+options=('!libtool')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd $srcdir/${pkgname}-${pkgver}
   unset CFLAGS
   unset CXXFLAGS
-  patch -Np0 -i ${startdir}/src/gcc-4.3.patch || return 1
-  F9X=gfortran ./configure --prefix=/usr \
---enable-hl \
---enable-threadsafe \
---enable-linux-lfs \
---enable-production \
---enable-hdf5v1_4 \
---enable-hdf5v1_6 \
-   --enable-cxx \
---enable-fortran \
-   --enable-shared \
-   --with-pic \
-   --docdir=/usr/share/hdf5/ \
---with-pthread=/usr/lib/ \
---with-ssl=/usr/lib/
+  ./configure --prefix=/usr \
+--enable-hl \
+--enable-threadsafe \
+--enable-linux-lfs \
+--enable-production \
+--with-pic \
+--docdir=/usr/share/doc/hdf5/ \
+--with-pthread=/usr/lib/ \
+--disable-sharedlib-rpath
   make || return 1
-  make check || return 1
-  make -j1 prefix=${startdir}/pkg/usr install || return 1
+  make -j1 prefix=$pkgdir/usr install || return 1
 
-  install -d -m755 ${startdir}/pkg/usr/share/licenses/${pkgname} || return 1
-  install -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-  ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE || return 1
+  install -d -m755 $pkgdir/usr/share/licenses/${pkgname} || return 1
+  install -m644 $srcdir/${pkgname}-${pkgver}/COPYING \
+  $pkgdir/usr/share/licenses/${pkgname}/LICENSE || return 1
 }
 
-
-
-#  Debug Mode:  None
-#Shared Libraries:  Yes
-#Static Libraries:  Yes
-#   Statically Linked Executables:  No
-# Default Version of Public Symbols:  v18
-#  With Deprecated Public Symbols:  Yes
-# Tracing:  No
-# Clear file buffers before write:  Yes
-#Using memory checker:  No
-#Optimization Instrumentation:  No
-# 
-# Languages:
-# --
-# C++:  Yes
-#C++ Compiler:  g++
-#CXXFLAGS / H5_CXXFLAGS:   -march=x86-64 
-mtune=generic -O2 -pipe
-# 
-# Fortran:  Yes
-#Fortran Compiler:  gfortran
-#  FCFLAGS / H5_FCFLAGS:   -I.
-# 
-# 
-# Features:
-# -
-# dmalloc:  No
-#  Function Stack Tracing:  Disabled
-#GPFS:  No
-#   Strict File Format Checks:  Disabled
-# Default API Mapping:  v18
-# hsize_t:  Large
-#  I/O filters (external):  deflate(zlib)
-#  I/O filters (internal):  shuffle,fletcher32,nbit,scaleoffset
-#  Linux Large File Support (LFS):  Enabled
-# MPE:  No
-#   Parallel HDF5:  No
-#  Direct VFD:  Disabled
-#Threadsafety:  Enabled
-#  High Level library:  Enabled
-
-
-
-
-

Deleted: gcc-4.3.patch
===
--- gcc-4.3.patch   2010-02-16 13:30:35 UTC (rev 69045)
+++