diff options
| author |   Derek Straka <derek@asterius.io> | 2016-06-08 15:13:50 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-15 12:13:16 +0200 |
| commit | baa1ab2a37326fd06f37d45d1135e43884df6b21 (patch) | |
| tree | ecc90ceb52d0b83e0a46e89bfd32040a4523a2b3 | |
| parent | 47e84b36863c0084e640422ea7d0e16b39ab8d99 (diff) | |
| download | meta-openembedded-contrib-baa1ab2a37326fd06f37d45d1135e43884df6b21.tar.gz | |
fbreader: fix return code issue on gcc6
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch | 11 | ||||
| -rw-r--r-- | meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb | 6 |
2 files changed, 13 insertions, 4 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 7a9de86e88..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" @@ -41,6 +42,3 @@ do_install() { SRC_URI[md5sum] = "da9ec4721efdb0ec0aaa182bff16ad82" SRC_URI[sha256sum] = "328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624" - -# http://errors.yoctoproject.org/Errors/Details/68618/ -PNBLACKLIST[fbreader] ?= "BROKEN: fails to build with gcc-6" |