Bug#846372: vtk6: diff for NMU version 6.3.0+dfsg1-2.1

[Iain Lane]

On Thu, Dec 01, 2016 at 11:21:49AM +0000, Iain Lane wrote:
> Control: tags 846372 + pending
> 
> This one works. Here's the diff which I'm uploading to DELAYED/5. Let me
> know if you want to handle it yourself. I'll keep an eye on the build at
> Ubuntu too to make sure it's all good there.

Oops, the context was messed up from the Ubuntu no-change uploads.

-- 
Iain Lane                                  [ iain at orangesquash.org.uk ]
Debian Developer                                   [ laney at debian.org ]
Ubuntu Developer                                   [ laney at ubuntu.com ]
-------------- next part --------------
diff -Nru vtk6-6.3.0+dfsg1/debian/changelog vtk6-6.3.0+dfsg1/debian/changelog
--- vtk6-6.3.0+dfsg1/debian/changelog	2016-10-15 17:52:43.000000000 +0100
+++ vtk6-6.3.0+dfsg1/debian/changelog	2016-12-01 11:19:54.000000000 +0000
@@ -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 -Nru vtk6-6.3.0+dfsg1/debian/patches/99-hdf5-1.10-compatibility vtk6-6.3.0+dfsg1/debian/patches/99-hdf5-1.10-compatibility
--- vtk6-6.3.0+dfsg1/debian/patches/99-hdf5-1.10-compatibility	1970-01-01 01:00:00.000000000 +0100
+++ vtk6-6.3.0+dfsg1/debian/patches/99-hdf5-1.10-compatibility	2016-12-01 11:19:19.000000000 +0000
@@ -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 -Nru vtk6-6.3.0+dfsg1/debian/patches/series vtk6-6.3.0+dfsg1/debian/patches/series
--- vtk6-6.3.0+dfsg1/debian/patches/series	2016-05-27 21:01:49.000000000 +0100
+++ vtk6-6.3.0+dfsg1/debian/patches/series	2016-11-30 17:49:57.000000000 +0000
@@ -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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers/attachments/20161201/b866f218/attachment-0001.sig>