tag 667388 patch thanks Matthias Klose <[email protected]> (03/04/2012): > Package: tagcoll2 > Version: 2.0.13-1 > Severity: important > Tags: sid wheezy > User: [email protected] > Usertags: ftbfs-gcc-4.7
Here's a patch for this FTBFS. No intent to NMU here. Mraw, KiBi.
diff -Nru tagcoll2-2.0.13/debian/changelog tagcoll2-2.0.13/debian/changelog --- tagcoll2-2.0.13/debian/changelog 2011-09-01 16:38:01.000000000 +0000 +++ tagcoll2-2.0.13/debian/changelog 2012-04-04 19:29:47.000000000 +0000 @@ -1,3 +1,12 @@ +tagcoll2 (2.0.13-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with gcc 4.7 (Closes: #667388): + - Use “this->” where needed. + - Fix missing <unistd.h> includes. + + -- Cyril Brulebois <[email protected]> Wed, 04 Apr 2012 19:29:09 +0000 + tagcoll2 (2.0.13-1) unstable; urgency=high * New upstream version diff -Nru tagcoll2-2.0.13/debian/patches/fix-ftbfs-with-gcc-4.7 tagcoll2-2.0.13/debian/patches/fix-ftbfs-with-gcc-4.7 --- tagcoll2-2.0.13/debian/patches/fix-ftbfs-with-gcc-4.7 1970-01-01 00:00:00.000000000 +0000 +++ tagcoll2-2.0.13/debian/patches/fix-ftbfs-with-gcc-4.7 2012-04-04 19:30:21.000000000 +0000 @@ -0,0 +1,77 @@ +Description: Fix FTBFS with gcc 4.7. +Author: Cyril Brulebois <[email protected]> +Bug-Debian: http://bugs.debian.org/667388 + +--- tagcoll2-2.0.13.orig/tagcoll/patch.tcc ++++ tagcoll2-2.0.13/tagcoll/patch.tcc +@@ -53,7 +53,7 @@ void PatchList<ITEM, TAG>::addPatch(cons + + iterator i = this->find(patch.item); + if (i == this->end()) +- insert(make_pair<ITEM, Patch<ITEM, TAG> >(patch.item, patch)); ++ this->insert(make_pair<ITEM, Patch<ITEM, TAG> >(patch.item, patch)); + else + i->second.mergeWith(patch); + } +--- tagcoll2-2.0.13.orig/tagcoll/Implications.h ++++ tagcoll2-2.0.13/tagcoll/Implications.h +@@ -107,7 +107,7 @@ public: + typename std::set<TAG> implying = coll.getTagsImplying(*t); + for (typename std::set<TAG>::const_iterator i = implying.begin(); + i != implying.end(); ++i) +- insert(wibble::singleton(*i), wibble::singleton(*t)); ++ this->insert(wibble::singleton(*i), wibble::singleton(*t)); + } + } + +--- tagcoll2-2.0.13.orig/tagcoll/coll/fast.tcc ++++ tagcoll2-2.0.13/tagcoll/coll/fast.tcc +@@ -240,7 +240,7 @@ std::set<TAG> Fast<ITEM, TAG>::getTagsIm + template<class ITEM, class TAG> + std::set<ITEM> Fast<ITEM, TAG>::getItemsExactMatch(const std::set<TAG>& tags) const + { +- std::set<ITEM> res = getItemsHavingTags(tags); ++ std::set<ITEM> res = this->getItemsHavingTags(tags); + typename std::set<ITEM>::iterator i = res.begin(); + while (i != res.end()) + { +--- tagcoll2-2.0.13.orig/tagcoll/coll/intdiskindex-tut.cc ++++ tagcoll2-2.0.13/tagcoll/coll/intdiskindex-tut.cc +@@ -22,6 +22,7 @@ + #include <tagcoll/coll/intdiskindex.h> + #include <string> + #include <map> ++#include <unistd.h> + + using namespace std; + +--- tagcoll2-2.0.13.orig/tagcoll/diskindex/int-tut.cc ++++ tagcoll2-2.0.13/tagcoll/diskindex/int-tut.cc +@@ -20,6 +20,7 @@ + + #include <tests/test-utils.h> + #include <tagcoll/diskindex/int.h> ++#include <unistd.h> + + namespace tut { + using namespace tagcoll::tests; +--- tagcoll2-2.0.13.orig/tagcoll/diskindex/mmap-tut.cc ++++ tagcoll2-2.0.13/tagcoll/diskindex/mmap-tut.cc +@@ -21,6 +21,7 @@ + #include <tests/test-utils.h> + #include <tagcoll/diskindex/mmap.h> + #include <cstring> ++#include <unistd.h> + + namespace tut { + using namespace std; +--- tagcoll2-2.0.13.orig/tagcoll/diskindex/string-tut.cc ++++ tagcoll2-2.0.13/tagcoll/diskindex/string-tut.cc +@@ -20,6 +20,7 @@ + + #include <tests/test-utils.h> + #include <tagcoll/diskindex/string.h> ++#include <unistd.h> + + namespace tut { + using namespace std; diff -Nru tagcoll2-2.0.13/debian/patches/series tagcoll2-2.0.13/debian/patches/series --- tagcoll2-2.0.13/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ tagcoll2-2.0.13/debian/patches/series 2012-04-04 19:30:02.000000000 +0000 @@ -0,0 +1 @@ +fix-ftbfs-with-gcc-4.7
signature.asc
Description: Digital signature
