diff options
| author | Étienne Mollier <emollier@debian.org> | 2021-11-06 19:29:55 +0100 |
|---|---|---|
| committer | Étienne Mollier <emollier@debian.org> | 2021-11-06 19:29:55 +0100 |
| commit | cb6f82dbbc5d2eb0db38559479cb31ccd70e1f49 (patch) | |
| tree | 0874153beba694ae1b4e69a186f560267a718114 | |
| parent | 54022a84bdccaa816c36541f01ba1196609b92a5 (diff) | |
Add gcc11.patch
Closes: 983981
| -rw-r--r-- | debian/patches/gcc11.patch | 56 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 57 insertions, 0 deletions
diff --git a/debian/patches/gcc11.patch b/debian/patches/gcc11.patch new file mode 100644 index 0000000..2ea9d13 --- /dev/null +++ b/debian/patches/gcc11.patch @@ -0,0 +1,56 @@ +Description: force comparison operator() const, fixing ftbfs with gcc-11 +Author: Étienne Mollier <emollier@debian.org> +Bug-Debian: https://bugs.debian.org/983981 +Forwarded: not-needed +Last-Update: 2021-11-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- bamtools.orig/src/api/internal/bam/BamMultiMerger_p.h ++++ bamtools/src/api/internal/bam/BamMultiMerger_p.h +@@ -62,7 +62,7 @@ + : m_comp(comp) + {} + +- bool operator()(const MergeItem& lhs, const MergeItem& rhs) ++ bool operator()(const MergeItem& lhs, const MergeItem& rhs) const + { + const BamAlignment& l = *lhs.Alignment; + const BamAlignment& r = *rhs.Alignment; +--- bamtools.orig/src/api/algorithms/Sort.h ++++ bamtools/src/api/algorithms/Sort.h +@@ -89,7 +89,7 @@ + {} + + // comparison function +- bool operator()(const BamTools::BamAlignment& lhs, const BamTools::BamAlignment& rhs) ++ bool operator()(const BamTools::BamAlignment& lhs, const BamTools::BamAlignment& rhs) const + { + return sort_helper(m_order, lhs.Name, rhs.Name); + } +@@ -130,7 +130,7 @@ + {} + + // comparison function +- bool operator()(const BamTools::BamAlignment& lhs, const BamTools::BamAlignment& rhs) ++ bool operator()(const BamTools::BamAlignment& lhs, const BamTools::BamAlignment& rhs) const + { + + // force unmapped aligmnents to end +@@ -182,7 +182,7 @@ + {} + + // comparison function +- bool operator()(const BamTools::BamAlignment& lhs, const BamTools::BamAlignment& rhs) ++ bool operator()(const BamTools::BamAlignment& lhs, const BamTools::BamAlignment& rhs) const + { + + // force alignments without tag to end +@@ -222,7 +222,7 @@ + { + + // comparison function +- inline bool operator()(const BamTools::BamAlignment&, const BamTools::BamAlignment&) ++ inline bool operator()(const BamTools::BamAlignment&, const BamTools::BamAlignment&) const + { + return false; // returning false tends to retain insertion order + } diff --git a/debian/patches/series b/debian/patches/series index 37e2577..88c96ba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ doxygen-tweak spelling tiddit.patch shared_and_static.patch +gcc11.patch |