diff options
author | AndersonTorres <torres.anderson.85@gmail.com> | 2014-04-21 13:30:30 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@gmail.com> | 2014-04-21 21:23:16 -0300 |
commit | adf38bb8d58b684cbe3b8d88cc9f30ec2cbd5cf6 (patch) | |
tree | f49495639acdaccd87befb909c3b0cd093b3f63f /pkgs/development/libraries/sword | |
parent | 2a4282c8112313b9ed4ba929bf7ac68dcd09a2e1 (diff) |
Sword: update to 1.7.2 (and adding myself to maintainers)
Diffstat (limited to 'pkgs/development/libraries/sword')
-rw-r--r-- | pkgs/development/libraries/sword/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/sword/dont_include_curl_types_h.patch | 24 | ||||
-rw-r--r-- | pkgs/development/libraries/sword/gcc47.patch | 35 |
3 files changed, 4 insertions, 66 deletions
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index f8c5a213ee3b3..e6769285fc812 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -2,20 +2,17 @@ stdenv.mkDerivation rec { - version = "1.6.2"; + version = "1.7.2"; name = "sword-${version}"; src = fetchurl { - url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/${name}.tar.gz"; - sha256 = "1fc71avaxkhx6kckjiflw6j02lpg569b9bzaksq49i1m87awfxmg"; + url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; + sha256 = "ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871"; }; buildInputs = [ pkgconfig icu clucene_core curl ]; - # because curl/types.h disappeared since at least curl 7.21.7 - patches = [ ./dont_include_curl_types_h.patch ./gcc47.patch ]; - prePatch = '' patchShebangs .; ''; @@ -27,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.crosswire.org/sword/; platforms = stdenv.lib.platforms.linux; license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.piotr ]; + maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ]; }; } diff --git a/pkgs/development/libraries/sword/dont_include_curl_types_h.patch b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch deleted file mode 100644 index 233d59a32435c..0000000000000 --- a/pkgs/development/libraries/sword/dont_include_curl_types_h.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp -index 7d2fd3c..046291e 100644 ---- a/src/mgr/curlftpt.cpp -+++ b/src/mgr/curlftpt.cpp -@@ -26,7 +26,6 @@ - #include <fcntl.h> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <swlog.h> -diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp -index b736050..229d4dd 100644 ---- a/src/mgr/curlhttpt.cpp -+++ b/src/mgr/curlhttpt.cpp -@@ -25,7 +25,6 @@ - #include <cctype> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <swlog.h> diff --git a/pkgs/development/libraries/sword/gcc47.patch b/pkgs/development/libraries/sword/gcc47.patch deleted file mode 100644 index 7b55de75b646a..0000000000000 --- a/pkgs/development/libraries/sword/gcc47.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/419505 - - ---- a/include/multimapwdef.h -+++ b/include/multimapwdef.h -@@ -12,21 +12,21 @@ class multimapwithdefault : public std::multimap<Key, T, Compare> { - 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)); -+ if (this->find(k) == this->end()) { -+ 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; |