diff options
| author | Dmitrijs Ledkovs <xnox@debian.org> | 2012-04-17 21:39:11 +0100 |
|---|---|---|
| committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-03-29 10:54:07 -0400 |
| commit | 9bdd21628118bca593af69cb4bb8555c0b9405b9 (patch) | |
| tree | 827f070f1bf26f36d07b643b6dadeb2364d9a1c6 /debian/patches | |
| parent | 9ec4d99a2b5b79366180fc4adee08259d4a0b418 (diff) | |
Imported Debian patch 1.6.2+dfsg-4
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/fix-ftbfs-gcc4.7.diff | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff b/debian/patches/fix-ftbfs-gcc4.7.diff new file mode 100644 index 0000000..2299820 --- /dev/null +++ b/debian/patches/fix-ftbfs-gcc4.7.diff @@ -0,0 +1,25 @@ +Partially fix ftbfs with gcc-4.7 +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 --git a/debian/patches/series b/debian/patches/series index 891f106..55eb22f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 2631_fix_curl.patch cmake_backport.patch icu_in_soname.patch +fix-ftbfs-gcc4.7.diff |