This is an automated email from the git hooks/post-receive script. malex-guest pushed a commit to branch master in repository cufflinks.
commit b2684cc5244f90f7898fce17de323890a0f7150e Author: Alexandre Mestiashvili <[email protected]> Date: Tue Sep 5 23:27:12 2017 +0200 Add patch fixing ftbfs with gcc-7, thanks to Jeff Epler <[email protected]> --- debian/patches/fix_gcc-7_ftbfs.patch | 85 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 86 insertions(+) diff --git a/debian/patches/fix_gcc-7_ftbfs.patch b/debian/patches/fix_gcc-7_ftbfs.patch new file mode 100644 index 0000000..4a0444d --- /dev/null +++ b/debian/patches/fix_gcc-7_ftbfs.patch @@ -0,0 +1,85 @@ +Author: Alex Mestiashvili <[email protected]> +Origin: https://lists.debian.org/debian-med/2017/09/msg00021.html +Bug-Debian: https://bugs.debian.org/871234 +Description: Fix gcc-7 build issue, thanks to Jeff Epler <[email protected]> +--- cufflinks.orig/src/GHash.hh ++++ cufflinks/src/GHash.hh +@@ -88,7 +88,7 @@ + //nextkey is SET to the corresponding key + GHashEntry* NextEntry() { //returns a pointer to a GHashEntry + register int pos=fCurrentEntry; +- while (pos<fCapacity && hash[pos].hash<0) pos++; ++ while (pos<fCapacity && (hash[pos].hash)<0) pos++; + if (pos==fCapacity) { + fCurrentEntry=fCapacity; + return NULL; +@@ -412,7 +412,7 @@ + + template <class OBJ> char* GHash<OBJ>::NextKey() { + register int pos=fCurrentEntry; +- while (pos<fCapacity && hash[pos].hash<0) pos++; ++ while (pos<fCapacity && (hash[pos].hash)<0) pos++; + if (pos==fCapacity) { + fCurrentEntry=fCapacity; + return NULL; +@@ -425,7 +425,7 @@ + + template <class OBJ> OBJ* GHash<OBJ>::NextData() { + register int pos=fCurrentEntry; +- while (pos<fCapacity && hash[pos].hash<0) pos++; ++ while (pos<fCapacity && (hash[pos].hash)<0) pos++; + if (pos==fCapacity) { + fCurrentEntry=fCapacity; + return NULL; +@@ -439,7 +439,7 @@ + + template <class OBJ> OBJ* GHash<OBJ>::NextData(char* &nextkey) { + register int pos=fCurrentEntry; +- while (pos<fCapacity && hash[pos].hash<0) pos++; ++ while (pos<fCapacity && (hash[pos].hash)<0) pos++; + if (pos==fCapacity) { + fCurrentEntry=fCapacity; + nextkey=NULL; +@@ -457,16 +457,16 @@ + // Get first non-empty entry + template <class OBJ> int GHash<OBJ>::First() const { + register int pos=0; +- while(pos<fCapacity){ if(0<=hash[pos].hash) break; pos++; } +- GASSERT(fCapacity<=pos || 0<=hash[pos].hash); ++ while(pos<fCapacity){ if(0<=(hash[pos].hash)) break; pos++; } ++ GASSERT(fCapacity<=pos || 0<=(hash[pos].hash)); + return pos; + } + + // Get last non-empty entry + template <class OBJ> int GHash<OBJ>::Last() const { + register int pos=fCapacity-1; +- while(0<=pos){ if(0<=hash[pos].hash) break; pos--; } +- GASSERT(pos<0 || 0<=hash[pos].hash); ++ while(0<=pos){ if(0<=(hash[pos].hash)) break; pos--; } ++ GASSERT(pos<0 || 0<=(hash[pos].hash)); + return pos; + } + +@@ -474,8 +474,8 @@ + // Find next valid entry + template <class OBJ> int GHash<OBJ>::Next(int pos) const { + GASSERT(0<=pos && pos<fCapacity); +- while(++pos <= fCapacity-1){ if(0<=hash[pos].hash) break; } +- GASSERT(fCapacity<=pos || 0<=hash[pos].hash); ++ while(++pos <= fCapacity-1){ if(0<=(hash[pos].hash)) break; } ++ GASSERT(fCapacity<=pos || 0<=(hash[pos].hash)); + return pos; + } + +@@ -483,8 +483,8 @@ + // Find previous valid entry + template <class OBJ> int GHash<OBJ>::Prev(int pos) const { + GASSERT(0<=pos && pos<fCapacity); +- while(--pos >= 0){ if(0<=hash[pos].hash) break; } +- GASSERT(pos<0 || 0<=hash[pos].hash); ++ while(--pos >= 0){ if(0<=(hash[pos].hash)) break; } ++ GASSERT(pos<0 || 0<=(hash[pos].hash)); + return pos; + } + diff --git a/debian/patches/series b/debian/patches/series index c8957a8..6320ad0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +fix_gcc-7_ftbfs.patch gffread_show_usage.patch 0004-fix-m64-usage-and-lfs.patch 0001-fix_spelling.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cufflinks.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
