Skip to contentSkip to conversation

fbreader: fix return code issue on gcc6

PATCH New Derek Straka 1 participant 1 message Jun 8, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbreader: fix return code issue on gcc6

---
 .../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
meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch new file +11 -0
new file mode 100644
index 0000000..97ab4d3
@@ -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();
meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb +2 -1
index 1487f11..f8ecc93 100644
@@ -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"
Signature · 1 line
1.9.1