severity 667387 serious tags 667387 + patch thanks
the attached patch fixes the build failure in the installed header file, causing e.g. bug #667421. There are however more build failures, but this patch lets us test build other packages needing the fixed header file.
diff -Nru sword-1.6.2+dfsg/debian/changelog sword-1.6.2+dfsg/debian/changelog --- sword-1.6.2+dfsg/debian/changelog 2012-04-09 16:04:29.000000000 +0200 +++ sword-1.6.2+dfsg/debian/changelog 2012-04-16 22:37:49.000000000 +0200 @@ -1,3 +1,11 @@ +sword (1.6.2+dfsg-3.1) unstable; urgency=low + + * Non maintainer upload. + * Fix build failure in installed header file with GCC 4.7. + Addresses: #667387. + + -- Matthias Klose <[email protected]> Mon, 16 Apr 2012 22:03:01 +0200 + sword (1.6.2+dfsg-3) unstable; urgency=low * Fix FTBFS if running binary-arch target only. diff -Nru sword-1.6.2+dfsg/debian/patches/fix-ftbfs-gcc4.7.diff sword-1.6.2+dfsg/debian/patches/fix-ftbfs-gcc4.7.diff --- sword-1.6.2+dfsg/debian/patches/fix-ftbfs-gcc4.7.diff 1970-01-01 01:00:00.000000000 +0100 +++ sword-1.6.2+dfsg/debian/patches/fix-ftbfs-gcc4.7.diff 2012-04-16 22:07:26.000000000 +0200 @@ -0,0 +1,24 @@ +Index: sword-1.6.2+dfsg/include/multimapwdef.h +=================================================================== +--- sword-1.6.2+dfsg.orig/include/multimapwdef.h 2004-05-04 21:01:39.000000000 +0000 ++++ sword-1.6.2+dfsg/include/multimapwdef.h 2012-04-16 20:07:17.256834065 +0000 +@@ -19,14 +19,14 @@ + } + + T& operator[](const Key& k) { +- if (find(k) == this->end()) { +- insert(value_type(k, T())); ++ if (this->find(k) == this->end()) { ++ this->insert(value_type(k, T())); + } +- return (*(find(k))).second; ++ return (*(this->find(k))).second; + } + bool has(const Key& k, const T &val) const { +- typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k); +- typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k); ++ typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k); ++ typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k); + for (; start!=end; start++) { + if (start->second == val) + return true; diff -Nru sword-1.6.2+dfsg/debian/patches/series sword-1.6.2+dfsg/debian/patches/series --- sword-1.6.2+dfsg/debian/patches/series 2012-04-06 16:35:13.000000000 +0200 +++ sword-1.6.2+dfsg/debian/patches/series 2012-04-16 22:02:08.000000000 +0200 @@ -4,3 +4,4 @@ 2631_fix_curl.patch cmake_backport.patch icu_in_soname.patch +fix-ftbfs-gcc4.7.diff
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
