[med-svn] [nanopolish] 01/05: fix FTBFS in GCC6

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository nanopolish.

commit 6df32412c26ebece06be4b0196c187a5c57cc3e6
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Aug 5 20:24:39 2016 +0000

    fix FTBFS in GCC6
---
 debian/changelog                         |  7 +++++++
 debian/patches/fix-ftbfs-with-gcc6.patch | 14 ++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index abd41c6..c64342f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nanopolish (0.4.0-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS with GCC 6 (Closes: #831151)
+
+ -- Sascha Steinbiss <satta at debian.org>  Fri, 05 Aug 2016 19:46:56 +0000
+
 nanopolish (0.4.0-1) unstable; urgency=low
 
   * Initial release (Closes: #811458)
diff --git a/debian/patches/fix-ftbfs-with-gcc6.patch b/debian/patches/fix-ftbfs-with-gcc6.patch
new file mode 100644
index 0000000..950f620
--- /dev/null
+++ b/debian/patches/fix-ftbfs-with-gcc6.patch
@@ -0,0 +1,14 @@
+Description: fix build with GCC6
+Author: Sascha Steinbiss <satta at debian.org>
+--- a/src/common/nanopolish_variant.cpp
++++ b/src/common/nanopolish_variant.cpp
+@@ -24,7 +24,8 @@
+                                       const std::string& haplotype)
+ {
+     AlnParam par = aln_param_nt2nt;
+-    par.band_width = std::max(20, abs(reference.size() - haplotype.size()) * 2);
++    size_t difference = std::abs(reference.size() - haplotype.size());
++    par.band_width = std::max((size_t) 20, difference * 2);
+     AlnAln* aln = aln_stdaln(reference.c_str(), haplotype.c_str(), &par, 1, 1);
+     
+     // Make aligned strings where gaps are padded with '-'
diff --git a/debian/patches/series b/debian/patches/series
index 7e4debe..b31499f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ adjust-include-path.patch
 compiler-flags.patch
 external-libs.patch
 add-shebang-to-script.patch
+fix-ftbfs-with-gcc6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/nanopolish.git