diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2009-03-02 19:51:08 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2009-03-02 19:51:08 +0000 |
| commit | 740cf0fc66023b39d14265efc849a026e8fa49d4 (patch) | |
| tree | dfb54ccbc53e924213295d71d02a58398594f1e2 /kde-misc/kio-sword/files | |
| parent | old (diff) | |
| download | historical-740cf0fc66023b39d14265efc849a026e8fa49d4.tar.gz historical-740cf0fc66023b39d14265efc849a026e8fa49d4.tar.bz2 historical-740cf0fc66023b39d14265efc849a026e8fa49d4.zip | |
Bump to 0.3, fixes #251585, patch from Francisco Jose Canizares Santofimia
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'kde-misc/kio-sword/files')
| -rw-r--r-- | kde-misc/kio-sword/files/kio_sword-build_fixes.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/kde-misc/kio-sword/files/kio_sword-build_fixes.patch b/kde-misc/kio-sword/files/kio_sword-build_fixes.patch new file mode 100644 index 000000000000..10104682ae0e --- /dev/null +++ b/kde-misc/kio-sword/files/kio_sword-build_fixes.patch @@ -0,0 +1,68 @@ +--- configure 2006-12-16 11:11:58.000000000 -0500 ++++ configure.new 2007-01-12 09:49:21.000000000 -0500 +@@ -32379,7 +32379,7 @@ + echo "$as_me:$LINENO: checking for Sword library files" >&5 + echo $ECHO_N "checking for Sword library files... $ECHO_C" >&6 + +-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" ++ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" + + if test "x$ac_static_sword" = "xYES"; then + SEARCH_LIBS="libsword.a"; +@@ -32518,7 +32518,7 @@ + using namespace sword; + #endif + +-int main(int argc, char* argv) { ++int main(int argc, char* argv[]) { + std::cout << SWVersion::currentVersion << std::endl; + return 0; + } +--- configure.in.in 2007-01-12 09:52:04.000000000 -0500 ++++ configure.in.in.new 2007-01-12 09:52:27.000000000 -0500 +@@ -4,6 +4,6 @@ + AC_C_BIGENDIAN + AC_CHECK_KDEMAXPATHLEN + +-AC_CHECK_SWORD(1.5.7, [$ac_use_static]) ++AC_CHECK_SWORD(1.5.8, [$ac_use_static]) + + AC_CONFIG_FILES([ src/data/kio_sword.css ]) +--- src/renderer.cpp 2006-12-16 11:11:32.000000000 -0500 ++++ src/renderer.cpp 2007-01-12 09:24:57.000000000 -0500 +@@ -150,7 +150,7 @@ + else + setGlobalOption("Variants", "Primary Readings"); + +- LocaleMgr::systemLocaleMgr.setDefaultLocaleName(options.locale()); ++ LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(options.locale()); + } + + /** Return an HTML hyperlinked list of all modules, +@@ -471,7 +471,7 @@ + return; + + // FIXME - why do I need this call to setLocale()? +- vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName()); ++ vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName()); + + modtextdir = textDirection(module); + +@@ -835,7 +835,7 @@ + + if (!vk) + return output; +- vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName()); ++ vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName()); + + module->setSkipConsecutiveLinks(true); + vk->AutoNormalize(1); +@@ -1015,7 +1015,7 @@ + + QStringList Renderer::availableLocales() + { +- list<SWBuf> locales = LocaleMgr::systemLocaleMgr.getAvailableLocales(); ++ list<SWBuf> locales = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); + list<SWBuf>::const_iterator it; + list<SWBuf>::const_iterator it_end = locales.end(); + QStringList output; |