Browse Source

Fix FTBFS with sword 1.7.x

tags/r14.0.0
Slávek Banko 5 years ago
parent
commit
5d68351383
4 changed files with 36 additions and 1 deletions
  1. +12
    -0
      bibletime/backend/centrydisplay.h
  2. +4
    -0
      bibletime/bibletime.cpp
  3. +1
    -1
      bibletime/frontend/btinstallmgr.h
  4. +19
    -0
      configure.in.in

+ 12
- 0
bibletime/backend/centrydisplay.h View File

@@ -13,6 +13,7 @@
#define CENTRYDISPLAY_H

//BibleTime includes
#include "config.h"
#include "ctextrendering.h"
#include "cswordmoduleinfo.h"
#include "cswordbackend.h"
@@ -45,6 +46,17 @@ public:
* The displayoptions and filter options are used, too.
*/
virtual const TQString text( const ListCSwordModuleInfo& modules, const TQString& key, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions);

#ifdef SWORD_API_1_7
/** casts a module to a character pointer and displays it to
* raw output (overriden for different display types and
* module types if necessary)
*
* @param imodule module to display
* @return error status
*/
virtual char display(SWModule &imodule) { return 0; };
#endif
};




+ 4
- 0
bibletime/bibletime.cpp View File

@@ -311,7 +311,11 @@ void BibleTime::processCommandline() {
KRandomSequence rs;
int newIndex = rs.getLong(maxIndex);
vk.setPosition(sword::TOP);
#ifdef SWORD_API_1_7
vk.setIndex(newIndex);
#else
vk.Index(newIndex);
#endif
bibleKey = vk.key();
}
createReadDisplayWindow(bible, bibleKey);


+ 1
- 1
bibletime/frontend/btinstallmgr.h View File

@@ -19,7 +19,7 @@

//sword includes
#include <installmgr.h>
#include <ftptrans.h>
#include <ftplibftpt.h>

//TQt includes
#include <tqobject.h>


+ 19
- 0
configure.in.in View File

@@ -78,6 +78,25 @@ CXXFLAGS="$cxx_flags_safe"
CFLAGS="$cflags_safe"
AC_LANG_RESTORE

dnl Check bibletime API version
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
cxx_flags_safe="$CXXFLAGS"
cflags_safe="$CFLAGS"
CXXFLAGS="$CXXFLAGS -I$ac_cv_sword_incdir"
CFLAGS="$CFLAGS -I$ac_cv_sword_incdir"
AC_MSG_CHECKING([if Sword provides API 1.7.x])
AC_TRY_COMPILE([#include <versekey.h>
static sword::VerseKey staticKey;
sword::VerseKey keyBound;
],[keyBound = staticKey.getUpperBound();],
[AC_MSG_RESULT(yes)
AC_DEFINE(SWORD_API_1_7,1,[Defined if sword api is 1.7.x or newer])],
AC_MSG_RESULT(no))
CXXFLAGS="$cxx_flags_safe"
CFLAGS="$cflags_safe"
AC_LANG_RESTORE

dnl add here all your Makefiles. They are created by configure

AC_CONFIG_FILES([ README ])


Loading…
Cancel
Save