Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost149.git;a=commitdiff;h=6c2ebb834c2e684a61d7fdf0d0e2dd754066dad5
commit 6c2ebb834c2e684a61d7fdf0d0e2dd754066dad5 Author: Elentir <[email protected]> Date: Tue May 8 10:52:08 2012 +0200 sword-1.6.2-1-x86_64 * add patchs to fix build * rebuild with the patchs to fix headers diff --git a/source/apps-extra/sword/FrugalBuild b/source/apps-extra/sword/FrugalBuild index d6920fd..8d633d4 100644 --- a/source/apps-extra/sword/FrugalBuild +++ b/source/apps-extra/sword/FrugalBuild @@ -12,9 +12,12 @@ groups=('apps-extra') archs=('i686' 'x86_64') backup=(etc/sword.conf) up2date="lynx -dump http://www.crosswire.org/sword/software/swordapi.jsp | grep 'sword-.*.tar.gz' | sed 's/.*sword-\(.*\).tar.gz.*/\1/'" -source=(http://www.crosswire.org/ftpmirror/pub/sword/source/v`echo $pkgver | sed 's/\(.*\)\..*/\1/'`/$pkgname-$pkgver.tar.gz sword.sh) +source=(http://www.crosswire.org/ftpmirror/pub/sword/source/v`echo $pkgver | sed 's/\(.*\)\..*/\1/'`/$pkgname-$pkgver.tar.gz \ + sword.sh sword-gcc47.patch sword-curl.patch) sha1sums=('d4f3b924ba6f78b436a33d4819c76f766e4551f8' \ - 'c552669a7498177d5f4523ad5c2f5bae63d2dd4d') + 'c552669a7498177d5f4523ad5c2f5bae63d2dd4d' \ + '468f731bbe95bf1b370ad5f380993ad613568344' \ + 'b7f6966b90a63157d2ce08aa4af7b83b74488175') build() { diff --git a/source/apps-extra/sword/sword-curl.patch b/source/apps-extra/sword/sword-curl.patch new file mode 100644 index 0000000..63fd443 --- /dev/null +++ b/source/apps-extra/sword/sword-curl.patch @@ -0,0 +1,22 @@ +diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp +--- sword-1.6.2.orig/src/mgr/curlftpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlftpt.cpp 2011-07-27 00:42:05.000000000 +0200 +@@ -26,7 +26,6 @@ + #include <fcntl.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> +diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp +--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp 2011-07-27 00:42:45.000000000 +0200 +@@ -25,7 +25,6 @@ + #include <cctype> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> diff --git a/source/apps-extra/sword/sword-gcc47.patch b/source/apps-extra/sword/sword-gcc47.patch new file mode 100644 index 0000000..cef02fa --- /dev/null +++ b/source/apps-extra/sword/sword-gcc47.patch @@ -0,0 +1,24 @@ +Index: sword-1.6.2+svn2679/include/multimapwdef.h +=================================================================== +--- sword-1.6.2+svn2679.orig/include/multimapwdef.h ++++ sword-1.6.2+svn2679/include/multimapwdef.h +@@ -19,14 +19,14 @@ public: + } + + 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; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
