Bug#756788: patch
I already have a patch fixing this bug. I tested the package and it builds after the fix. The patch adds a compiler option which fixes the bug. --- libwebp-0.4.1/debian/rules 2014-01-08 18:14:20.0 + +++ libwebp-0.4.1.mine/debian/rules 2014-08-05 21:21:31.832507772 + @@ -9,6 +9,11 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 +ifneq (,$(findstring mips,$(DEB_HOST_ARCH))) + CFLAGS+= -mips32r2 + export CFLAGS +endif + # dh seems to assume that configure is already there configure: ./autogen.sh signature.asc Description: Digital signature
Bug#754619: works for me
I just tried building sdformat on MIPS and it build successfully with all tests passing. I suppose we should try building it again. signature.asc Description: Digital signature
Bug#750382: works for me on mips
I tested the package on a MIPS system and it built successfully. All the tests passed. Here is part of the log: make[4]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' make check-TESTS make[4]: Entering directory '/root/lhasa/lhasa-0.2.0+git/test' make[5]: Entering directory '/root/lhasa/lhasa-0.2.0+git/test' PASS: test-crc16 PASS: test-basic-reader PASS: test-decoder PASS: test-decompress PASS: test-file-headers PASS: test-list-output PASS: test-crc-output PASS: test-print PASS: test-dry-run PASS: test-extract make[6]: Entering directory '/root/lhasa/lhasa-0.2.0+git/test' make[6]: Nothing to be done for 'all'. make[6]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' Testsuite summary for Lhasa 0.2.0 # TOTAL: 10 # PASS: 10 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 make[5]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' make[4]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' make[3]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' make[3]: Entering directory '/root/lhasa/lhasa-0.2.0+git' make[3]: Leaving directory '/root/lhasa/lhasa-0.2.0+git' make[2]: Leaving directory '/root/lhasa/lhasa-0.2.0+git' make[1]: Leaving directory '/root/lhasa/lhasa-0.2.0+git' fakeroot debian/rules binary prefix="/usr" dh binary --parallel I think we should try to build this one again through the auto-building system on MIPS. If it fails again, I'll look into the differences to find where the problem is. Plamen signature.asc Description: Digital signature
Bug#747784: patch
compilation fix for xiphos with libsword 1.7
diff -urN xiphos-3.1.5+dfsg/src/backend/module_manager.cc xiphos-3.1.5+dfsg.mine/src/backend/module_manager.cc
--- xiphos-3.1.5+dfsg/src/backend/module_manager.cc 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/module_manager.cc 2014-06-09 10:07:57.921822742 +
@@ -122,7 +122,7 @@
}
-char *backend_mod_mgr_get_config_entry(char *module_name,
+char *backend_mod_mgr_get_config_entry(const char *module_name,
const char *entry) {
SWModule *mod;
ModMap::iterator it; //-- iteratior
@@ -168,13 +168,13 @@
if (list_it != list_end) {
module = list_it->second;
mod_info = g_new(MOD_MGR, 1);
- gchar *name = module->Name();
+ const gchar *name = module->getName();
if (name) {
mod_info->name = g_strdup(name);
mod_info->language =
main_get_language_map(module->Lang());
- mod_info->type = g_strdup(module->Type());
+ mod_info->type = g_strdup(module->getType());
mod_info->about = g_strdup((char *)module->getConfigEntry("About"));
char *vers = (char *)module->getConfigEntry("Version");
@@ -213,7 +213,7 @@
backend_mod_mgr_get_config_entry(name, "Version");
mod_info->installed =
backend_mod_mgr_is_module(name);
- mod_info->description = module->Description();
+ mod_info->description = (char *)module->getDescription();
mod_info->locked =
((module->getConfigEntry("CipherKey")) ? 1 : 0);
list_it++;
@@ -318,7 +318,7 @@
return -1;
}
module = it->second;
- retval = installMgr->removeModule(tmp_mgr, module->Name());
+ retval = installMgr->removeModule(tmp_mgr, module->getName());
delete tmp_mgr;
return retval;
}
@@ -750,7 +750,7 @@
if (installMgr)
delete installMgr;
- installMgr = new InstallMgr(baseDir,
+ installMgr = new InstallMgr(baseDir.c_str(),
statusReporter,
(SWBuf)"ftp",
(SWBuf)"xip...@xiphos.org");
diff -urN xiphos-3.1.5+dfsg/src/backend/module_manager.hh xiphos-3.1.5+dfsg.mine/src/backend/module_manager.hh
--- xiphos-3.1.5+dfsg/src/backend/module_manager.hh 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/module_manager.hh 2014-06-09 09:43:55.404508602 +
@@ -27,7 +27,9 @@
#include
#include
-#include
+#include
+//#include
+//#include
using namespace std;
using namespace sword;
diff -urN xiphos-3.1.5+dfsg/src/backend/sword_main.cc xiphos-3.1.5+dfsg.mine/src/backend/sword_main.cc
--- xiphos-3.1.5+dfsg/src/backend/sword_main.cc 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/sword_main.cc 2014-06-09 10:22:27.410612461 +
@@ -131,23 +131,23 @@
for (it = main_mgr->Modules.begin();
it != main_mgr->Modules.end(); it++) {
display_mod = (*it).second;
- if (!strcmp(display_mod->Type(), TEXT_MODS)) {
+ if (!strcmp(display_mod->getType(), TEXT_MODS)) {
display_mod->setDisplay(textDisplay);
}
- if (!strcmp(display_mod->Type(), COMM_MODS)) {
+ if (!strcmp(display_mod->getType(), COMM_MODS)) {
display_mod->setDisplay(commDisplay);
}
- if (!strcmp(display_mod->Type(), DICT_MODS)) {
+ if (!strcmp(display_mod->getType(), DICT_MODS)) {
display_mod->setDisplay(dictDisplay);
}
- if (!strcmp(display_mod->Type(), BOOK_MODS)) {
+ if (!strcmp(display_mod->getType(), BOOK_MODS)) {
display_mod->setDisplay(bookDisplay);
}
}
} else if (gsType == 1) { // dialogs
for (it = main_mgr->Modules.begin(); it != main_mgr->Modules.end(); it++) {
display_mod = (*it).second;
- if (!strcmp(display_mod->Type(), TEXT_MODS)) {
+ if (!strcmp(display_mod->getType(), TEXT_MODS)) {
display_mod->setDisplay(chapDisplay);
} else {
display_mod->setDisplay(entryDisplay);
@@ -167,61 +167,61 @@
for (it = main_mgr->Modules.begin();
it != main_mgr->Modules.end(); it++) {
- if (!strcmp((*it).second->Type(), TEXT_MODS)) {
+ if (!strcmp((*it).second->getType(), TEXT_MODS)) {
mods->biblemods =
g_list_append(mods->biblemods,
-strdup((char *) (*it).second->Name()));
+strdup((char *) (*it).second->getName()));
mods->text_descriptions =
g_list_append(mods->text_descriptions,
strdup((char *) (*it).second->
- Description()));
+ getDescription()));
}
- if (!strcmp((*it).second->Type(), COMM_MODS)) {
+ if (!strcmp((*it).second->getType(), COMM_MODS)) {
mods->commentarymods =
g_list_append(mods->commentarymods,
- strdup((char *) (*it).second->Name()));
+ strdup((char *) (*it).second->getName()));
mods->comm_descriptions =
g_list_append(mods->comm_descriptions,
strdup((char *) (*it).second->
- Description()));
+ getDescription()));
if (!strcmp((*it).second->getConfigEntry("ModDrv")
, "RawFiles")) {
mods->percommods = g_list_append(mods->percommods,
-strdup((char *) (*it).second->Name()));
+strdup((char *) (*it).second->getName()));
}
}
- if (!strcmp(
Bug#748685: patch for bibletime 2.9
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.0 +
+++ bibletime-2.9.2.mine/cmake/sword_linker_check.cpp 2014-06-16 12:49:05.979470653 +
@@ -15,13 +15,13 @@
#include
#include
-#include
+#include
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.0 +
+++ bibletime-2.9.2.mine/src/backend/rendering/centrydisplay.h 2014-06-16 14:28:00.972395181 +
@@ -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.0 +
+++ bibletime-2.9.2.mine/src/bibletime.cpp 2014-06-17 09:06:12.656074834 +
@@ -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.0 +
+++ bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.cpp 2014-06-17 09:55:32.442530952 +
@@ -18,7 +18,7 @@
// Sword includes:
#include
-#include
+#include
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.0 +
+++ bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.h 2014-06-17 09:53:52.314448110 +
@@ -18,7 +18,7 @@
// Sword includes:
#include
-#include
+#include
/**
signature.asc
Description: Digital signature
Bug#748685: bibletime update required
There is a new version of bibletime (2.10) which is working with libsword 1.7. I strongly recommend to update bibletime - this should fix the problem. If you have some reason not to update it, I can create a patch for 2.9. signature.asc Description: Digital signature
