JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sword: update to 1.7.2 (and adding myself to maintainers)

Browse Source
This commit is contained in:
AndersonTorres 2014-04-21 13:30:30 -03:00
parent 2a4282c811
commit adf38bb8d5
3 changed files with 4 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/sword/default.nix
View File

@ -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 ];
};
}

24
pkgs/development/libraries/sword/dont_include_curl_types_h.patch
View File

@ -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>

35
pkgs/development/libraries/sword/gcc47.patch
View File

@ -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;