aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-06-08 15:13:50 -0400
committerArmin Kuster <akuster808@gmail.com>2016-08-16 10:29:40 -0700
commit196d7740ea2b41ed9135d7abf29b4f16e37964bb (patch)
treee27cdc93f9b308bf9f0f2379ed00515d089af864
parent232d1943d3f32f2047e3df37f67bdce88d33a4e8 (diff)
downloadmeta-openembedded-contrib-196d7740ea2b41ed9135d7abf29b4f16e37964bb.tar.gz
meta-openembedded-contrib-196d7740ea2b41ed9135d7abf29b4f16e37964bb.tar.bz2
meta-openembedded-contrib-196d7740ea2b41ed9135d7abf29b4f16e37964bb.zip
fbreader: fix return code issue on gcc6
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit baa1ab2a37326fd06f37d45d1135e43884df6b21) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-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 0000000000..97ab4d315d
--- /dev/null
+++ b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch
@@ -0,0 +1,11 @@
+--- fbreader-0.12.10/fbreader/src/database/booksdb/BooksDB.cpp.orig 2016-06-08 14:54:04.206196501 -0400
++++ fbreader-0.12.10/fbreader/src/database/booksdb/BooksDB.cpp 2016-06-08 14:54:17.686196322 -0400
+@@ -145,7 +145,7 @@
+
+ myFindFileId->setFileName(fileName);
+ if (!myFindFileId->run()) {
+- return false;
++ return 0;
+ }
+ ((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId();
+ 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 1487f11a2c..f8ecc934d0 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"
SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
file://Makefile.patch \
file://gcc45.patch \
-file://fix-cflags-fribidi.patch"
+file://fix-cflags-fribidi.patch \
+file://fix-return-code-gcc6.patch"
# Set the defaults
READER_RESOLUTION ?= "1024x600"