This patch fixes the compilation of bibletime 2.9 with libsword 1.7.
diff -urN bibletime-2.9.2/cmake/sword_linker_check.cpp bibletime-2.9.2.mine/cmake/sword_linker_check.cpp
--- bibletime-2.9.2/cmake/sword_linker_check.cpp 2013-06-03 18:08:52.000000000 +0000
+++ bibletime-2.9.2.mine/cmake/sword_linker_check.cpp 2014-06-16 12:49:05.979470653 +0000
@@ -15,13 +15,13 @@
#include <swmgr.h>
#include <installmgr.h>
-#include <ftptrans.h>
+#include <curlftpt.h>
int main(int argc, char* argv[])
{
sword::SWMgr mgr;
sword::InstallMgr imgr;
- sword::FTPTransport trans("example.com");
+ sword::CURLFTPTransport CURLFTPTransport("example.com");
return 0;
}
diff -urN bibletime-2.9.2/src/backend/rendering/centrydisplay.h bibletime-2.9.2.mine/src/backend/rendering/centrydisplay.h
--- bibletime-2.9.2/src/backend/rendering/centrydisplay.h 2013-06-03 18:08:52.000000000 +0000
+++ bibletime-2.9.2.mine/src/backend/rendering/centrydisplay.h 2014-06-16 14:28:00.972395181 +0000
@@ -35,6 +35,7 @@
const DisplayOptions &displayOptions,
const FilterOptions &filterOptions);
+ virtual char display(sword::SWModule& mod) { (void)mod; return 'c';}
}; /* class CEntryDisplay */
} /* namespace Rendering */
diff -urN bibletime-2.9.2/src/bibletime.cpp bibletime-2.9.2.mine/src/bibletime.cpp
--- bibletime-2.9.2/src/bibletime.cpp 2013-06-03 18:08:52.000000000 +0000
+++ bibletime-2.9.2.mine/src/bibletime.cpp 2014-06-17 09:06:12.656074834 +0000
@@ -285,7 +285,7 @@
const int maxIndex = 31100;
int newIndex = rand() % maxIndex;
vk.setPosition(sword::TOP);
- vk.Index(newIndex);
+ vk.setIndex(newIndex);
createReadDisplayWindow(bible, vk.key());
} else {
createReadDisplayWindow(bible, bibleKey);
diff -urN bibletime-2.9.2/src/frontend/bookshelfmanager/btinstallmgr.cpp bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.cpp
--- bibletime-2.9.2/src/frontend/bookshelfmanager/btinstallmgr.cpp 2013-06-03 18:08:52.000000000 +0000
+++ bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.cpp 2014-06-17 09:55:32.442530952 +0000
@@ -18,7 +18,7 @@
// Sword includes:
#include <installmgr.h>
-#include <ftptrans.h>
+#include <curlftpt.h>
using namespace sword;
diff -urN bibletime-2.9.2/src/frontend/bookshelfmanager/btinstallmgr.h bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.h
--- bibletime-2.9.2/src/frontend/bookshelfmanager/btinstallmgr.h 2013-06-03 18:08:52.000000000 +0000
+++ bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.h 2014-06-17 09:53:52.314448110 +0000
@@ -18,7 +18,7 @@
// Sword includes:
#include <installmgr.h>
-#include <ftptrans.h>
+#include <curlftpt.h>
/**
signature.asc
Description: Digital signature
