diff options
| -rw-r--r-- | academic/sword/curl.patch | 22 | ||||
| -rw-r--r-- | academic/sword/multimap.patch | 39 | ||||
| -rw-r--r-- | academic/sword/sword-1.6.2-clucene2.patch | 125 | ||||
| -rw-r--r-- | academic/sword/sword.SlackBuild | 6 | ||||
| -rw-r--r-- | academic/sword/sword.info | 6 |
5 files changed, 193 insertions, 5 deletions
diff --git a/academic/sword/curl.patch b/academic/sword/curl.patch new file mode 100644 index 0000000000000..63fd4433cfea9 --- /dev/null +++ b/academic/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/academic/sword/multimap.patch b/academic/sword/multimap.patch new file mode 100644 index 0000000000000..7957ab2d8c7fe --- /dev/null +++ b/academic/sword/multimap.patch @@ -0,0 +1,39 @@ +--- sword-1.6.2/include/multimapwdef.h 2004-05-04 23:01:39.000000000 +0200 ++++ /usr/include/sword/multimapwdef.h 2012-06-02 13:37:47.816457345 +0200 +@@ -7,26 +7,26 @@ + + // multmap that still lets you use [] to reference FIRST + // entry of a key if multiples exist +-template <class Key, class T, class Compare> +-class multimapwithdefault : public std::multimap<Key, T, Compare> { ++template < class Key, class T, class Compare > ++class multimapwithdefault : public std::multimap< Key, T, Compare > { + public: +- typedef std::pair<const Key, T> value_type; ++ 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; + } + + 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/academic/sword/sword-1.6.2-clucene2.patch b/academic/sword/sword-1.6.2-clucene2.patch new file mode 100644 index 0000000000000..f887f221472a8 --- /dev/null +++ b/academic/sword/sword-1.6.2-clucene2.patch @@ -0,0 +1,125 @@ +diff -up sword-1.6.2/configure.clucene2 sword-1.6.2/configure +--- sword-1.6.2/configure.clucene2 2010-10-22 23:14:28.000000000 +0200 ++++ sword-1.6.2/configure 2011-10-02 21:27:35.420704861 +0200 +@@ -16348,9 +16348,9 @@ for flag in $with_clucene; do + if test -z "$clucene_set_failed"; then + if test -e "$flag/include/CLucene.h"; then + # 64-bit checks first +- if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then ++ if test -e "$flag/lib64/libclucene-core.la" || test -e "$flag/lib64/libclucene-core.so"; then + clucene_set_failed=$flag +- CLUCENE_LIBS="-L$flag/lib64 -lclucene" ++ CLUCENE_LIBS="-L$flag/lib64 -lclucene-core" + if test -e "$flag/include/CLucene/clucene-config.h"; then + CLUCENE_CXXFLAGS="-I$flag/include" + else +@@ -16358,9 +16358,9 @@ for flag in $with_clucene; do + fi + else + # 32-bit checks +- if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then ++ if test -e "$flag/lib/libclucene-core.la" || test -e "$flag/lib/libclucene-core.so"; then + clucene_set_failed=$flag +- CLUCENE_LIBS="-L$flag/lib -lclucene" ++ CLUCENE_LIBS="-L$flag/lib -lclucene-core" + if test -e "$flag/include/CLucene/clucene-config.h"; then + CLUCENE_CXXFLAGS="-I$flag/include" + else +diff -up sword-1.6.2/m4/acx_clucene.m4.clucene2 sword-1.6.2/m4/acx_clucene.m4 +--- sword-1.6.2/m4/acx_clucene.m4.clucene2 2007-05-19 23:28:23.000000000 +0200 ++++ sword-1.6.2/m4/acx_clucene.m4 2011-10-02 21:27:35.420704861 +0200 +@@ -29,9 +29,9 @@ for flag in $with_clucene; do + if test -z "$clucene_set_failed"; then + if test -e "$flag/include/CLucene.h"; then + # 64-bit checks first +- if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then ++ if test -e "$flag/lib64/libclucene-core.la" || test -e "$flag/lib64/libclucene-core.so"; then + clucene_set_failed=$flag +- CLUCENE_LIBS="-L$flag/lib64 -lclucene" ++ CLUCENE_LIBS="-L$flag/lib64 -lclucene-core" + if test -e "$flag/include/CLucene/clucene-config.h"; then + CLUCENE_CXXFLAGS="-I$flag/include" + else +@@ -39,9 +39,9 @@ for flag in $with_clucene; do + fi + else + # 32-bit checks +- if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then ++ if test -e "$flag/lib/libclucene-core.la" || test -e "$flag/lib/libclucene-core.so"; then + clucene_set_failed=$flag +- CLUCENE_LIBS="-L$flag/lib -lclucene" ++ CLUCENE_LIBS="-L$flag/lib -lclucene-core" + if test -e "$flag/include/CLucene/clucene-config.h"; then + CLUCENE_CXXFLAGS="-I$flag/include" + else +diff -up sword-1.6.2/src/modules/swmodule.cpp.clucene2 sword-1.6.2/src/modules/swmodule.cpp +--- sword-1.6.2/src/modules/swmodule.cpp.clucene2 2011-10-02 21:32:40.825795281 +0200 ++++ sword-1.6.2/src/modules/swmodule.cpp 2011-10-02 22:02:42.441506634 +0200 +@@ -40,7 +40,7 @@ + + #ifdef USELUCENE + #include <CLucene.h> +-#include <CLucene/CLBackwards.h> ++//#include <CLucene/CLBackwards.h> + + //Lucence includes + //#include "CLucene.h" +@@ -59,6 +59,9 @@ using namespace lucene::search; + + using std::vector; + ++extern size_t lucene_utf8towcs(wchar_t *, const char *, size_t maxslen); ++extern size_t lucene_wcstoutf8 (char *, const wchar_t *, size_t maxslen); ++ + SWORD_NAMESPACE_START + + SWDisplay SWModule::rawdisp; +@@ -1144,7 +1147,7 @@ signed char SWModule::createSearchFramew + + lucene_utf8towcs(wcharBuffer, keyText, MAX_CONV_SIZE); //keyText must be utf8 + // doc->add( *(new Field("key", wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED))); +- doc->add( *Field::Text(_T("key"), wcharBuffer ) ); ++ doc->add(*_CLNEW Field(_T("key"), wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED) ); + + + if (includeKeyInSearch) { +@@ -1155,11 +1158,11 @@ signed char SWModule::createSearchFramew + } + + lucene_utf8towcs(wcharBuffer, content, MAX_CONV_SIZE); //content must be utf8 +- doc->add( *Field::UnStored(_T("content"), wcharBuffer) ); ++ doc->add(*_CLNEW Field(_T("content"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED)); + + if (strong.length() > 0) { + lucene_utf8towcs(wcharBuffer, strong, MAX_CONV_SIZE); +- doc->add( *Field::UnStored(_T("lemma"), wcharBuffer) ); ++ doc->add(*_CLNEW Field(_T("lemma"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) ); + //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str()); + } + +@@ -1280,12 +1283,12 @@ signed char SWModule::createSearchFramew + + //printf("proxBuf after (%s).\nprox: %s\nproxLem: %s\n", (const char *)*key, proxBuf.c_str(), proxLem.c_str()); + +- doc->add( *Field::UnStored(_T("prox"), wcharBuffer) ); ++ doc->add(*_CLNEW Field(_T("prox"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) ); + good = true; + } + if (proxLem.length() > 0) { + lucene_utf8towcs(wcharBuffer, proxLem, MAX_CONV_SIZE); //keyText must be utf8 +- doc->add( *Field::UnStored(_T("proxlem"), wcharBuffer) ); ++ doc->add(*_CLNEW Field(_T("proxlem"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) ); + good = true; + } + if (good) { +@@ -1315,7 +1318,9 @@ signed char SWModule::createSearchFramew + fsWriter = new IndexWriter(d, an, true); + } + +- Directory *dirs[] = { ramDir, 0 }; ++ ValueArray<Directory*> dirs(2); ++ dirs[0] = ramDir; ++ dirs[1] = 0; + fsWriter->addIndexes(dirs); + fsWriter->close(); + diff --git a/academic/sword/sword.SlackBuild b/academic/sword/sword.SlackBuild index b7c0e3f537d92..cf92f44eddb9c 100644 --- a/academic/sword/sword.SlackBuild +++ b/academic/sword/sword.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sword -VERSION=${VERSION:-1.7.0} +VERSION=${VERSION:-1.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p0 -i $CWD/sword-curl-7.20.0-fix.patch +patch -p1 < $CWD/sword-1.6.2-clucene2.patch +patch -p1 < $CWD/curl.patch +patch -p1 < $CWD/multimap.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/academic/sword/sword.info b/academic/sword/sword.info index 94c22952822c7..58e53de0ca0a5 100644 --- a/academic/sword/sword.info +++ b/academic/sword/sword.info @@ -1,8 +1,8 @@ PRGNAM="sword" -VERSION="1.7.0" +VERSION="1.6.2" HOMEPAGE="http://www.crosswire.org/sword" -DOWNLOAD="http://crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.0.tar.gz" -MD5SUM="c4d9c1664ba73acf490ced2e56ee444f" +DOWNLOAD="http://crosswire.org/ftpmirror/pub/sword/source/v1.6/sword-1.6.2.tar.gz" +MD5SUM="a7dc4456e20e915fec46d774b690e305" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |