From 196d7740ea2b41ed9135d7abf29b4f16e37964bb Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Wed, 8 Jun 2016 15:13:50 -0400 Subject: fbreader: fix return code issue on gcc6 Signed-off-by: Derek Straka Signed-off-by: Martin Jansa (cherry picked from commit baa1ab2a37326fd06f37d45d1135e43884df6b21) Signed-off-by: Armin Kuster --- .../fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch | 11 +++++++++++ meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch 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 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" -- cgit 1.2.3-korg