[xdmf] 28/38: Add hdf5 patch

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository xdmf.

commit bcc6045bd06adc9c4ee4d1d9cd0faa843ba16243
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Oct 22 22:20:48 2016 +0100

    Add hdf5 patch
---
 debian/changelog               |  6 ++++--
 debian/libxdmf-dev.install     |  2 +-
 debian/patches/hdf5-1.10.patch | 47 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5abfd2a..86601a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-xdmf (2.1.dfsg.1-16) UNRELEASED; urgency=medium
+xdmf (2.1.dfsg.1-16) unstable; urgency=medium
 
+  * New patch from Giles Filipini to fix FTBFS against HDF5 1.10.
+    Closes: #841966.
   * Standards-Version: 3.9.8
   * Remove unnecessary postinst, prerm scripts
 
- -- Alastair McKinstry <mckinstry at debian.org>  Mon, 20 Jun 2016 13:42:30 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 22 Oct 2016 22:18:13 +0100
 
 xdmf (2.1.dfsg.1-15) unstable; urgency=medium
 
diff --git a/debian/libxdmf-dev.install b/debian/libxdmf-dev.install
index c20c69d..c7d60ac 100644
--- a/debian/libxdmf-dev.install
+++ b/debian/libxdmf-dev.install
@@ -1,2 +1,2 @@
 /usr/include/*
-/usr/lib/*/cmake/XdmfCMake/*
+/usr/lib/*/xdmf/*/lib*.a
diff --git a/debian/patches/hdf5-1.10.patch b/debian/patches/hdf5-1.10.patch
new file mode 100644
index 0000000..3778a66
--- /dev/null
+++ b/debian/patches/hdf5-1.10.patch
@@ -0,0 +1,47 @@
+Index: xdmf-2.1.dfsg.1/libsrc/XdmfH5Driver.cxx
+===================================================================
+--- xdmf-2.1.dfsg.1.orig/libsrc/XdmfH5Driver.cxx
++++ xdmf-2.1.dfsg.1/libsrc/XdmfH5Driver.cxx
+@@ -133,14 +133,19 @@ static herr_t H5FD_dsm_close(H5FD_t *_fi
+ static herr_t H5FD_dsm_flush(H5FD_t *_file);
+ #endif
+ static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
++#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10))
++static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file, H5FD_mem_t type);
++#elif ((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
++static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);
++#else
++static haddr_t H5FD_dsm_get_eof(H5FD_t *_file);
++#endif
+ #if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
+ static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
+ static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+-static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);
+ #else
+ static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);
+ static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);
+-static haddr_t H5FD_dsm_get_eof(H5FD_t *_file);
+ #endif
+ static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
+            DSM_HSIZE_T size, void *buf);
+@@ -152,6 +157,9 @@ static const H5FD_class_t H5FD_dsm_g = {
+     "dsm",                      /*name          */
+     MAXADDR,                    /*maxaddr       */
+     H5F_CLOSE_WEAK,             /*fc_degree     */
++#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10))
++    NULL,                       /* terminate    */
++#endif
+     NULL,                       /*sb_size       */
+     NULL,                       /*sb_encode     */
+     NULL,                       /*sb_decode     */
+@@ -684,7 +692,9 @@ H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t
+  *-------------------------------------------------------------------------
+  */
+ static haddr_t
+-#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
++#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=10))
++H5FD_dsm_get_eof(const H5FD_t *_file, H5FD_mem_t type)
++#elif ((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
+ H5FD_dsm_get_eof(const H5FD_t *_file)
+ #else
+ H5FD_dsm_get_eof(H5FD_t *_file)
diff --git a/debian/patches/series b/debian/patches/series
index fd12ad6..d375aa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ reproducible-build.patch
 c++11.patch
 gzstream.patch
 python-install-dir.patch
+hdf5-1.10.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/xdmf.git