From 48b00bf2440fc8f6f29fb2d5dc93445adcdc99b2 Mon Sep 17 00:00:00 2001 From: "Juergen \"George\" Sawinski" Date: Thu, 22 Apr 2004 23:05:14 +0000 Subject: [PATCH] Juergen Sawinski: jsaw/sword: version update (1.5.7) and fix for undefined "TRUE" (patch from ml put into sm) [2004042117404819687] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2807 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/jsaw/sword/sword.desc | 6 +- package/jsaw/sword/true-locase-fix.patch | 102 +++++++++++++++++++++++ 2 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 package/jsaw/sword/true-locase-fix.patch diff --git a/package/jsaw/sword/sword.desc b/package/jsaw/sword/sword.desc index be3891d59..2ecf8cefb 100644 --- a/package/jsaw/sword/sword.desc +++ b/package/jsaw/sword/sword.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 1.5.6 +[V] 1.5.7 [P] X -----5---9 958.000 -[D] 3879770220 sword-1.5.6.tar.gz http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/ - +[D] 2319155485 sword-1.5.7.tar.gz http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/ +[O] var_append extraconfopt " " "--without-lucene" diff --git a/package/jsaw/sword/true-locase-fix.patch b/package/jsaw/sword/true-locase-fix.patch new file mode 100644 index 000000000..cb29e17b6 --- /dev/null +++ b/package/jsaw/sword/true-locase-fix.patch @@ -0,0 +1,102 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/jsaw/sword/true-locase-fix.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +TRUE is not defined generally. And there's no need to use it - its C++! + -- jsaw + +--- sword-1.5.7/src/mgr/installmgr.cpp.orig 2004-04-21 16:31:46.008706088 +0200 ++++ sword-1.5.7/src/mgr/installmgr.cpp 2004-04-21 16:31:46.014705176 +0200 +@@ -150,7 +150,7 @@ + curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile); + + /* Switch on full protocol/debug output */ +- curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE); ++ curl_easy_setopt(curl, CURLOPT_VERBOSE, true); + + res = curl_easy_perform(curl); + +--- sword-1.5.7/tests/tlitmgrtest.cpp.orig 2004-04-21 16:31:46.015705024 +0200 ++++ sword-1.5.7/tests/tlitmgrtest.cpp 2004-04-21 16:31:46.023703808 +0200 +@@ -72,7 +72,7 @@ + break; + case 0x61: // 'a' + // 'alias'; row[2]=createInstance argument +- registry->put(id, resString, TRUE); ++ registry->put(id, resString, true); + break; + } + } +@@ -85,7 +85,7 @@ + ures_close(transIDs); + ures_close(bundle); + +- specialInverses = new Hashtable(TRUE); ++ specialInverses = new Hashtable(true); + specialInverses->setValueDeleter(uhash_deleteUnicodeString); + _registerSpecialInverse(NullTransliterator::SHORT_ID, + NullTransliterator::SHORT_ID, FALSE); +@@ -94,14 +94,14 @@ + // cache. This is how new non-rule-based transliterators are + // added to the system. + +- registry->put(new NullTransliterator(), TRUE); +- registry->put(new LowercaseTransliterator(), TRUE); +- registry->put(new UppercaseTransliterator(), TRUE); +- registry->put(new TitlecaseTransliterator(), TRUE); +- _registerSpecialInverse("Upper", "Lower", TRUE); ++ registry->put(new NullTransliterator(), true); ++ registry->put(new LowercaseTransliterator(), true); ++ registry->put(new UppercaseTransliterator(), true); ++ registry->put(new TitlecaseTransliterator(), true); ++ _registerSpecialInverse("Upper", "Lower", true); + _registerSpecialInverse("Title", "Lower", FALSE); +- registry->put(new UnicodeNameTransliterator(), TRUE); +- registry->put(new NameUnicodeTransliterator(), TRUE); ++ registry->put(new UnicodeNameTransliterator(), true); ++ registry->put(new NameUnicodeTransliterator(), true); + RemoveTransliterator::registerIDs(); + EscapeTransliterator::registerIDs(); + UnescapeTransliterator::registerIDs(); +@@ -500,7 +500,7 @@ + break; + case 0x61: // 'a' + // 'alias'; row[2]=createInstance argument +- //registry->put(id, resString, TRUE); ++ //registry->put(id, resString, true); + break; + } + } +@@ -569,7 +569,7 @@ + break; + case 0x61: // 'a' + // 'alias'; row[2]=createInstance argument +- //registry->put(id, resString, TRUE); ++ //registry->put(id, resString, true); + break; + } + } +@@ -638,7 +638,7 @@ + break; + case 0x61: // 'a' + // 'alias'; row[2]=createInstance argument +- //registry->put(id, resString, TRUE); ++ //registry->put(id, resString, true); + break; + } + }