CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fbreader: fix return code issue on gcc6

Browse Source 
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit baa1ab2a37)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Derek Straka 2016-06-08 15:13:50 -04:00 committed by Armin Kuster
parent 232d1943d3
commit 196d7740ea
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch Normal file
View File

@ -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();

3
meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
View File

@ -10,7 +10,8 @@ PR = "r1"
SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
file://Makefile.patch \ file://Makefile.patch \
file://gcc45.patch \ file://gcc45.patch \
file://fix-cflags-fribidi.patch" file://fix-cflags-fribidi.patch \
file://fix-return-code-gcc6.patch"
# Set the defaults # Set the defaults
READER_RESOLUTION ?= "1024x600" READER_RESOLUTION ?= "1024x600"