summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch11
-rw-r--r--meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb3
2 files changed, 13 insertions, 1 deletions
diff --git a/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch
new file mode 100644
index 000000000..97ab4d315
--- /dev/null
+++ b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch
@@ -0,0 +1,11 @@
1--- fbreader-0.12.10/fbreader/src/database/booksdb/BooksDB.cpp.orig 2016-06-08 14:54:04.206196501 -0400
2+++ fbreader-0.12.10/fbreader/src/database/booksdb/BooksDB.cpp 2016-06-08 14:54:17.686196322 -0400
3@@ -145,7 +145,7 @@
4
5 myFindFileId->setFileName(fileName);
6 if (!myFindFileId->run()) {
7- return false;
8+ return 0;
9 }
10 ((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId();
11 shared_ptr<DBDataReader> reader = myLoadBook->executeReader();
diff --git a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
index 1487f11a2..f8ecc934d 100644
--- a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
+++ b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
@@ -10,7 +10,8 @@ PR = "r1"
10SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ 10SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
11file://Makefile.patch \ 11file://Makefile.patch \
12file://gcc45.patch \ 12file://gcc45.patch \
13file://fix-cflags-fribidi.patch" 13file://fix-cflags-fribidi.patch \
14file://fix-return-code-gcc6.patch"
14 15
15# Set the defaults 16# Set the defaults
16READER_RESOLUTION ?= "1024x600" 17READER_RESOLUTION ?= "1024x600"