libreoffice: fix unoconv installation

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

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?= <schnitzeltony@googlemail.com>
+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 <schnitzeltony@googlemail.com>
+---
+ 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 &notes, FB2ContentMap &bitmaps, librevenge::RVNGTextInterface *const document)
+   : FB2ParserContext(0)
+-- 
+2.5.5
+

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"
 

recipes-filter/libetonyek/libetonyek_0.1.5.bb

@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
 "
 SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "8a2c7de34b5c02f4a75ba086bc5af57b"
-SRC_URI[sha256sum] = "fe12276a62bd5f5ca4f5bfbd4938a74d097084e1f9fe173e521f63203f56f055"
+SRC_URI[md5sum] = "b37e09b5e3f0b5b05af2b549f7fde8a1"
+SRC_URI[sha256sum] = "29f8097f77a193511e940f7a70dfc6ac7fad57fbfc6e60b81fa1ee011daea903"
 
 inherit autotools pkgconfig
 
-DEPENDS = "glm mdds icu lcms libxml2 librevenge"
+DEPENDS = "glm mdds-1 icu lcms libxml2 librevenge"
 
 BBCLASSEXTEND = "native"

recipes-libreoffice/libreoffice/files/0002-fix-gcc-build-error.patch

@@ -0,0 +1,44 @@
+From b9fa2963cf12e6987b3a0acc219c4fa591e41be8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 3 Feb 2016 10:30:43 +0000
+Subject: [PATCH] fix gcc build error
+
+error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type
+{aka double}' and 'int' to binary 'operator%'
+
+apparently there's a template returning double for abs for the
+non-int/long/float/double argument case. So promote earlier to int so the
+abs<int> is called
+
+Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae
+
+Upstream-Status: Backport
+---
+ sax/source/tools/converter.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
+index 744415e..cf061c9 100644
+--- a/sax/source/tools/converter.cxx
++++ b/sax/source/tools/converter.cxx
+@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
+ 
+ 
+ static void
+-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
++lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset)
+ {
+     if (0 == nOffset)
+     {
+@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear)
+ static void lcl_ConvertToUTC(
+         sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay,
+         sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes,
+-        sal_Int16 const nSourceOffset)
++        int const nSourceOffset)
+ {
+     sal_Int16 nOffsetHours(abs(nSourceOffset) / 60);
+     sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60);
+-- 
+2.7.4
+

recipes-libreoffice/libreoffice/files/0003-Werror-shift-negative-value-GCC-6.patch

@@ -0,0 +1,46 @@
+From 352f9fdff619b5a0a1414c29cfc47068165a599c Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Tue, 19 Jan 2016 10:43:21 +0100
+Subject: [PATCH] -Werror=shift-negative-value (GCC 6)
+
+Change-Id: Ifc7b1d6675a8e8fb41dd47cc1282059c3790736f
+
+Upstream-Status: Backport
+---
+ include/basebmp/packedpixeliterator.hxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx
+index 776a45e..693f59b 100644
+--- a/include/basebmp/packedpixeliterator.hxx
++++ b/include/basebmp/packedpixeliterator.hxx
+@@ -78,7 +78,7 @@ public:
+         num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
+         /** Bit mask for one pixel (least significant bits)
+          */
+-        bit_mask=~(~0 << bits_per_pixel)
++        bit_mask=~(~0u << bits_per_pixel)
+     };
+ 
+ private:
+@@ -238,7 +238,7 @@ public:
+         num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
+         /** Bit mask for one pixel (least significant bits)
+          */
+-        bit_mask=~(~0 << bits_per_pixel)
++        bit_mask=~(~0u << bits_per_pixel)
+     };
+ 
+ private:
+@@ -477,7 +477,7 @@ public:
+         num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
+         /** Bit mask for one pixel (least significant bits)
+          */
+-        bit_mask=~(~0 << bits_per_pixel)
++        bit_mask=~(~0u << bits_per_pixel)
+     };
+ 
+     // TODO(F2): direction of iteration (ImageIterator can be made to
+-- 
+2.7.4
+

recipes-libreoffice/libreoffice/libreoffice-native.bb

@@ -121,6 +121,7 @@ do_compile() {
     BUILDDIR=${B} oe_runmake Library_configmgr
     BUILDDIR=${B} oe_runmake Library_fwk
     BUILDDIR=${B} oe_runmake Library_i18npool
+    BUILDDIR=${B} oe_runmake Library_pyuno
 
     # BUILDDIR=${B} oe_runmake Module_external
 }
@@ -171,4 +172,8 @@ do_install() {
     # gengal script and binary to expected location
     install ${S}/svx/source/gengal/gengal.sh ${D}/${bindir}/gengal
     mv ${D}/${libdir}/gengal.bin ${D}/${bindir}
+
+    # unoconv
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/git/unoconv/unoconv ${D}/${bindir}
 }

recipes-libreoffice/libreoffice/libreoffice.bb

@@ -191,6 +191,10 @@ do_configure() {
 
 do_install() {
     make DESTDIR=${D} distro-pack-install
+
+    # unoconv
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/git/unoconv/unoconv ${D}/${bindir}
 }
 
 

recipes-libreoffice/libreoffice/libreoffice.inc

@@ -9,8 +9,12 @@ LIC_FILES_CHKSUM = " \
 require libreoffice-version.inc
 
 SRC_URI += " \
+    git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
     file://0001-update-ax_boost-scripts-to-fix-configure-with-system.patch \
+    file://0002-fix-gcc-build-error.patch \
+    file://0003-Werror-shift-negative-value-GCC-6.patch \
 "
+SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
 
 inherit autotools-brokensep pkgconfig distutils-base perlnative