Matthias Klose <d...@debian.org> (03/04/2012): > Package: sword > Version: 1.6.2+dfsg-1 > Severity: important > Tags: sid wheezy > User: debian-...@lists.debian.org > Usertags: ftbfs-gcc-4.7
Here's a prospective, incomplete patch. I think the next step is getting the bindings fixed, which might imply fixing bugs on the swig side (which I didn't check at all, just wild guess). Mraw, KiBi.
diff -Nru sword-1.6.2+dfsg/debian/changelog sword-1.6.2+dfsg/debian/changelog --- sword-1.6.2+dfsg/debian/changelog 2011-11-09 00:02:57.000000000 +0000 +++ sword-1.6.2+dfsg/debian/changelog 2012-04-04 19:36:54.000000000 +0000 @@ -1,3 +1,10 @@ +sword (1.6.2+dfsg-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Prospective, incomplete patch for #667387. + + -- Cyril Brulebois <k...@debian.org> Wed, 04 Apr 2012 19:36:41 +0000 + sword (1.6.2+dfsg-1) unstable; urgency=low [ Dmitrijs Ledkovs <dmitrij.led...@ubuntu.com> ] diff -Nru sword-1.6.2+dfsg/debian/patches/incomplete-patch-for-667387 sword-1.6.2+dfsg/debian/patches/incomplete-patch-for-667387 --- sword-1.6.2+dfsg/debian/patches/incomplete-patch-for-667387 1970-01-01 00:00:00.000000000 +0000 +++ sword-1.6.2+dfsg/debian/patches/incomplete-patch-for-667387 2012-04-04 19:37:42.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Start fixing FTBFS with gcc 4.7 (#667387) +Author: Cyril Brulebois <k...@debian.org> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- sword-1.6.2+dfsg.orig/include/multimapwdef.h ++++ sword-1.6.2+dfsg/include/multimapwdef.h +@@ -13,20 +13,20 @@ public: + typedef std::pair<const Key, T> value_type; + T& getWithDefault(const Key& k, const T& defaultValue) { + if (find(k) == this->end()) { +- insert(value_type(k, defaultValue)); ++ this->insert(value_type(k, defaultValue)); + } +- return (*(find(k))).second; ++ return (*(this->find(k))).second; + } + + 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 2011-11-08 23:53:22.000000000 +0000 +++ sword-1.6.2+dfsg/debian/patches/series 2012-04-04 19:37:16.000000000 +0000 @@ -4,3 +4,4 @@ 15_move_icudatadir.diff 16_gcc4.6_sword.patch 2631_fix_curl.patch +incomplete-patch-for-667387
signature.asc
Description: Digital signature
