[med-svn] [perm] 01/04: Fix gcc7 issue

[Andreas Tille]

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

tille pushed a commit to tag debian/0.4.0-3
in repository perm.

commit 8b3e49da01d84b43614aff8c9083cdf7e5dd1e81
Author: Andreas Tille <tille at debian.org>
Date:   Mon Aug 21 10:05:36 2017 +0200

    Fix gcc7 issue
---
 debian/changelog          |  7 +++++++
 debian/patches/gcc7.patch | 25 +++++++++++++++++++++++++
 debian/patches/series     |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 42732e3..fb6a753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+perm (0.4.0-3) UNRELEASED; urgency=medium
+
+  * Fix gcc7 issue
+    Closes: #853609
+
+ -- Andreas Tille <tille at debian.org>  Mon, 21 Aug 2017 10:03:55 +0200
+
 perm (0.4.0-2) unstable; urgency=medium
 
   * Moved packaging to Git since source code vanished otherwise and
diff --git a/debian/patches/gcc7.patch b/debian/patches/gcc7.patch
new file mode 100644
index 0000000..08d4994
--- /dev/null
+++ b/debian/patches/gcc7.patch
@@ -0,0 +1,25 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 21 Aug 2017 10:03:55 +0200
+Bug-Debian: https://bugs.debian.org/853609
+Description: Fix gcc7 issue
+
+--- a/MappingResult.h
++++ b/MappingResult.h
+@@ -262,7 +262,7 @@ inline bool printAPairedMappingInPerM\
+     int totalMis = mis1 + mis2;
+ 
+     if(m1.caRef[0] == '\0' || m2.caRef[0] == '\0') {
+-        if(m1.QScores == '\0' || m2.QScores == '\0') {
++        if(m1.QScores == (char *)'\0' || m2.QScores == (char *)'\0') {
+             sprintf(AlignResult->caBufp, "%s\t%s\t%s\t%d\t%d\t%d\t%s\t%s\t%u\t%u\t%c\t%c\t%d\n",
+                     m1.QNAME, m1.caRead, m2.caRead, mis1, mis2,
+                     totalMis, m1.RNAME, m2.RNAME, m1.uiPOS, m2.uiPOS, m1.strand, m2.strand, mappedPairedNo);
+@@ -272,7 +272,7 @@ inline bool printAPairedMappingInPerM\
+                     totalMis, m1.RNAME, m2.RNAME, m1.uiPOS, m2.uiPOS, m1.strand, m2.strand, mappedPairedNo);
+         }
+     } else {
+-        if(m1.QScores == '\0' || m2.QScores == '\0') {
++        if(m1.QScores == (char *)'\0' || m2.QScores == (char *)'\0') {
+             sprintf(AlignResult->caBufp, "%s\t%s\t%s\t%d\t%d\t%d\t%s\t%s\t%u\t%u\t%c\t%c\t%d\t%s\t%s\n",
+                     m1.QNAME, m1.caRead, m2.caRead, mis1, mis2,
+                     totalMis, m1.RNAME, m2.RNAME, m1.uiPOS, m2.uiPOS, m1.strand, m2.strand, mappedPairedNo, m1.caRef, m2.caRef);
diff --git a/debian/patches/series b/debian/patches/series
index 801a8a3..ab32561 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 make_dynamic_executable.patch
 hardening.patch
 spelling.patch
+gcc7.patch

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