[adios] 15/18: New patch type-bool-already-defined.patch to fix FTBFS against HDF5 1.10. Thanks to Giles Filippini, Closes: #841967

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/1.10.1-1
in repository adios.

commit 8b1e02d4c193a27c4ca8548d2804ab258d99abf3
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Oct 22 23:52:08 2016 +0100

    New patch type-bool-already-defined.patch to fix FTBFS against HDF5 1.10. Thanks to Giles Filippini, Closes: #841967
---
 debian/changelog                               |  2 ++
 debian/patches/series                          |  1 +
 debian/patches/type-bool-already-defined.patch | 17 +++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 588af9d..32395a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ adios (1.10.1-1) UNRELEASED; urgency=medium
     - python3 now supported natively
     - security.patch now merged upstream
   * DH_COMPAT=10
+  * New patch type-bool-already-defined.patch to fix FTBFS against HDF5 1.10.
+    Thanks to Giles Filippini, Closes: #841967
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 03 Oct 2016 15:07:36 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index c770bbf..9abdef2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ python_wrapper.patch
 #multiarch_safe.patch
 version-fix.patch
 gcc6-fixes.patch
+type-bool-already-defined.patch
\ No newline at end of file
diff --git a/debian/patches/type-bool-already-defined.patch b/debian/patches/type-bool-already-defined.patch
new file mode 100644
index 0000000..bfc2d9b
--- /dev/null
+++ b/debian/patches/type-bool-already-defined.patch
@@ -0,0 +1,17 @@
+Description: HDF5 1.10 defines type bool
+Author: Gilles Filippini <pini at debian.org>
+Index: adios-1.9.0/utils/bp2h5/bp2h5.c
+===================================================================
+--- adios-1.9.0.orig/utils/bp2h5/bp2h5.c
++++ adios-1.9.0/utils/bp2h5/bp2h5.c
+@@ -43,7 +43,9 @@
+ #include "dmalloc.h"
+ #endif
+ 
+-typedef int bool;
++#ifndef bool
++typedef int bool;
++#endif
+ #define false 0
+ #define true  1
+ 

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