[vtk6] 01/01: Add NMU hdf5 patch to package

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository vtk6.

commit 4b2f736ef64a8d058ade0f4027e05e0332042166
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Fri Dec 2 13:16:21 2016 +0000

    Add NMU hdf5 patch to package
---
 debian/changelog                          |  9 +++++++
 debian/patches/99-hdf5-1.10-compatibility | 41 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2994ce2..8066131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vtk6 (6.3.0+dfsg1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/99-hdf5-1.10-compatibility: Add. H5FD_class_t gained a new
+    member in 1.10 which must now be initialised. H5FD_dsm_get_eof also
+    changed type. (Closes: #846372)
+
+ -- Iain Lane <iain at orangesquash.org.uk>  Thu, 01 Dec 2016 11:19:54 +0000
+
 vtk6 (6.3.0+dfsg1-2) unstable; urgency=medium
 
   * [4f0b4c6] d/control: Update dependencies on mysqlclient-dev, 
diff --git a/debian/patches/99-hdf5-1.10-compatibility b/debian/patches/99-hdf5-1.10-compatibility
new file mode 100644
index 0000000..5e6c002
--- /dev/null
+++ b/debian/patches/99-hdf5-1.10-compatibility
@@ -0,0 +1,41 @@
+Description: The H5FD_class_t struct gained an extra member in 1.10
+Author: Iain Lane <iain.lane at canonical.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846372
+
+Index: b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
+===================================================================
+--- a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
++++ b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
+@@ -139,7 +139,11 @@
+ #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);
++#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);
++#else
+ static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file);
++#endif
+ #else
+ static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);
+ static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);
+@@ -155,6 +159,9 @@
+     "dsm",                      /*name          */
+     MAXADDR,                    /*maxaddr       */
+     H5F_CLOSE_WEAK,             /*fc_degree     */
++#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
++    NULL,                       /* terminate    */
++#endif
+     NULL,                       /*sb_size       */
+     NULL,                       /*sb_encode     */
+     NULL,                       /*sb_decode     */
+@@ -687,7 +694,9 @@
+  *-------------------------------------------------------------------------
+  */
+ 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_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 98abdea..0a7e621 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 104_fix_gcc_version_6.patch
 105_unforce_embedded_glew.patch
 106_install_doxygen_scripts_in_nodoc_build.patch
+99-hdf5-1.10-compatibility

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