From b869f6da6847e785f589746f9ea891fd8c5cbcac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 31 Jul 2016 17:06:40 +0200 Subject: [PATCH] libe-book: fix build for annoying gcc6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../0001-make-nitpickickng-gcc6-happy.patch | 58 +++++++++++++++++++ recipes-filter/libe-book/libe-book_0.1.2.bb | 5 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 recipes-filter/libe-book/files/0001-make-nitpickickng-gcc6-happy.patch diff --git a/recipes-filter/libe-book/files/0001-make-nitpickickng-gcc6-happy.patch b/recipes-filter/libe-book/files/0001-make-nitpickickng-gcc6-happy.patch new file mode 100644 index 0000000..9f6762b --- /dev/null +++ b/recipes-filter/libe-book/files/0001-make-nitpickickng-gcc6-happy.patch @@ -0,0 +1,58 @@ +From f443422e9f039b809bd4fcde21704b9d6503edfa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 31 Jul 2016 12:57:24 +0200 +Subject: [PATCH] make nitpickickng gcc6 happy +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upsatream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/lib/FB2Parser.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp +index 6442c70..1450087 100644 +--- a/src/lib/FB2Parser.cpp ++++ b/src/lib/FB2Parser.cpp +@@ -103,7 +103,7 @@ private: + bool m_firstBody; + }; + +-class StylesheetContext : public FB2NodeContextBase ++/*class StylesheetContext : public FB2NodeContextBase + { + public: + explicit StylesheetContext(FB2ParserContext *parentContext); +@@ -112,7 +112,7 @@ private: + virtual FB2XMLParserContext *element(const FB2TokenData &name, const FB2TokenData &ns); + virtual void endOfElement(); + virtual void attribute(const FB2TokenData &name, const FB2TokenData *ns, const char *value); +-}; ++};*/ + + } + +@@ -216,7 +216,7 @@ void FictionBookGathererContext::attribute(const FB2TokenData &, const FB2TokenD + { + } + +-StylesheetContext::StylesheetContext(FB2ParserContext *const parentContext) ++/*StylesheetContext::StylesheetContext(FB2ParserContext *const parentContext) + : FB2NodeContextBase(parentContext) + { + } +@@ -253,7 +253,7 @@ void StylesheetContext::attribute(const FB2TokenData &name, const FB2TokenData * + break; + } + } +-} ++}*/ + + DocumentContext::DocumentContext(FB2ContentMap ¬es, FB2ContentMap &bitmaps, librevenge::RVNGTextInterface *const document) + : FB2ParserContext(0) +-- +2.5.5 + diff --git a/recipes-filter/libe-book/libe-book_0.1.2.bb b/recipes-filter/libe-book/libe-book_0.1.2.bb index cc9de7f..e9d9a72 100644 --- a/recipes-filter/libe-book/libe-book_0.1.2.bb +++ b/recipes-filter/libe-book/libe-book_0.1.2.bb @@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \ " -SRC_URI = "${SOURCEFORGE_MIRROR}/project/libebook/${BPN}-${PV}/${BPN}-${PV}.tar.xz" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/libebook/${BPN}-${PV}/${BPN}-${PV}.tar.xz \ + file://0001-make-nitpickickng-gcc6-happy.patch \ +" SRC_URI[md5sum] = "19d84f4a97aab32d350d1f47ea3da0b3" SRC_URI[sha256sum] = "7f894b1538b71c6cd96c976069c4dadb38b623612f0e35b2f6ee8a2c46bb88ec"