Control: tags -1 patch upstream fixed-upstream

On Fri, Apr 17, 2020 at 11:06:22AM +0000, Matthias Klose wrote:

> The package fails to build in a test rebuild on at least amd64 with
> gcc-10/g++-10, but succeeds to build with gcc-9/g++-9.

This was already fixed upstream:

   
https://github.com/soedinglab/MMseqs2/commit/f6f001c8cc5820e50b33b355877664f7ca66cdb1

Debdiff attached.

Berto
diff -Nru mmseqs2-10-6d92c+ds/debian/changelog mmseqs2-10-6d92c+ds/debian/changelog
--- mmseqs2-10-6d92c+ds/debian/changelog	2020-02-11 22:57:58.000000000 +0100
+++ mmseqs2-10-6d92c+ds/debian/changelog	2020-04-19 20:21:55.000000000 +0200
@@ -1,3 +1,11 @@
+mmseqs2 (10-6d92c+ds-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/fix-ftbfs-gcc10.patch:
+    - Fix FTBFS with GCC 10 (Closes: #957552).
+
+ -- Alberto Garcia <[email protected]>  Sun, 19 Apr 2020 20:21:55 +0200
+
 mmseqs2 (10-6d92c+ds-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru mmseqs2-10-6d92c+ds/debian/patches/fix-ftbfs-gcc10.patch mmseqs2-10-6d92c+ds/debian/patches/fix-ftbfs-gcc10.patch
--- mmseqs2-10-6d92c+ds/debian/patches/fix-ftbfs-gcc10.patch	1970-01-01 01:00:00.000000000 +0100
+++ mmseqs2-10-6d92c+ds/debian/patches/fix-ftbfs-gcc10.patch	2020-04-19 20:21:55.000000000 +0200
@@ -0,0 +1,26 @@
+Author: Milot Mirdita <[email protected]>
+Subject: Fix FTBFS with GCC 10
+Bug-Debian: https://bugs.debian.org/957552
+Origin: https://github.com/soedinglab/MMseqs2/commit/f6f001c8cc5820e50b33b355877664f7ca66cdb1
+Index: mmseqs2-10-6d92c+ds/src/commons/Sequence.cpp
+===================================================================
+--- mmseqs2-10-6d92c+ds.orig/src/commons/Sequence.cpp
++++ mmseqs2-10-6d92c+ds/src/commons/Sequence.cpp
+@@ -151,7 +151,7 @@ std::pair<const char *, unsigned int> Se
+             for(size_t i = 0; i < kmerSize; i++){
+                 pattern[i]=1;
+             }
+-            return std::make_pair<const char *, unsigned int>((const char *) pattern, static_cast<unsigned int>(kmerSize));
++            return std::make_pair<const char *, unsigned int>(const_cast<const char*>(pattern), static_cast<unsigned int>(kmerSize));
+ 
+ //            Debug(Debug::ERROR) << "Did not find spaced pattern for kmerSize: " << kmerSize << ". \n";
+ //            Debug(Debug::ERROR) << "Please report this bug to the developer\n";
+@@ -162,7 +162,7 @@ std::pair<const char *, unsigned int> Se
+     if (pair.second > 0) {
+         memcpy(pattern, pair.first, pair.second * sizeof(char));
+     }
+-    return std::make_pair<const char *, unsigned int>(pattern, static_cast<unsigned int>(pair.second));
++    return std::make_pair<const char *, unsigned int>(const_cast<const char*>(pattern), static_cast<unsigned int>(pair.second));
+ #undef CASE
+ }
+ 
diff -Nru mmseqs2-10-6d92c+ds/debian/patches/series mmseqs2-10-6d92c+ds/debian/patches/series
--- mmseqs2-10-6d92c+ds/debian/patches/series	2020-02-11 22:57:58.000000000 +0100
+++ mmseqs2-10-6d92c+ds/debian/patches/series	2020-04-19 20:20:01.000000000 +0200
@@ -2,3 +2,4 @@
 fix_util_installation.patch
 use_system_zstd.patch
 use_system_gzstream.patch
+fix-ftbfs-gcc10.patch

Reply via email to