libreoffice: fix unoconv installation

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
libreoffice(-native): add unoconv
2016-11-08 12:06:19 +01:00 · 2016-11-08 11:38:07 +01:00 · 2016-08-25 12:38:55 +02:00 · 2016-08-25 10:25:04 +02:00 · 2016-08-24 17:18:09 +02:00 · 2016-08-24 13:06:37 +02:00
54 changed files with 290 additions and 1799 deletions
--- a/2
+++ b/2
@@ -12,4 +12,4 @@ Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-offi

 When sending single patches, please using something like 'git send-email -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-office][PATCH'

-Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
+Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com>
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -6,5 +6,3 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "office-layer"
 BBFILE_PATTERN_office-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_office-layer = "7"
-LAYERSERIES_COMPAT_office-layer = "sumo thud"
-
--- a/recipes-devtools/archive-zip/archive-zip_1.31.bb
+++ b/recipes-devtools/archive-zip/archive-zip_1.31.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "ede64f6c8ecad7360fe5d8b20379f8a09afe7e7ba5f39fa10e933e7985

 inherit cpan

-DEPENDS += "zlib"
+DEPENDS = "zlib"

 S = "${WORKDIR}/Archive-Zip-${PV}_${PATCHREV}"

--- a/recipes-filter/libabw/libabw_0.1.1.bb
+++ b/recipes-filter/libabw/libabw_0.1.1.bb
@@ -6,15 +6,11 @@ LIC_FILES_CHKSUM = " \
 "

 SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "201f477df7ea90d362c389c145c0f352"
-SRC_URI[sha256sum] = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"
+SRC_URI[md5sum] = "6be55a46078b593ec20cad9bb8730c3e"
+SRC_URI[sha256sum] = "cfc698c2dd4ab592138a941ae26e2e18c3dac69bc196b5167df7f5eb88fc217e"

 inherit autotools pkgconfig

-DEPENDS = " \
-    gperf-native \
-    libxml2 \
-    librevenge \
-"
+DEPENDS = "libxml2 librevenge"

 BBCLASSEXTEND = "native"
--- a/recipes-filter/libcdr/libcdr_0.1.1.bb
+++ b/recipes-filter/libcdr/libcdr_0.1.1.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "

-SRC_URI = "http://dev-www.libreoffice.org/src/libcdr/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "4e52342983d798ae584e26bdf7a5f18a"
-SRC_URI[sha256sum] = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "b33fd0be3befdd1b37777e08ce058bd9"
+SRC_URI[sha256sum] = "72fe7bbbf2275242acdf67ad2f9b6c71ac9146a56c409def360dabcac5695b49"

 inherit autotools pkgconfig

--- a/recipes-filter/libe-book/files/0001-make-nitpickickng-gcc6-happy.patch
+++ 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?= <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
+
--- a/recipes-filter/libe-book/libe-book_0.1.2.bb
+++ b/recipes-filter/libe-book/libe-book_0.1.2.bb
@@ -0,0 +1,19 @@
+SUMMARY = "A library for import of reflowable e-book formats"
+HOMEPAGE = "http://sourceforge.net/projects/libebook"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
+"
+
+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"
+
+inherit autotools pkgconfig
+
+DEPENDS = "icu libxml2 librevenge boost-native"
+
+BBCLASSEXTEND = "native"
--- a/recipes-filter/libe-book/libe-book_0.1.3.bb
+++ b/recipes-filter/libe-book/libe-book_0.1.3.bb
@@ -1,16 +0,0 @@
-SUMMARY = "A library for import of reflowable e-book formats"
-HOMEPAGE = "http://sourceforge.net/projects/libebook"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
-"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/libebook/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "2956f1c5e7950b0018979a132165da8b"
-SRC_URI[sha256sum] = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"
-
-inherit autotools pkgconfig
-
-DEPENDS = "icu libxml2 librevenge liblangtag boost-native gperf-native"
-
-BBCLASSEXTEND = "native"
--- a/recipes-filter/libetonyek/libetonyek_0.1.5.bb
+++ b/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] = "3088732de0028b1340668b8a3caf3c25"
-SRC_URI[sha256sum] = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"
+SRC_URI[md5sum] = "b37e09b5e3f0b5b05af2b549f7fde8a1"
+SRC_URI[sha256sum] = "29f8097f77a193511e940f7a70dfc6ac7fad57fbfc6e60b81fa1ee011daea903"

 inherit autotools pkgconfig

-DEPENDS = "glm mdds icu lcms libxml2 librevenge liblangtag mdds-1"
+DEPENDS = "glm mdds-1 icu lcms libxml2 librevenge"

 BBCLASSEXTEND = "native"
--- a/recipes-filter/libfreehand/files/0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch
+++ b/recipes-filter/libfreehand/files/0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch
@@ -1,32 +0,0 @@
-From af65e7374d6d5058e46b9173efdedfc661f451b7 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 1 Feb 2018 13:05:51 +0100
-Subject: [PATCH] =?UTF-8?q?WaE:=20unnecessary=20parentheses=20in=20declara?=
- =?UTF-8?q?tion=20of=20=E2=80=98padding=E2=80=99?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport
-
-Change-Id: I6de141c5ec2520538f8232bd524d29e25710bef5
---
- src/lib/FHCollector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/FHCollector.cpp b/src/lib/FHCollector.cpp
-index f39c8df..3f24118 100644
--- a/src/lib/FHCollector.cpp
-+++ b/src/lib/FHCollector.cpp
-@@ -1907,7 +1907,7 @@ void libfreehand::FHCollector::_outputDisplayText(const libfreehand::FHDisplayTe
-   textObjectProps.insert("svg:width", width);
-   for (int i=0; i<4; ++i) // osnola: let assume that there is no padding
-   {
-    char const *(padding[])= {"fo:padding-left","fo:padding-right","fo:padding-top","fo:padding-bottom"};
-+    char const *padding[] = {"fo:padding-left","fo:padding-right","fo:padding-top","fo:padding-bottom"};
-     textObjectProps.insert(padding[i],0,librevenge::RVNG_POINT);
-   }
-   if (!FH_ALMOST_ZERO(rotation))
-- 
-2.14.4
-
--- a/recipes-filter/libfreehand/libfreehand_0.1.1.bb
+++ b/recipes-filter/libfreehand/libfreehand_0.1.1.bb
@@ -0,0 +1,15 @@
+SUMMARY = "A library for import of Macromedia/Adobe FreeHand documents"
+HOMEPAGE = "http://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
+"
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "97eb6a8607de3c101ad05ceacc122107"
+SRC_URI[sha256sum] = "ec6676d0c63f7feac7801a1fe18dd7abe9044b39c3882fc99b9afef39bdf1d30"
+
+inherit autotools pkgconfig
+
+DEPENDS = "icu lcms librevenge"
+
+BBCLASSEXTEND = "native"
--- a/recipes-filter/libfreehand/libfreehand_0.1.2.bb
+++ b/recipes-filter/libfreehand/libfreehand_0.1.2.bb
@@ -1,18 +0,0 @@
-SUMMARY = "A library for import of Macromedia/Adobe FreeHand documents"
-HOMEPAGE = "http://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
-"
-SRC_URI = " \
-    http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
-    file://0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch \
-"
-SRC_URI[md5sum] = "c3788f5686839fd097bd77d8f51c3d04"
-SRC_URI[sha256sum] = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"
-
-inherit autotools pkgconfig
-
-DEPENDS = "icu lcms librevenge gperf-native"
-
-BBCLASSEXTEND = "native"
--- a/recipes-filter/libgltf/libgltf_0.0.2.bb
+++ b/recipes-filter/libgltf/libgltf_0.0.2.bb
@@ -4,8 +4,6 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=9741c346eef56131163e13b9db1241b3 \
 "
-# Note there is a later version (0.1.0 currently) available but libreoffice
-# asks for 0.0 explicitly
 SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "d63a9f47ab048f5009d90693d6aa6424"
 SRC_URI[sha256sum] = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"
--- a/recipes-filter/libmspub/libmspub_0.1.2.bb
+++ b/recipes-filter/libmspub/libmspub_0.1.2.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "
 SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "ac6fa9c1c05ece27c58c05e11786fd3a"
-SRC_URI[sha256sum] = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"
+SRC_URI[md5sum] = "050b8b29c2620fdbfb5d8561d4d08a11"
+SRC_URI[sha256sum] = "b0baabf82d20c08ad000e80fa02154ce2f2ffde1ee60240d6e3a917c3b35560f"

 inherit autotools pkgconfig

--- a/recipes-filter/libmwaw/libmwaw_0.3.14.bb
+++ b/recipes-filter/libmwaw/libmwaw_0.3.14.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = " \
 "

 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "271c52cad27c92a02b0088c7d2d980db"
-SRC_URI[sha256sum] = "9cf4b16ef1abf56ba5b9e2c7180c4901c34604c0160a36b6969a578ded8cbfa7"
+SRC_URI[md5sum] = "a8364bf2e4ece2860ab96d6bee75f1d7"
+SRC_URI[sha256sum] = "fb3fcac71eefe4d80ea76c08d259109bb020836cbd9f8d73f06daed1801a637c"

-inherit autotools-brokensep pkgconfig
+inherit autotools pkgconfig

 DEPENDS = "librevenge"
--- a/recipes-filter/libodfgen/libodfgen_0.1.5.bb
+++ b/recipes-filter/libodfgen/libodfgen_0.1.5.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
 "

 SRC_URI = "${SOURCEFORGE_MIRROR}/project/libwpd/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "ec7ce6c69aac83f8a9e6280d919b3cad"
-SRC_URI[sha256sum] = "323e491f956c8ca2abb12c998e350670930a32317bf9662b0615dd4b3922b831"
+SRC_URI[md5sum] = "e0a76e8fb84a3aceb70bdb733c7431ac"
+SRC_URI[sha256sum] = "fb8706e38f6acf019f8b50262af2bf850821c6d10dad8708f13e54f1a08294dd"

 inherit autotools pkgconfig perlnative

--- a/recipes-filter/libpagemaker/files/0001-Workaround-build-error-with-gcc8.patch
+++ b/recipes-filter/libpagemaker/files/0001-Workaround-build-error-with-gcc8.patch
@@ -1,43 +0,0 @@
-From e3f451d4340acef6872126eec84ec557ed9d21bd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 2 Jul 2018 15:59:24 +0200
-Subject: [PATCH] Workaround build error with gcc8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/lib/PMDParser.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/lib/PMDParser.cpp b/src/lib/PMDParser.cpp
-index 481f6bf..50c3033 100644
--- a/src/lib/PMDParser.cpp
-+++ b/src/lib/PMDParser.cpp
-@@ -846,6 +846,10 @@ void PMDParser::parseHeader(uint32_t *tocOffset, uint16_t *tocLength)
-   {
-     throw PMDParseException("Endianness marker is corrupt in PMD header.");
-   }
-+#if __GNUC__ > 7   
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wcatch-value"
-+#endif
-   try
-   {
-     seek(m_input, TABLE_OF_CONTENTS_LENGTH_OFFSET);
-@@ -866,6 +868,9 @@ void PMDParser::parseHeader(uint32_t *tocOffset, uint16_t *tocLength)
-   {
-     throw PMDParseException("Can't find the table of contents offset in the header.");
-   }
-+#if __GNUC__ > 7   
-+#pragma GCC diagnostic pop
-+#endif
- }
- 
- void PMDParser::readNextRecordFromTableOfContents(ToCState &state, const bool subRecord, const uint16_t subRecordType)
-- 
-2.14.4
-
--- a/recipes-filter/libpagemaker/libpagemaker_0.0.2.bb
+++ b/recipes-filter/libpagemaker/libpagemaker_0.0.2.bb
@@ -4,12 +4,9 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
 "
-SRC_URI = " \
-    http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
-    file://0001-Workaround-build-error-with-gcc8.patch \
-"
-SRC_URI[md5sum] = "8395dfc5eef11c58d5a9efe3bfe64831"
-SRC_URI[sha256sum] = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "1e6fec3e30f4f47c4c2619ee232dec04"
+SRC_URI[sha256sum] = "cdbdf86605773339caab6477ff694a95a90aaa4d45bb6cdb59e4a7f76c91ef17"

 inherit autotools pkgconfig

--- a/recipes-filter/libvisio/libvisio_0.1.3.bb
+++ b/recipes-filter/libvisio/libvisio_0.1.3.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "
 SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "b60b7f4233105261eb139d82cbf3b33a"
-SRC_URI[sha256sum] = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"
+SRC_URI[md5sum] = "fda521a18bbfccc5f034ea02119e7998"
+SRC_URI[sha256sum] = "943e03b1e6c969af4c2133a6671c9630adf3aaf8d460156744a28f58c9f47cd8"

 inherit autotools pkgconfig

--- a/recipes-filter/libwpd/libwpd_0.10.0.bb
+++ b/recipes-filter/libwpd/libwpd_0.10.0.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "

-SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "50d575509d68c940e566c4a0581cd61a"
-SRC_URI[sha256sum] = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610"
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "0773d79a1f240ef9f4f20242b13c5bb7"
+SRC_URI[sha256sum] = "f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91"

 inherit autotools pkgconfig perlnative

--- a/recipes-filter/libwpg/libwpg_0.3.0.bb
+++ b/recipes-filter/libwpg/libwpg_0.3.0.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "

-SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "9bd45e72071897367b5b3ba2854fa36f"
-SRC_URI[sha256sum] = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33"
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "17da9770cb8b317b7633f9807b32b71a"
+SRC_URI[sha256sum] = "28fc3580228a82948dfc01d07abd5076c8b0df76a68702c1a81eb88fdf377348"

 inherit autotools pkgconfig

--- a/recipes-filter/libwps/libwps_0.4.2.bb
+++ b/recipes-filter/libwps/libwps_0.4.2.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Import filter library for MS Works"
+HOMEPAGE = "https://sourceforge.net/projects/libwps/"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = " \
+    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
+"
+
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "8a6c55542ce80203dd6d3b1cba99d4e5"
+SRC_URI[sha256sum] = "254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587"
+
+inherit autotools pkgconfig
+
+DEPENDS = "librevenge"
--- a/recipes-filter/libwps/libwps_0.4.9.bb
+++ b/recipes-filter/libwps/libwps_0.4.9.bb
@@ -1,14 +0,0 @@
-SUMMARY = "Import filter library for MS Works"
-HOMEPAGE = "https://sourceforge.net/projects/libwps/"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
-"
-
-SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "b49670696446f4e11cafa49ec566d54c"
-SRC_URI[sha256sum] = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922"
-
-inherit autotools-brokensep pkgconfig
-
-DEPENDS = "librevenge"
--- a/recipes-libreoffice/libreoffice/files/0003-Werror-shift-negative-value-GCC-6.patch
+++ b/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
+
--- a/recipes-libreoffice/libreoffice/files/0003-upgrade-to-ICU-58.patch
+++ b/recipes-libreoffice/libreoffice/files/0003-upgrade-to-ICU-58.patch
@@ -1,246 +0,0 @@
-From 3e42714c76b1347babfdea0564009d8d82a83af4 Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack@redhat.com>
-Date: Wed, 2 Nov 2016 13:07:48 +0100
-Subject: [PATCH] upgrade to ICU 58
-
-Change-Id: I4a992447df65b337721a2a2627d974172a14cba5
-Reviewed-on: https://gerrit.libreoffice.org/30487
-Reviewed-by: Eike Rathke <erack@redhat.com>
-Tested-by: Eike Rathke <erack@redhat.com>
-
-Upstream-Status: Backport
---
- configure.ac                                       |  2 +-
- .../source/breakiterator/breakiterator_unicode.cxx | 12 ++++++
- i18nutil/source/utility/unicode.cxx                | 26 +++++++++++++
- include/svx/ucsubset.hrc                           | 11 ++++++
- svx/source/dialog/charmap.cxx                      | 35 +++++++++++++++++
- svx/source/dialog/ucsubset.src                     | 44 ++++++++++++++++++++++
- 9 files changed, 130 insertions(+), 25 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f06ef8e..66a11a9 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK=
- SYSTEM_GENCCODE=
- SYSTEM_GENCMN=
- 
-ICU_MAJOR=54
-+ICU_MAJOR=58
- ICU_MINOR=1
- ICU_RECLASSIFIED_CLOSE_PARENTHESIS="TRUE"
- ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
-diff --git a/download.lst b/download.lst
-index 4571338..0770a4d 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
-+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
-@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
- class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
- {
-     public:
-+#if (U_ICU_VERSION_MAJOR_NUM < 58)
-+    // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
-     inline void publicSetBreakType(int32_t type)
-         {
-             setBreakType(type);
-         };
-+#endif
-     OOoRuleBasedBreakIterator(UDataMemory* image,
-                               UErrorCode &status)
-         : RuleBasedBreakIterator(image, status)
-@@ -142,12 +145,21 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
-                 }
-             }
-             if (rbi) {
-+#if (U_ICU_VERSION_MAJOR_NUM < 58)
-+                // ICU 58 made RuleBasedBreakIterator::setBreakType() private
-+                // instead of protected, so the old workaround of
-+                // https://ssl.icu-project.org/trac/ticket/5498
-+                // doesn't work anymore. However, they also claim to have fixed
-+                // the cause that an initial fBreakType==-1 would lead to an
-+                // endless loop under some circumstances.
-+                // Let's see ...
-                 switch (rBreakType) {
-                     case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break;
-                     case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break;
-                     case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break;
-                     case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break;
-                 }
-+#endif
-                 icuBI->aBreakIterator = rbi;
-             }
-         }
-diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
-index bb82bbf..984c5f7 100644
--- a/i18nutil/source/utility/unicode.cxx
-+++ b/i18nutil/source/utility/unicode.cxx
-@@ -957,6 +957,32 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
-             sRet = "sa-Sidd";
-             break;
- #endif
-+#if (U_ICU_VERSION_MAJOR_NUM >= 58)
-+        case USCRIPT_ADLAM:
-+            sRet = "mis";   // Adlm - Adlam for Fulani, no language code
-+            break;
-+        case USCRIPT_BHAIKSUKI:
-+            sRet = "mis";   // Bhks - Bhaiksuki for some Buddhist texts, no language code
-+            break;
-+        case USCRIPT_MARCHEN:
-+            sRet = "bo-Marc";
-+            break;
-+        case USCRIPT_NEWA:
-+            sRet = "new-Newa";
-+            break;
-+        case USCRIPT_OSAGE:
-+            sRet = "osa-Osge";
-+            break;
-+        case USCRIPT_HAN_WITH_BOPOMOFO:
-+            sRet = "mis";   // Hanb - Han with Bopomofo, zh-Hanb ?
-+            break;
-+        case USCRIPT_JAMO:
-+            sRet = "mis";   // Jamo - Jamo subset of Hangul, ko-Jamo ?
-+            break;
-+        case USCRIPT_SYMBOLS_EMOJI:
-+            sRet = "mis";   // Zsye - Emoji variant
-+            break;
-+#endif
-     }
-     return sRet;
- }
-diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
-index adf1cf6..1157a7e 100644
--- a/include/svx/ucsubset.hrc
-+++ b/include/svx/ucsubset.hrc
-@@ -281,6 +281,27 @@
- #define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C     (RID_SUBSET_START + 253)
- #define RID_SUBSETSTR_TIRHUTA                   (RID_SUBSET_START + 254)
- #define RID_SUBSETSTR_WARANG_CITI               (RID_SUBSET_START + 255)
-+#define RID_SUBSETSTR_AHOM                      (RID_SUBSET_START + 256)
-+#define RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS     (RID_SUBSET_START + 257)
-+#define RID_SUBSETSTR_CHEROKEE_SUPPLEMENT       (RID_SUBSET_START + 258)
-+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E    (RID_SUBSET_START + 259)
-+#define RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM  (RID_SUBSET_START + 260)
-+#define RID_SUBSETSTR_HATRAN                    (RID_SUBSET_START + 261)
-+#define RID_SUBSETSTR_MULTANI                   (RID_SUBSET_START + 262)
-+#define RID_SUBSETSTR_OLD_HUNGARIAN             (RID_SUBSET_START + 263)
-+#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS  (RID_SUBSET_START + 264)
-+#define RID_SUBSETSTR_SUTTON_SIGNWRITING        (RID_SUBSET_START + 265)
-+#define RID_SUBSETSTR_ADLAM                     (RID_SUBSET_START + 266)
-+#define RID_SUBSETSTR_BHAIKSUKI                 (RID_SUBSET_START + 267)
-+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C       (RID_SUBSET_START + 268)
-+#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT     (RID_SUBSET_START + 269)
-+#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION   (RID_SUBSET_START + 270)
-+#define RID_SUBSETSTR_MARCHEN                   (RID_SUBSET_START + 271)
-+#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT      (RID_SUBSET_START + 272)
-+#define RID_SUBSETSTR_NEWA                      (RID_SUBSET_START + 273)
-+#define RID_SUBSETSTR_OSAGE                     (RID_SUBSET_START + 274)
-+#define RID_SUBSETSTR_TANGUT                    (RID_SUBSET_START + 275)
-+#define RID_SUBSETSTR_TANGUT_COMPONENTS         (RID_SUBSET_START + 276)
- 
- //      RID_SUBSET_END                          (RID_SUBSET_START + 299)
- 
-diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
-index bcc7cef..ff201a6 100644
--- a/svx/source/dialog/charmap.cxx
-+++ b/svx/source/dialog/charmap.cxx
-@@ -1594,6 +1594,41 @@ void SubsetMap::InitList()
-                 case UBLOCK_SUTTON_SIGNWRITING:
-                     break;
- #endif
-+#if (U_ICU_VERSION_MAJOR_NUM >= 58)
-+                case UBLOCK_ADLAM:
-+                    aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, RID_SUBSETSTR_ADLAM ) );
-+                    break;
-+                case UBLOCK_BHAIKSUKI:
-+                    aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, RID_SUBSETSTR_BHAIKSUKI ) );
-+                    break;
-+                case UBLOCK_CYRILLIC_EXTENDED_C:
-+                    aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, RID_SUBSETSTR_CYRILLIC_EXTENDED_C ) );
-+                    break;
-+                case UBLOCK_GLAGOLITIC_SUPPLEMENT:
-+                    aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ) );
-+                    break;
-+                case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION:
-+                    aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ) );
-+                    break;
-+                case UBLOCK_MARCHEN:
-+                    aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, RID_SUBSETSTR_MARCHEN ) );
-+                    break;
-+                case UBLOCK_MONGOLIAN_SUPPLEMENT:
-+                    aAllSubsets.push_back( Subset( 0x11660, 0x1167F, RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ) );
-+                    break;
-+                case UBLOCK_NEWA:
-+                    aAllSubsets.push_back( Subset( 0x11400, 0x1147F, RID_SUBSETSTR_NEWA ) );
-+                    break;
-+                case UBLOCK_OSAGE:
-+                    aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, RID_SUBSETSTR_OSAGE ) );
-+                    break;
-+                case UBLOCK_TANGUT:
-+                    aAllSubsets.push_back( Subset( 0x17000, 0x187FF, RID_SUBSETSTR_TANGUT ) );
-+                    break;
-+                case UBLOCK_TANGUT_COMPONENTS:
-+                    aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, RID_SUBSETSTR_TANGUT_COMPONENTS ) );
-+                    break;
-+#endif
- 
-             }
- 
-diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
-index 06630cc..a7765c3 100644
--- a/svx/source/dialog/ucsubset.src
-+++ b/svx/source/dialog/ucsubset.src
-@@ -1079,6 +1079,50 @@ Resource RID_SUBSETMAP
-     {
-         Text [ en-US ] = "Warang Citi";
-     };
-+    String RID_SUBSETSTR_ADLAM
-+    {
-+        Text [ en-US ] = "Adlam";
-+    };
-+    String RID_SUBSETSTR_BHAIKSUKI
-+    {
-+        Text [ en-US ] = "Bhaiksuki";
-+    };
-+    String RID_SUBSETSTR_CYRILLIC_EXTENDED_C
-+    {
-+        Text [ en-US ] = "Cyrillic Extended-C";
-+    };
-+    String RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT
-+    {
-+        Text [ en-US ] = "Glagolitic Supplement";
-+    };
-+    String RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION
-+    {
-+        Text [ en-US ] = "Ideographic Symbols and Punctuation";
-+    };
-+    String RID_SUBSETSTR_MARCHEN
-+    {
-+        Text [ en-US ] = "Marchen";
-+    };
-+    String RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT
-+    {
-+        Text [ en-US ] = "Mongolian Supplement";
-+    };
-+    String RID_SUBSETSTR_NEWA
-+    {
-+        Text [ en-US ] = "Newa";
-+    };
-+    String RID_SUBSETSTR_OSAGE
-+    {
-+        Text [ en-US ] = "Osage";
-+    };
-+    String RID_SUBSETSTR_TANGUT
-+    {
-+        Text [ en-US ] = "Tangut";
-+    };
-+    String RID_SUBSETSTR_TANGUT_COMPONENTS
-+    {
-+        Text [ en-US ] = "Tangut Components";
-+    };
- };
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
-2.7.4
-
--- a/recipes-libreoffice/libreoffice/files/0004-remove-dictmgr.hxx-to-be-compatible-with-later-hunsp.patch
+++ b/recipes-libreoffice/libreoffice/files/0004-remove-dictmgr.hxx-to-be-compatible-with-later-hunsp.patch
@@ -1,32 +0,0 @@
-From 42cc1bf76716940ea381efc6e18fd087df63c2c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sat, 15 Apr 2017 11:23:40 +0200
-Subject: [PATCH] remove dictmgr.hxx to be compatible with later hunspell
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport [1]
-
-https://github.com/LibreOffice/core/commit/072b32442e3f6f220936a93ad1fcbde57746b747
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- lingucomponent/source/spellcheck/spell/sspellimp.cxx | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
-index 706f8b7..73d124c 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
-+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
-@@ -29,7 +29,6 @@
- 
- #include <lingutil.hxx>
- #include <hunspell.hxx>
-#include <dictmgr.hxx>
- #include <sspellimp.hxx>
- 
- #include <linguistic/lngprops.hxx>
-- 
-2.9.3
-
--- a/recipes-libreoffice/libreoffice/files/0005-packedpixeliterator.hxx-fix-typo-detected-by-gcc7.patch
+++ b/recipes-libreoffice/libreoffice/files/0005-packedpixeliterator.hxx-fix-typo-detected-by-gcc7.patch
@@ -1,29 +0,0 @@
-From 3ca26ac9c7d3ff28e7687215115fa832f43ca06a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 6 Jul 2017 14:58:15 +0200
-Subject: [PATCH] packedpixeliterator.hxx: fix typo detected by gcc7
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- include/basebmp/packedpixeliterator.hxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx
-index 1b99bf9..d3d9ad2 100644
--- a/include/basebmp/packedpixeliterator.hxx
-+++ b/include/basebmp/packedpixeliterator.hxx
-@@ -603,7 +603,7 @@ public:
- 
-     value_type get(difference_type const & d) const
-     {
-        const int remainder( x(d.x) % num_intraword_positions );
-+        const int remainder( (x + d.x) % num_intraword_positions );
- 
-         return (unsigned_cast<value_type>(*current(d.x,d.y) &
-                                           get_mask<value_type, bits_per_pixel, MsbFirst>(remainder))
-- 
-2.9.4
-
--- a/recipes-libreoffice/libreoffice/files/0006-Fix-build-with-recent-icu.patch
+++ b/recipes-libreoffice/libreoffice/files/0006-Fix-build-with-recent-icu.patch
@@ -1,278 +0,0 @@
-From 99dd8e29764156b0d7ac53044f393efd8b6555ee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 8 Jun 2018 15:10:50 +0200
-Subject: [PATCH] Fix build with recent icu
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Change-Id: I0ce2494a3994155ad0949a17aa71da51891200a7
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- basegfx/source/range/b2drangeclipper.cxx             |  1 +
- i18npool/inc/collator_unicode.hxx                    |  2 +-
- .../source/breakiterator/breakiterator_unicode.cxx   | 20 ++++++++++----------
- i18npool/source/collator/collator_unicode.cxx        | 14 +++++++-------
- i18npool/source/collator/gencoll_rule.cxx            |  2 +-
- i18npool/source/ordinalsuffix/ordinalsuffix.cxx      |  2 +-
- i18nutil/source/utility/unicode.cxx                  |  6 +++---
- vcl/generic/glyphs/scrptrun.h                        |  2 +-
- opencl/source/openclconfig.cxx                       | 2 +-
- lotuswordpro/source/filter/localtime.cxx             | 2 +-
- 10 files changed, 27 insertions(+), 24 deletions(-)
-
-diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
-index edbb128..ceb9e11 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
-+++ b/basegfx/source/range/b2drangeclipper.cxx
-@@ -31,6 +31,7 @@
- #include <o3tl/vector_pool.hxx>
- #include <boost/bind.hpp>
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- 
- #include <algorithm>
- #include <deque>
-diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
-index 951de9c..c12213a 100644
--- a/i18npool/inc/collator_unicode.hxx
-+++ b/i18npool/inc/collator_unicode.hxx
-@@ -69,7 +69,7 @@ public:
- protected:
-     const sal_Char *implementationName;
- private:
-    RuleBasedCollator *uca_base, *collator;
-+    icu::RuleBasedCollator *uca_base, *collator;
- #ifndef DISABLE_DYNLOADING
-     oslModule hModule;
- #endif
-diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
-index c68b860..6b10960 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
-+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
-@@ -61,7 +61,7 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
-     Wrapper class to provide public access to the RuleBasedBreakIterator's
-     setbreakType method.
- */
-class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
-+class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator
- {
-     public:
- #if (U_ICU_VERSION_MAJOR_NUM < 58)
-@@ -224,7 +224,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
-         loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
-         for (nDone = 0; nDone < nCount; nDone++) {
-             nStartPos = character.aBreakIterator->following(nStartPos);
-            if (nStartPos == BreakIterator::DONE)
-+            if (nStartPos == icu::BreakIterator::DONE)
-                 return Text.getLength();
-         }
-     } else { // for CHARACTER mode
-@@ -243,7 +243,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te
-         loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
-         for (nDone = 0; nDone < nCount; nDone++) {
-             nStartPos = character.aBreakIterator->preceding(nStartPos);
-            if (nStartPos == BreakIterator::DONE)
-+            if (nStartPos == icu::BreakIterator::DONE)
-                 return 0;
-         }
-     } else { // for BS to delete one char and CHARACTER mode.
-@@ -260,7 +260,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
-     loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
- 
-     result.startPos = icuBI->aBreakIterator->following(nStartPos);
-    if( result.startPos >= Text.getLength() || result.startPos == BreakIterator::DONE )
-+    if( result.startPos >= Text.getLength() || result.startPos == icu::BreakIterator::DONE )
-         result.endPos = result.startPos;
-     else {
-         if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
-@@ -269,7 +269,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
-             result.startPos = icuBI->aBreakIterator->following(result.startPos);
- 
-         result.endPos = icuBI->aBreakIterator->following(result.startPos);
-        if(result.endPos == BreakIterator::DONE)
-+        if(result.endPos == icu::BreakIterator::DONE)
-             result.endPos = result.startPos;
-     }
-     return result;
-@@ -282,7 +282,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
-     loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
- 
-     result.startPos = icuBI->aBreakIterator->preceding(nStartPos);
-    if( result.startPos < 0 || result.startPos == BreakIterator::DONE)
-+    if( result.startPos < 0 || result.startPos == icu::BreakIterator::DONE)
-         result.endPos = result.startPos;
-     else {
-         if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
-@@ -291,7 +291,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
-             result.startPos = icuBI->aBreakIterator->preceding(result.startPos);
- 
-         result.endPos = icuBI->aBreakIterator->following(result.startPos);
-        if(result.endPos == BreakIterator::DONE)
-+        if(result.endPos == icu::BreakIterator::DONE)
-             result.endPos = result.startPos;
-     }
-     return result;
-@@ -322,9 +322,9 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text,
-             result.endPos = icuBI->aBreakIterator->following(nPos);
-         }
-     }
-    if (result.startPos == BreakIterator::DONE)
-+    if (result.startPos == icu::BreakIterator::DONE)
-         result.startPos = result.endPos;
-    else if (result.endPos == BreakIterator::DONE)
-+    else if (result.endPos == icu::BreakIterator::DONE)
-         result.endPos = result.startPos;
- 
-     return result;
-@@ -388,7 +388,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
-             lbr.breakIndex = nStartPos;
-             lbr.breakType = BreakType::WORDBOUNDARY;
-         } else if (hOptions.rHyphenator.is()) { //Hyphenation break
-            sal_Int32 boundary_with_punctuation = (line.aBreakIterator->next() != BreakIterator::DONE) ? line.aBreakIterator->current() : 0;
-+            sal_Int32 boundary_with_punctuation = (line.aBreakIterator->next() != icu::BreakIterator::DONE) ? line.aBreakIterator->current() : 0;
-             line.aBreakIterator->preceding(nStartPos + 1); // reset to check correct hyphenation of "word-word"
- 
-             sal_Int32 nStartPosWordEnd = nStartPos;
-diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
-index 9ef6548..978aa04 100644
--- a/i18npool/source/collator/collator_unicode.cxx
-+++ b/i18npool/source/collator/collator_unicode.cxx
-@@ -138,7 +138,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
-         UErrorCode status = U_ZERO_ERROR;
-         OUString rule = LocaleDataImpl().getCollatorRuleByAlgorithm(rLocale, rAlgorithm);
-         if (!rule.isEmpty()) {
-            collator = new RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);   // UChar != sal_Unicode in MinGW
-+            collator = new icu::RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);   // UChar != sal_Unicode in MinGW
-             if (! U_SUCCESS(status)) throw RuntimeException();
-         }
-         if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
-@@ -355,11 +355,11 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
-                 // The default collator of the en-US locale would also fulfill
-                 // the requirement. The collator of the actual locale or the
-                 // NULL (default) locale does not.
-                uca_base = static_cast<RuleBasedCollator*>(icu::Collator::createInstance(
-+                uca_base = static_cast<icu::RuleBasedCollator*>(icu::Collator::createInstance(
-                             icu::Locale::getRoot(), status));
- #endif
-                 if (! U_SUCCESS(status)) throw RuntimeException();
-                collator = new RuleBasedCollator(
-+                collator = new icu::RuleBasedCollator(
-                         reinterpret_cast<const uint8_t*>(ruleImage), ruleImageSize, uca_base, status);
-                 if (! U_SUCCESS(status)) throw RuntimeException();
-             }
-@@ -373,17 +373,17 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
-             */
-             icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( rLocale), rAlgorithm));
-             // load ICU collator
-            collator = static_cast<RuleBasedCollator*>( icu::Collator::createInstance(icuLocale, status) );
-+            collator = static_cast<icu::RuleBasedCollator*>( icu::Collator::createInstance(icuLocale, status) );
-             if (! U_SUCCESS(status)) throw RuntimeException();
-         }
-     }
- 
-     if (options & CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT)
-        collator->setStrength(Collator::PRIMARY);
-+        collator->setStrength(icu::Collator::PRIMARY);
-     else if (options & CollatorOptions::CollatorOptions_IGNORE_CASE)
-        collator->setStrength(Collator::SECONDARY);
-+        collator->setStrength(icu::Collator::SECONDARY);
-     else
-        collator->setStrength(Collator::TERTIARY);
-+        collator->setStrength(icu::Collator::TERTIARY);
- 
-     return 0;
- }
-diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
-index 201170a..9b8c1b6 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
-+++ b/i18npool/source/collator/gencoll_rule.cxx
-@@ -112,7 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-     //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF,
-     //        UCOL_DEFAULT_STRENGTH, &parseError, &status);
- 
-    RuleBasedCollator *coll = new RuleBasedCollator(reinterpret_cast<const UChar *>(Obuf.getStr()), status);    // UChar != sal_Unicode in MinGW
-+    icu::RuleBasedCollator *coll = new icu::RuleBasedCollator(reinterpret_cast<const UChar *>(Obuf.getStr()), status);    // UChar != sal_Unicode in MinGW
- 
-     if (U_SUCCESS(status)) {
-         std::vector<uint8_t> data;
-diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
-index 17546ef..eb45ebd 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
-+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
-@@ -79,7 +79,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I
-     if (!U_SUCCESS(nCode))
-         return retValue;
- 
-    boost::scoped_ptr<NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
-+    boost::scoped_ptr<icu::NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
-     if (!U_SUCCESS(nCode))
-         return retValue;
- 
-diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
-index 6766a6b..01fae9b 100644
--- a/i18nutil/source/utility/unicode.cxx
-+++ b/i18nutil/source/utility/unicode.cxx
-@@ -1004,15 +1004,15 @@ OUString SAL_CALL unicode::formatPercent(double dNumber,
- 
-     icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
- 
-    boost::scoped_ptr<NumberFormat> xF(
-        NumberFormat::createPercentInstance(aLocale, errorCode));
-+    boost::scoped_ptr<icu::NumberFormat> xF(
-+        icu::NumberFormat::createPercentInstance(aLocale, errorCode));
-     if(U_FAILURE(errorCode))
-     {
-         SAL_WARN("i18n", "NumberFormat::createPercentInstance failed");
-         return OUString::number(dNumber) + "%";
-     }
- 
-    UnicodeString output;
-+    icu::UnicodeString output;
-     xF->format(dNumber/100, output);
-     OUString aRet(reinterpret_cast<const sal_Unicode *>(output.getBuffer()),
-         output.length());
-diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
-index 625ca7b..2b8ce0b 100644
--- a/vcl/generic/glyphs/scrptrun.h
-+++ b/vcl/generic/glyphs/scrptrun.h
-@@ -65,7 +65,7 @@ struct ParenStackEntry
-     }
- };
- 
-class ScriptRun : public UObject {
-+class ScriptRun : public icu::UObject {
- public:
-     ScriptRun();
- 
-diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
-index 688dab1..aa1f913 100644
--- a/opencl/source/openclconfig.cxx
-+++ b/opencl/source/openclconfig.cxx
-@@ -121,7 +121,7 @@ bool match(const OUString& rPattern, const OUString& rInput)
-     UErrorCode nIcuError(U_ZERO_ERROR);
-     icu::UnicodeString sIcuPattern(reinterpret_cast<const UChar*>(rPattern.getStr()), rPattern.getLength());
-     icu::UnicodeString sIcuInput(reinterpret_cast<const UChar*>(rInput.getStr()), rInput.getLength());
-    RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
-+    icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
- 
-     if (U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError))
-         return true;
-diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
-index f8af7e6..73903c8 100644
--- a/lotuswordpro/source/filter/localtime.cxx
-+++ b/lotuswordpro/source/filter/localtime.cxx
-@@ -176,7 +176,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm)
- 
-     if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC))
-     {
-        TimeZone* pLocalZone = TimeZone::createDefault();
-+        icu::TimeZone* pLocalZone = icu::TimeZone::createDefault();
-         long offset = (pLocalZone->getRawOffset())/1000;
-         delete pLocalZone;
-         long ltime = rtime + offset;
-- 
-2.14.3
-
--- a/recipes-libreoffice/libreoffice/files/0007-fix-build-with-poppler-0.64.patch
+++ b/recipes-libreoffice/libreoffice/files/0007-fix-build-with-poppler-0.64.patch
@@ -1,70 +0,0 @@
-From 42cebff14f7d486c20f04863681cc5ef4602f4eb Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Tue, 24 Apr 2018 15:56:23 +0200
-Subject: [PATCH] fix build with poppler 0.64
-
-GooString became const...
-
-Upstream-Status: Backport
-
-Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
---
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  4 ++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index b7c47d8..6a40bcc 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -453,6 +453,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
-     FontAttributes aNewFont;
-     int nSize = 0;
- 
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+    const
-+#endif
-     GooString* pFamily = gfxFont->getName();
-     if( pFamily )
-     {
-@@ -750,6 +753,9 @@ void PDFOutDev::updateFont(GfxState *state)
-         FontAttributes aFont;
-         int nEmbedSize=0;
- 
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+        const
-+#endif
-         Ref* pID = gfxFont->getID();
-         // TODO(Q3): Portability problem
-         long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
-@@ -929,7 +935,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
-     printf( "\n" );
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
-+#else
- void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
-+#endif
- {
-     // TODO(F3): NYI
- }
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index b5dd4e4..2f59bf2 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -237,7 +237,11 @@ namespace pdfi
-                               double dx, double dy,
-                               double originX, double originY,
-                               CharCode code, int nBytes, Unicode *u, int uLen) SAL_OVERRIDE;
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+        virtual void drawString(GfxState *state, const GooString *s) SAL_OVERRIDE;
-+#else
-         virtual void drawString(GfxState *state, GooString *s) SAL_OVERRIDE;
-+#endif
-         virtual void endTextObject(GfxState *state) SAL_OVERRIDE;
- 
-         //----- image drawing
-- 
-2.14.3
-
--- a/recipes-libreoffice/libreoffice/files/0008-Make-virtual-ScValidationDlg-non-inline.patch
+++ b/recipes-libreoffice/libreoffice/files/0008-Make-virtual-ScValidationDlg-non-inline.patch
@@ -1,60 +0,0 @@
-From a6a65ecdef3a577b537b5d9fccb9d41e585b9f14 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 19 Jan 2016 10:58:44 +0100
-Subject: [PATCH] Make virtual ~ScValidationDlg non-inline
-
-...otherwise, GCC 6 would aggressively inline ScValidationDlg destruction of the
-VclPtr<ScValidationDlg> in ScValidityRefChildWin::ScValidityRefChildWin
-(sc/source/ui/view/reffact.cxx, in sc library), checking whether the vtable
-points at ~ScValidationDlg (instead of a derived class dtor) to directly inline
-the ~ScValidationDlg code, which requires the ScValidateionDlg vtable (to store
-it in the object's vtable during destruction), which requires the code of inline
-virtual ScValidationDlg::dispose and ScValidationDlg::Close, which in turn need
-the addresses of (non-inline) ScValidationDlg::RemoveRefDlg and
-ScTPValidationValue::RemoveRefDlg, both defined in the scui library and not
-exported from there.
-
-Change-Id: I7eb96f42deb5edd844d91e999aa5511679302c01
-(cherry picked from commit 8d1a24dae03690b576310e3539369916f31ac475)
-Reviewed-on: https://gerrit.libreoffice.org/21637
-Reviewed-by: Eike Rathke <erack@redhat.com>
-Tested-by: Eike Rathke <erack@redhat.com>
-
-Upstream-Status: Backported
---
- sc/source/ui/dbgui/validate.cxx | 5 +++++
- sc/source/ui/inc/validate.hxx   | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
-index 459c5d731fc7..db7301280b1e 100644
--- a/sc/source/ui/dbgui/validate.cxx
-+++ b/sc/source/ui/dbgui/validate.cxx
-@@ -96,6 +96,11 @@ ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet
-     get(m_pHBox, "refinputbox");
- }
- 
-+ScValidationDlg::~ScValidationDlg()
-+{
-+    disposeOnce();
-+}
-+
- void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pDoc )
- {
-     if ( rRange.aStart != rRange.aEnd )
-diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
-index d39b99b12bac..1e785b7942de 100644
--- a/sc/source/ui/inc/validate.hxx
-+++ b/sc/source/ui/inc/validate.hxx
-@@ -182,7 +182,7 @@ class ScValidationDlg
- 
- public:
-     explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL );
-    virtual                     ~ScValidationDlg() { disposeOnce(); }
-+    virtual                     ~ScValidationDlg();
-     virtual void                dispose() SAL_OVERRIDE
-     {
-         if( m_bOwnRefHdlr )
-- 
-2.14.4
-
--- a/recipes-libreoffice/libreoffice/libreoffice-native.bb
+++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb
@@ -33,8 +33,6 @@ DEPENDS += " \
    libvisio-native \
    libexttextcat-native \
    hyphen-native \
-    unzip-native \
-    neon-native \
 "

 SRC_URI += " \
@@ -47,6 +45,8 @@ SRC_URI += " \
 "

 EXTRA_OECONF += " \
+    --enable-verbose \
+    \
    --enable-python=system \
    --without-x \
    --without-java \
@@ -78,7 +78,6 @@ EXTRA_OECONF += " \
    --with-system-libvisio \
    --with-system-libexttextcat \
    --with-system-altlinuxhyph \
-    --with-system-neon \
    \
    --without-boost-date-time \
    --without-boost-iostreams \
@@ -101,7 +100,7 @@ EXTRA_OECONF += " \
 do_configure() {
    olddir=`pwd`
    cd ${S}
-    aclocal --system-acdir=${STAGING_DATADIR_NATIVE}/aclocal/ -I ${S}/m4
+    aclocal --system-acdir=${B}/aclocal-copy/ -I ${S}/m4
    gnu-configize
    autoconf
    cd $olddir
--- a/recipes-libreoffice/libreoffice/libreoffice-version.inc
+++ b/recipes-libreoffice/libreoffice/libreoffice-version.inc
@@ -1,9 +1,9 @@
-PV = "5.0.6.3"
-DIRV = "5.0.6"
+PV = "5.0.5.2"
+DIRV = "5.0.5"

 SRC_URI += " \
    http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
 "

-SRC_URI[md5sum] = "541d92329d433696c478f7669ac976f1"
-SRC_URI[sha256sum] = "4601d778318e6221cf5b44398c54a790169ad3afb4e81aa29766bcefac0fecc7"
+SRC_URI[md5sum] = "2a04618e59a4d6b0638a3cb2b896e35e"
+SRC_URI[sha256sum] = "1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88"
--- a/recipes-libreoffice/libreoffice/libreoffice.bb
+++ b/recipes-libreoffice/libreoffice/libreoffice.bb
@@ -13,12 +13,10 @@ SRC_URI += " \
    file://0007-Package.mk-workaround-icu-missing-error-for-without-.patch \
    file://0008-configure.ac-avoid-finding-calling-pg_config.patch \
    file://0009-avoid-downloading-by-git-submodules.patch \
-    file://0010-Fix-build-with-poppler-0.62.0.patch \
-    file://0011-pdfioutdev_gpl-Fix-build-with-poppler-0.70.0.patch \
 "

-SRC_URI[translations.md5sum] = "644f33f2bc84fe9ffd8a4c09b41a36fc"
-SRC_URI[translations.sha256sum] = "0c79245cbab70e4f785dd226888ee1c3e8d359f73b345a90eebd8d1bd23c2947"
+SRC_URI[translations.md5sum] = "9698d9d5948988a8f130d909bb0675ce"
+SRC_URI[translations.sha256sum] = "67ad8bf35e55f3acb77a4fa9f1e07784a2acde72dcc9126567c833af70748b8d"

 DEPENDS += " \
    ${BPN}-native \
@@ -71,8 +69,6 @@ DEPENDS += " \
    mythes \
    hyphen \
    graphite2 \
-    liblangtag \
-    lpsolve \
 "

 # necessary to let the call for python-config succeed
@@ -151,8 +147,6 @@ EXTRA_OECONF += " \
    --with-system-mythes \
    --with-system-altlinuxhyph \
    --with-system-graphite \
-    --with-system-liblangtag \
-    --with-system-lpsolve \
 "

 PACKAGECONFIG ??= " \
@@ -166,13 +160,13 @@ PACKAGECONFIG[gtk3] = "--enable-gtk3 , --disable-gtk3, gtk+3 cairo"
 PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi"
 PACKAGECONFIG[odk] = "--enable-odk, --disable-odk"

-PACKAGECONFIG[mariadb] = "--enable-ext-mariadb-connector --with-system-mariadb, --disable-ext-mariadb-connector, mariadb"
+PACKAGECONFIG[mariadb] = "--enable-ext-mariadb-connector --enable-bundle-mariadb --with-system-mariadb, --disable-ext-mariadb-connector --disable-bundle-mariadb, mariadb"
 PACKAGECONFIG[postgresql] = "--enable-postgresql-sdbc --with-system-postgresql, --disable-postgresql-sdbc, postgresql"

 do_configure() {
    olddir=`pwd`
    cd ${S}
-    aclocal --system-acdir=${STAGING_DATADIR_NATIVE}/aclocal/ -I ${S}/m4
+    aclocal --system-acdir=${B}/aclocal-copy/ -I ${S}/m4
    gnu-configize
    autoconf
    cd $olddir
@@ -233,6 +227,7 @@ LO_LANGUAGE_FILES = " \
    ${libdir}/libreoffice/program/resource/*%{1}.res \
    ${libdir}/libreoffice/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \
    ${libdir}/libreoffice/share/config/soffice.cfg/*/ui/res/%{1}.zip \
+    ${libdir}/libreoffice/share/template/%{1} \
    ${libdir}/libreoffice/share/registry/Langpack-%{1}.xcd \
    ${libdir}/libreoffice/share/registry/res/registry_%{1}.xcd \
    ${libdir}/libreoffice/share/registry/res/fcfg_langpack_%{1}.xcd \
@@ -267,7 +262,7 @@ python lo_do_split_locales() {
    # en-US is fallback so it should be implemented everywhere (= folder created)
    langfallback = 'en-US'
    findCMD = 'find %s -name "*%s*"' % (dvar, langfallback)
-    fallbacksearchresult = subprocess.Popen(findCMD, stdout=subprocess.PIPE, shell=True, universal_newlines=True).communicate()[0]
+    fallbacksearchresult = subprocess.Popen(findCMD, stdout=subprocess.PIPE, shell=True).communicate()[0]
    # uncomment to see if we need more entries in LO_LANGUAGE_FILES
    # bb.note("fallbacksearchresult = %s" % fallbacksearchresult.replace(dvar, ''))

--- a/recipes-libreoffice/libreoffice/libreoffice.inc
+++ b/recipes-libreoffice/libreoffice/libreoffice.inc
@@ -12,30 +12,18 @@ 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-upgrade-to-ICU-58.patch \
-    file://0004-remove-dictmgr.hxx-to-be-compatible-with-later-hunsp.patch \
-    file://0005-packedpixeliterator.hxx-fix-typo-detected-by-gcc7.patch \
-    file://0006-Fix-build-with-recent-icu.patch \
-    file://0007-fix-build-with-poppler-0.64.patch \
-    file://0008-Make-virtual-ScValidationDlg-non-inline.patch \
+    file://0003-Werror-shift-negative-value-GCC-6.patch \
 "
 SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"

 inherit autotools-brokensep pkgconfig distutils-base perlnative

-DEPENDS += " \
-    python3-lxml-native \
-    ccache-native \
-    archive-zip-native \
-    gperf-native \
-    bison-native \
-    zip-native \
-"
+DEPENDS = "python3-lxml-native ccache-native archive-zip-native gperf-native bison-native"

 EXTRA_OECONF = " \
    --without-doxygen \
    --enable-release-build \
-    --disable-verbose \
+    --enable-verbose \
    --with-parallelism=${@oe.utils.cpu_count()} \
    \
    --with-system-librevenge \
--- a/recipes-libreoffice/libreoffice/libreoffice/0010-Fix-build-with-poppler-0.62.0.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0010-Fix-build-with-poppler-0.62.0.patch
@@ -1,50 +0,0 @@
-From c317f7f33ecc275f4e39dae1dcdfc444b99b1d9f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 18 Mar 2018 17:06:55 +0100
-Subject: [PATCH] Fix build with poppler >= 0.62.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-see [1] for further details
-
-[1] https://bugs.freedesktop.org/attachment.cgi?id=135409
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index b7c47d8..e505a43 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -34,7 +34,10 @@
- // sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
- // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
- //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
-#if POPPLER_CHECK_VERSION(0, 21, 1)
-+// Maybe change cam in earlier but meta-oe is going to jump to 0.62.0
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+#include "UnicodeMapFuncs.h"
-+#elif POPPLER_CHECK_VERSION(0, 21, 1)
- #include "UTF8.h"
- #elif POPPLER_CHECK_VERSION(0, 21, 0)
- #include "UTF.h"
-@@ -916,7 +919,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
-             );
- 
-     // silence spurious warning
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+    (void)&mapUTF16;
-+#else
-     (void)&mapUCS2;
-+#endif
- 
-     char buf[9];
-     for( int i=0; i<uLen; ++i )
-- 
-2.14.3
-
--- a/recipes-libreoffice/libreoffice/libreoffice/0011-pdfioutdev_gpl-Fix-build-with-poppler-0.70.0.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0011-pdfioutdev_gpl-Fix-build-with-poppler-0.70.0.patch
@@ -1,51 +0,0 @@
-From 448e8dc3c47db0219f6d72ca61b00d6df711932f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 25 Oct 2018 22:36:43 +0200
-Subject: [PATCH] pdfioutdev_gpl: Fix build with poppler >= 0.70.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 4590d65..34d73bc 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -603,7 +603,11 @@ void PDFOutDev::restoreState(GfxState*)
-     printf( "restoreState\n" );
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 70, 0)
-+void PDFOutDev::setDefaultCTM(const double *pMat)
-+#else
- void PDFOutDev::setDefaultCTM(double *pMat)
-+#endif
- {
-     assert(pMat);
- 
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 2f59bf2..b6d97bb 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -179,7 +179,11 @@ namespace pdfi
-         //----- initialization and control
- 
-         // Set default transform matrix.
-+#if POPPLER_CHECK_VERSION(0, 70, 0)
-+        virtual void setDefaultCTM(const double *ctm) SAL_OVERRIDE;
-+#else
-         virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
-+#endif
- 
-         // Start a page.
-         virtual void startPage(int pageNum, GfxState *state
-- 
-2.14.4
-
--- a/recipes-support/glm/glm_0.9.7.1.bb
+++ b/recipes-support/glm/glm_0.9.7.1.bb
@@ -0,0 +1,27 @@
+SUMMARY = "C++ mathematics library for graphics programming"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://copying.txt;md5=6ba02d5f908587c6f3942e76bf6d92d6"
+
+inherit cmake
+
+SRC_URI = "git://github.com/g-truc/glm.git"
+# 0.9.7.1 tag
+SRCREV = "8f39bb8730d45570384f3156eb0126b835024d69"
+S = "${WORKDIR}/git"
+
+do_configure() {
+    # for some reason simple tailored configure runs best
+    mkdir -p ${B}
+    cd ${B}
+    # -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} causes configur break with
+    # | CMake Error: Could not open file for write in copy operation /usr/lib/cmake/glm/glmConfig.cmake.tmp
+    # | CMake Error: : System Error: No such file or directory
+    cmake \
+        -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+        -DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir} \
+        ${OECMAKE_SOURCEPATH}
+}
+
+FILES_${PN}-dev += "${libdir}/cmake"
+
+BBCLASSEXTEND = "native"
--- a/recipes-support/libcmis/files/0002-drop-prefix.patch
+++ b/recipes-support/libcmis/files/0002-drop-prefix.patch
@@ -1,250 +0,0 @@
-From 8b401fdea3f621101876f31f21aa98ffd60f5e91 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 16 May 2017 10:02:19 +0200
-Subject: [PATCH 1/3] drop :: prefix
-
---
- src/cmis-client.cxx             | 2 +-
- src/libcmis/atom-object.cxx     | 2 +-
- src/libcmis/document.hxx        | 2 +-
- src/libcmis/folder.hxx          | 8 ++++----
- src/libcmis/gdrive-folder.cxx   | 2 +-
- src/libcmis/json-utils.cxx      | 2 +-
- src/libcmis/oauth2-data.hxx     | 2 +-
- src/libcmis/object-type.hxx     | 2 +-
- src/libcmis/object.hxx          | 2 +-
- src/libcmis/property-type.hxx   | 2 +-
- src/libcmis/property.hxx        | 2 +-
- src/libcmis/rendition.hxx       | 2 +-
- src/libcmis/repository.hxx      | 2 +-
- src/libcmis/session-factory.hxx | 4 ++--
- src/libcmis/xml-utils.cxx       | 2 +-
- 15 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/src/cmis-client.cxx b/src/cmis-client.cxx
-index 73c1b8e..d5c01e4 100644
--- a/src/cmis-client.cxx
-+++ b/src/cmis-client.cxx
-@@ -40,7 +40,7 @@
- #include <libcmis/libcmis.hxx>
- 
- using namespace std;
-using namespace ::boost::program_options;
-+using namespace boost::program_options;
- using libcmis::PropertyPtrMap;
- 
- namespace
-diff --git a/src/libcmis/atom-object.cxx b/src/libcmis/atom-object.cxx
-index 1eb33fa..01454a4 100644
--- a/src/libcmis/atom-object.cxx
-+++ b/src/libcmis/atom-object.cxx
-@@ -59,7 +59,7 @@ namespace
-                 // Some implementations (xcmis) put extra spaces into the type attribute
-                 // (e.g. "application/atom+xml; type=feed" instead of "application/atom+xml;type=feed")
-                 string linkType = link.getType( );
-                linkType.erase( remove_if( linkType.begin(), linkType.end(), ::isspace ), linkType.end() );
-+                linkType.erase( remove_if( linkType.begin(), linkType.end(), isspace ), linkType.end() );
- 
-                 // Some implementation (SharePoint) are omitting the type attribute
-                 bool matchesType = m_type.empty( ) || linkType.empty() || ( linkType == m_type );
-diff --git a/src/libcmis/document.hxx b/src/libcmis/document.hxx
-index 0473012..a6736d7 100644
--- a/src/libcmis/document.hxx
-+++ b/src/libcmis/document.hxx
-@@ -140,7 +140,7 @@ namespace libcmis
- 
-             virtual std::string toString( );
-     };
-    typedef ::boost::shared_ptr< Document > DocumentPtr;
-+    typedef boost::shared_ptr< Document > DocumentPtr;
- }
- 
- #endif
-diff --git a/src/libcmis/folder.hxx b/src/libcmis/folder.hxx
-index e001541..b9d7c57 100644
--- a/src/libcmis/folder.hxx
-+++ b/src/libcmis/folder.hxx
-@@ -59,16 +59,16 @@ namespace libcmis
- 
-             virtual std::vector< std::string > getPaths( );
- 
-            virtual ::boost::shared_ptr< Folder > getFolderParent( ) throw ( Exception );
-+            virtual boost::shared_ptr< Folder > getFolderParent( ) throw ( Exception );
-             virtual std::vector< ObjectPtr > getChildren( ) throw ( Exception ) = 0;
-             virtual std::string getParentId( );
-             virtual std::string getPath( );
- 
-             virtual bool isRootFolder( );
- 
-            virtual ::boost::shared_ptr< Folder > createFolder( const std::map< std::string, PropertyPtr >& properties )
-+            virtual boost::shared_ptr< Folder > createFolder( const std::map< std::string, PropertyPtr >& properties )
-                 throw ( libcmis::Exception ) = 0;
-            virtual ::boost::shared_ptr< Document > createDocument( const std::map< std::string, PropertyPtr >& properties,
-+            virtual boost::shared_ptr< Document > createDocument( const std::map< std::string, PropertyPtr >& properties,
-                                     boost::shared_ptr< std::ostream > os, std::string contentType, std::string fileName ) throw ( Exception ) = 0;
- 
-             virtual std::vector< std::string > removeTree( bool allVersion = true, UnfileObjects::Type unfile = UnfileObjects::Delete,
-@@ -76,7 +76,7 @@ namespace libcmis
-         
-             virtual std::string toString( );
-     };
-    typedef ::boost::shared_ptr< Folder > FolderPtr;
-+    typedef boost::shared_ptr< Folder > FolderPtr;
- 
- }
- 
-diff --git a/src/libcmis/gdrive-folder.cxx b/src/libcmis/gdrive-folder.cxx
-index e5e14af..840539e 100644
--- a/src/libcmis/gdrive-folder.cxx
-+++ b/src/libcmis/gdrive-folder.cxx
-@@ -159,7 +159,7 @@ libcmis::DocumentPtr GDriveFolder::createDocument(
-     // parse the document
-     Json jsonRes = Json::parse( res );
- 
-    ::boost::shared_ptr< GDriveDocument >
-+    boost::shared_ptr< GDriveDocument >
-       gDocument( new GDriveDocument( getSession( ), jsonRes ) );
- 
-     // Upload stream
-diff --git a/src/libcmis/json-utils.cxx b/src/libcmis/json-utils.cxx
-index b4e037d..de78574 100644
--- a/src/libcmis/json-utils.cxx
-+++ b/src/libcmis/json-utils.cxx
-@@ -188,7 +188,7 @@ Json Json::parse( const string& str ) throw ( libcmis:: Exception )
-     {
-         try 
-         {
-            ::property_tree::json_parser::read_json( ss, pTree );
-+            property_tree::json_parser::read_json( ss, pTree );
-         }
-         catch ( boost::exception const& )
-         {
-diff --git a/src/libcmis/oauth2-data.hxx b/src/libcmis/oauth2-data.hxx
-index 000f939..dc8fb77 100644
--- a/src/libcmis/oauth2-data.hxx
-+++ b/src/libcmis/oauth2-data.hxx
-@@ -69,7 +69,7 @@ namespace libcmis
-             const std::string& getScope() { return m_scope; }
-             const std::string& getRedirectUri() { return m_redirectUri; }
-     };
-    typedef ::boost::shared_ptr< OAuth2Data > OAuth2DataPtr;
-+    typedef boost::shared_ptr< OAuth2Data > OAuth2DataPtr;
- }
- 
- #endif //_LIBCMIS_OAUTH2_DATA_HXX_
-diff --git a/src/libcmis/object-type.hxx b/src/libcmis/object-type.hxx
-index 629663c..bfebc59 100644
--- a/src/libcmis/object-type.hxx
-+++ b/src/libcmis/object-type.hxx
-@@ -137,7 +137,7 @@ namespace libcmis
-             virtual std::string toString( );
-     };
- 
-    typedef ::boost::shared_ptr< ObjectType > ObjectTypePtr;
-+    typedef boost::shared_ptr< ObjectType > ObjectTypePtr;
- }
- 
- #endif
-diff --git a/src/libcmis/object.hxx b/src/libcmis/object.hxx
-index d7d3603..932bc60 100644
--- a/src/libcmis/object.hxx
-+++ b/src/libcmis/object.hxx
-@@ -214,7 +214,7 @@ namespace libcmis
-             void toXml( xmlTextWriterPtr writer );
-     };
- 
-    typedef ::boost::shared_ptr< Object > ObjectPtr;
-+    typedef boost::shared_ptr< Object > ObjectPtr;
- }
- 
- #endif
-diff --git a/src/libcmis/property-type.hxx b/src/libcmis/property-type.hxx
-index 56be223..0fb490e 100644
--- a/src/libcmis/property-type.hxx
-+++ b/src/libcmis/property-type.hxx
-@@ -119,7 +119,7 @@ namespace libcmis
- 
-             void update( std::vector< ObjectTypePtr > typesDefs );
-     };
-    typedef ::boost::shared_ptr< PropertyType > PropertyTypePtr;
-+    typedef boost::shared_ptr< PropertyType > PropertyTypePtr;
- }
- 
- #endif
-diff --git a/src/libcmis/property.hxx b/src/libcmis/property.hxx
-index aa65605..567cefb 100644
--- a/src/libcmis/property.hxx
-+++ b/src/libcmis/property.hxx
-@@ -79,7 +79,7 @@ namespace libcmis
- 
-             std::string toString( );
-     };
-    typedef ::boost::shared_ptr< Property > PropertyPtr;
-+    typedef boost::shared_ptr< Property > PropertyPtr;
-     typedef std::map< std::string, libcmis::PropertyPtr > PropertyPtrMap;
- 
-     PropertyPtr parseProperty( xmlNodePtr node, boost::shared_ptr< ObjectType > objectType );
-diff --git a/src/libcmis/rendition.hxx b/src/libcmis/rendition.hxx
-index 2e38651..f8c23b4 100644
--- a/src/libcmis/rendition.hxx
-+++ b/src/libcmis/rendition.hxx
-@@ -81,7 +81,7 @@ namespace libcmis
-             std::string toString( );
-     };
- 
-    typedef ::boost::shared_ptr< Rendition > RenditionPtr;
-+    typedef boost::shared_ptr< Rendition > RenditionPtr;
- }
- 
- #endif
-diff --git a/src/libcmis/repository.hxx b/src/libcmis/repository.hxx
-index a4435d8..320cbb4 100644
--- a/src/libcmis/repository.hxx
-+++ b/src/libcmis/repository.hxx
-@@ -111,7 +111,7 @@ namespace libcmis
-             static std::map< Capability, std::string > parseCapabilities( xmlNodePtr node );
-     };
-     
-    typedef ::boost::shared_ptr< Repository > RepositoryPtr;
-+    typedef boost::shared_ptr< Repository > RepositoryPtr;
- }
- 
- #endif
-diff --git a/src/libcmis/session-factory.hxx b/src/libcmis/session-factory.hxx
-index 9349b1c..8cc1f26 100644
--- a/src/libcmis/session-factory.hxx
-+++ b/src/libcmis/session-factory.hxx
-@@ -57,7 +57,7 @@ namespace libcmis
-               */
-             virtual bool authenticationQuery( std::string& username, std::string& password ) = 0;
-     };
-    typedef ::boost::shared_ptr< AuthProvider > AuthProviderPtr;
-+    typedef boost::shared_ptr< AuthProvider > AuthProviderPtr;
-   
-     /** Handler class used to request user input when an invalid SSL certificate is encountered.
-      */ 
-@@ -77,7 +77,7 @@ namespace libcmis
-                */
-              virtual bool validateCertificate( std::vector< std::string > certificatesChain ) = 0;
-     };
-    typedef ::boost::shared_ptr< CertValidationHandler > CertValidationHandlerPtr;
-+    typedef boost::shared_ptr< CertValidationHandler > CertValidationHandlerPtr;
- 
-     class SessionFactory
-     {
-diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
-index 7070067..599edf2 100644
--- a/src/libcmis/xml-utils.cxx
-+++ b/src/libcmis/xml-utils.cxx
-@@ -551,7 +551,7 @@ namespace libcmis
-         string lower( sText );
-         for ( size_t i = 0; i < sText.size(); ++i )
-         {
-            lower[i] = ::tolower( sText[i] );
-+            lower[i] = tolower( sText[i] );
-         }
-         return lower;
-     }
-- 
-2.9.4
-
--- a/recipes-support/libcmis/files/0003-do-not-reinvent-the-wheel.patch
+++ b/recipes-support/libcmis/files/0003-do-not-reinvent-the-wheel.patch
@@ -1,127 +0,0 @@
-From ca381ff4586c9fc1190d285137ba8f67b102d600 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 16 May 2017 11:52:43 +0200
-Subject: [PATCH 2/3] do not reinvent the wheel
-
---
- configure.ac                        |  1 +
- src/libcmis/atom-session.cxx        |  3 ++-
- src/libcmis/property.cxx            |  4 +++-
- src/libcmis/ws-relatedmultipart.cxx |  2 +-
- src/libcmis/xml-utils.cxx           | 11 -----------
- src/libcmis/xml-utils.hxx           |  2 --
- 6 files changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 41b7a62..ae1eddb 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -167,6 +167,7 @@ m4_pattern_allow([^BOOST_])
- BOOST_REQUIRE([1.36])
- BOOST_DATE_TIME
- BOOST_SMART_PTR
-+BOOST_STRING_ALGO
- BOOST_UUID
- 
- AS_IF([test "x$enable_client" != "xno"], [
-diff --git a/src/libcmis/atom-session.cxx b/src/libcmis/atom-session.cxx
-index 5772efc..c263f58 100644
--- a/src/libcmis/atom-session.cxx
-+++ b/src/libcmis/atom-session.cxx
-@@ -27,6 +27,7 @@
-  */
- #include <string>
- 
-+#include <boost/algorithm/string.hpp>
- #include <boost/shared_ptr.hpp>
- 
- #include <libxml/parser.h>
-@@ -127,7 +128,7 @@ void AtomPubSession::parseServiceDocument( const string& buf ) throw ( libcmis::
-                             m_repositoryId = ws->getId( );
- 
-                         // SharePoint is case insensitive for the id...
-                        if ( libcmis::tolower( ws->getId( ) ) == libcmis::tolower( m_repositoryId ) )
-+                        if ( boost::to_lower_copy( ws->getId( ) ) == boost::to_lower_copy( m_repositoryId ) )
-                             m_repository = ws;
- 
-                         m_repositories.push_back( ws );
-diff --git a/src/libcmis/property.cxx b/src/libcmis/property.cxx
-index e0249a5..b303fe5 100644
--- a/src/libcmis/property.cxx
-+++ b/src/libcmis/property.cxx
-@@ -26,6 +26,8 @@
-  * instead of those above.
-  */
- 
-+#include <boost/algorithm/string.hpp>
-+
- #include "object-type.hxx"
- #include "property.hxx"
- #include "xml-utils.hxx"
-@@ -191,7 +193,7 @@ namespace libcmis
-                     size_t pos = xmlType.find( propStr );
-                     if ( pos == 0 ) {
-                         xmlType = xmlType.substr( propStr.length( ) );
-                        xmlType = libcmis::tolower( xmlType );
-+                        boost::to_lower( xmlType );
-                     }
- 
-                     propType.reset( new PropertyType( xmlType, propDefinitionId,
-diff --git a/src/libcmis/ws-relatedmultipart.cxx b/src/libcmis/ws-relatedmultipart.cxx
-index df2471a..3b31634 100644
--- a/src/libcmis/ws-relatedmultipart.cxx
-+++ b/src/libcmis/ws-relatedmultipart.cxx
-@@ -179,7 +179,7 @@ RelatedMultipart::RelatedMultipart( const string& body, const string& contentTyp
-                     size_t colonPos = line.find( ":" );
-                     string headerName = line.substr( 0, colonPos );
-                     string headerValue = line.substr( colonPos + 1 );
-                    if ( libcmis::tolower( headerName ) == libcmis::tolower( "Content-Id" ) )
-+                    if ( boost::to_lower_copy( headerName ) == "content-id" )
-                     {
-                         cid = libcmis::trim( headerValue );
-                         // Remove the '<' '>' around the id if any
-diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
-index 599edf2..d20ff47 100644
--- a/src/libcmis/xml-utils.cxx
-+++ b/src/libcmis/xml-utils.cxx
-@@ -26,7 +26,6 @@
-  * instead of those above.
-  */
- 
-#include <cctype>
- #include <errno.h>
- #include <sstream>
- #include <stdlib.h>
-@@ -546,16 +545,6 @@ namespace libcmis
-         return out.str();
-     }
- 
-    string tolower( string sText )
-    {
-        string lower( sText );
-        for ( size_t i = 0; i < sText.size(); ++i )
-        {
-            lower[i] = tolower( sText[i] );
-        }
-        return lower;
-    }
-
-     int stringstream_write_callback( void * context, const char * s, int len )
-     {
-         stringstream * ss=static_cast< stringstream * >( context );
-diff --git a/src/libcmis/xml-utils.hxx b/src/libcmis/xml-utils.hxx
-index 58e9e8d..3bb21bb 100644
--- a/src/libcmis/xml-utils.hxx
-+++ b/src/libcmis/xml-utils.hxx
-@@ -156,8 +156,6 @@ namespace libcmis
- 
-     std::string sha1( const std::string& str );
- 
-    std::string tolower( std::string sText );
-
-     int stringstream_write_callback(void * context, const char * s, int len);
- 
-     std::string escape( std::string str );
-- 
-2.9.4
-
--- a/recipes-support/libcmis/files/0004-fix-build-error-with-gcc-std-c-98.patch
+++ b/recipes-support/libcmis/files/0004-fix-build-error-with-gcc-std-c-98.patch
@@ -1,39 +0,0 @@
-From 86a50d6bad2ba44a8107ddb379d2ec6b84537a48 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 16 May 2017 11:58:12 +0200
-Subject: [PATCH 3/3] fix build error with gcc -std=c++98
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-atom-object.cxx: In member function ‘bool {anonymous}::MatchLink::operator()(AtomLink)’:
-atom-object.cxx:63:91: error: no matching function for call to ‘remove_if(std::__cxx11::basic_string<char>::iterator, std::__cxx11::basic_string<char>::iterator, <unresolved overloaded function type>)’
-          linkType.erase( remove_if( linkType.begin(), linkType.end(), std::isspace ), linkType.end() );
---
- src/libcmis/atom-object.cxx | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libcmis/atom-object.cxx b/src/libcmis/atom-object.cxx
-index 01454a4..510f013 100644
--- a/src/libcmis/atom-object.cxx
-+++ b/src/libcmis/atom-object.cxx
-@@ -30,6 +30,7 @@
- #include <locale>
- #include <sstream>
- 
-+#include <boost/algorithm/string.hpp>
- #include <boost/date_time/posix_time/posix_time.hpp>
- 
- #include "atom-document.hxx"
-@@ -59,7 +60,7 @@ namespace
-                 // Some implementations (xcmis) put extra spaces into the type attribute
-                 // (e.g. "application/atom+xml; type=feed" instead of "application/atom+xml;type=feed")
-                 string linkType = link.getType( );
-                linkType.erase( remove_if( linkType.begin(), linkType.end(), isspace ), linkType.end() );
-+                linkType.erase( remove_if( linkType.begin(), linkType.end(), boost::is_space() ), linkType.end() );
- 
-                 // Some implementation (SharePoint) are omitting the type attribute
-                 bool matchesType = m_type.empty( ) || linkType.empty() || ( linkType == m_type );
-- 
-2.9.4
-
--- a/recipes-support/libcmis/files/0005-Fix-build-with-boost-1.68.0.patch
+++ b/recipes-support/libcmis/files/0005-Fix-build-with-boost-1.68.0.patch
@@ -1,38 +0,0 @@
-From c780138f9e56499d0cfd5954506fc665e42e7e3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 26 Oct 2018 22:57:36 +0200
-Subject: [PATCH] Fix build with boost >= 1.68.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/tdf/libcmis/pull/21
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/libcmis/xml-utils.cxx | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
-index e72567a..9620a26 100644
--- a/src/libcmis/xml-utils.cxx
-+++ b/src/libcmis/xml-utils.cxx
-@@ -30,7 +30,13 @@
- #include <sstream>
- #include <stdlib.h>
- 
-+#include <boost/version.hpp>
-+
-+#if BOOST_VERSION >= 106800
-+#include <boost/uuid/detail/sha1.hpp>
-+#else
- #include <boost/uuid/sha1.hpp>
-+#endif
- #include <curl/curl.h>
- 
- #include "xml-utils.hxx"
-- 
-2.14.4
-
--- a/recipes-support/libcmis/libcmis_0.5.1.bb
+++ b/recipes-support/libcmis/libcmis_0.5.1.bb
@@ -10,10 +10,6 @@ LIC_FILES_CHKSUM = " \
 SRC_URI = " \
    https://github.com/tdf/libcmis/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
    file://0001-Avoid-cross-compile-unsafe-paths.patch \
-    file://0002-drop-prefix.patch \
-    file://0003-do-not-reinvent-the-wheel.patch \
-    file://0004-fix-build-error-with-gcc-std-c-98.patch \
-    file://0005-Fix-build-with-boost-1.68.0.patch \
 "

 SRC_URI[md5sum] = "3270154f0f40d86fce849b161f914101"
@@ -25,7 +21,6 @@ DEPENDS = "curl libxml2 cppunit boost"

 EXTRA_OECONF = " \
    --without-man \
-    --disable-werror \
 "

 do_configure_prepend() {
--- a/recipes-support/liblangtag/files/0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch
+++ b/recipes-support/liblangtag/files/0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch
@@ -1,31 +0,0 @@
-From 1da0e92dfee9d3ecaad6dc7aabf1a3bc466cb314 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 13 Mar 2016 12:05:40 +0100
-Subject: [PATCH 1/2] configure.ac: add missing HAVE_INTROSPECTION check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 9773fa8..e090875 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -384,6 +384,8 @@ if test "x$enable_introspection" != "xyes"; then
- 	has_gobject=no
- fi
- AM_CONDITIONAL(ENABLE_GOBJECT, test x$has_gobject != xno)
-+AM_CONDITIONAL(HAVE_INTROSPECTION, test x$has_gobject != xno)
-+
- m4_ifdef([GTK_DOC_CHECK], [
- GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
- ],[
-- 
-2.5.0
-
--- a/recipes-support/liblangtag/files/0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch
+++ b/recipes-support/liblangtag/files/0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch
@@ -1,31 +0,0 @@
-From 0efc6ebe13ec12599ba05c587e58fb249d569f6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 13 Mar 2016 12:37:43 +0100
-Subject: [PATCH 2/2] configure.ac: remove untranslated AX_CHECK_ENABLE_DEBUG
- macro
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e090875..e177c46 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,6 @@ AM_MAINTAINER_MODE
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_MACRO_DIR([m4macros])
- 
-AX_CHECK_ENABLE_DEBUG([no], [ENABLE_DEBUG])
- AM_CONDITIONAL(ENABLE_DEBUG, test $ax_enable_debug = yes)
- 
- AC_USE_SYSTEM_EXTENSIONS
-- 
-2.5.5
-
--- a/recipes-support/liblangtag/liblangtag_0.6.2.bb
+++ b/recipes-support/liblangtag/liblangtag_0.6.2.bb
@@ -1,29 +0,0 @@
-SUMMARY = "An interface library to access tags for identifying languages"
-HOMEPAGE = "http://tagoh.bitbucket.org/liblangtag/"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-"
-
-DEPENDS = "libxml2"
-
-SRC_URI = " \
-    https://bitbucket.org/tagoh/${BPN}/downloads/${BPN}-${PV}.tar.bz2 \
-    file://0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch \
-    file://0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch \
-"
-SRC_URI[md5sum] = "284f120247323a35122ab32b4b359c45"
-SRC_URI[sha256sum] = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"
-
-inherit autotools pkgconfig gobject-introspection
-
-do_configure_prepend() {
-    if ! grep -q ${HOST_SYS}-libtool ${S}/configure.ac; then
-        # align to native libtool
-        sed -i 's:libtool :${HOST_SYS}-libtool :g' ${S}/configure.ac
-    fi
-}
-
-export GIR_EXTRA_LIBS_PATH="${B}/liblangtag/.libs"
-
-BBCLASSEXTEND = "native"
--- a/recipes-support/librevenge/files/0001-Fix-build-with-gcc8.patch
+++ b/recipes-support/librevenge/files/0001-Fix-build-with-gcc8.patch
@@ -1,58 +0,0 @@
-From 090c85c00f9985f67000cf4d6a9544ce4c30ca43 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 2 Jul 2018 14:18:37 +0200
-Subject: [PATCH] Fix build with gcc8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/lib/RVNGHTMLTextTableStyle.cpp | 2 +-
- src/lib/RVNGHTMLTextTextStyle.cpp  | 2 +-
- src/lib/RVNGZipStream.cpp          | 1 +
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/RVNGHTMLTextTableStyle.cpp b/src/lib/RVNGHTMLTextTableStyle.cpp
-index 719ec6a..cca62c8 100644
--- a/src/lib/RVNGHTMLTextTableStyle.cpp
-+++ b/src/lib/RVNGHTMLTextTableStyle.cpp
-@@ -169,7 +169,7 @@ std::string RVNGHTMLTextTableStyleManager::getCellContent(RVNGPropertyList const
- 	if (pList["fo:background-color"])
- 		s << "\tbackground-color:" << pList["fo:background-color"]->getStr().cstr() << ";\n";
- 
-	static char const *(type[]) = {"border", "border-left", "border-top", "border-right", "border-bottom" };
-+	static char const *type[] = {"border", "border-left", "border-top", "border-right", "border-bottom" };
- 	for (int i = 0; i < 5; i++)
- 	{
- 		std::string field("fo:");
-diff --git a/src/lib/RVNGHTMLTextTextStyle.cpp b/src/lib/RVNGHTMLTextTextStyle.cpp
-index 5dc7d62..1622572 100644
--- a/src/lib/RVNGHTMLTextTextStyle.cpp
-+++ b/src/lib/RVNGHTMLTextTextStyle.cpp
-@@ -281,7 +281,7 @@ std::string RVNGHTMLTextParagraphStyleManager::getContent(RVNGPropertyList const
- 
- void RVNGHTMLTextParagraphStyleManager::parseBorders(RVNGPropertyList const &pList, std::ostream &out) const
- {
-	static char const *(type[]) = {"border", "border-left", "border-top", "border-right", "border-bottom" };
-+	static char const *type[] = {"border", "border-left", "border-top", "border-right", "border-bottom" };
- 	for (int i = 0; i < 5; i++)
- 	{
- 		std::string field("fo:");
-diff --git a/src/lib/RVNGZipStream.cpp b/src/lib/RVNGZipStream.cpp
-index b15eac5..42be5eb 100644
--- a/src/lib/RVNGZipStream.cpp
-+++ b/src/lib/RVNGZipStream.cpp
-@@ -478,6 +478,7 @@ RVNGInputStream *RVNGZipStream::getSubstream(RVNGInputStream *input, const char
- 			// TODO: return partial result on Z_BUF_ERROR/Z_DATA_ERROR?
- 			default:
- 				data.clear();
-+				__attribute__((fallthrough));
- 			// fall-through intended
- 			case Z_STREAM_END:
- 				done = true;
-- 
-2.14.4
-
--- a/recipes-support/librevenge/librevenge_0.0.2.bb
+++ b/recipes-support/librevenge/librevenge_0.0.2.bb
@@ -5,12 +5,9 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "

-SRC_URI = " \
-    http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2 \
-    file://0001-Fix-build-with-gcc8.patch \
-"
-SRC_URI[md5sum] = "5b9ac52ec77d4d19157cf5962ebc0aea"
-SRC_URI[sha256sum] = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "2d4183bf17aea1a71842468a71a68c47"
+SRC_URI[sha256sum] = "dedd6fe1f643fc2f254f2ad3719547084bd86bcc482104b995caf3b828368b18"

 inherit autotools pkgconfig

--- a/recipes-support/lpsolve/lpsolve/0001-Align-compile.patch
+++ b/recipes-support/lpsolve/lpsolve/0001-Align-compile.patch
@@ -1,130 +0,0 @@
-From f7506e802901dc7cbd9d91be60576e4f60da1e45 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 31 Oct 2018 22:59:02 +0100
-Subject: [PATCH] Align compile
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Parts taken from [1]
-
-[1] https://src.fedoraproject.org/cgit/rpms/lpsolve.git/tree/lpsolve-5.5.0.11.cflags.patch
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- lp_solve/ccc  | 37 ++-----------------------------------
- lpsolve55/ccc | 47 ++++-------------------------------------------
- 2 files changed, 6 insertions(+), 78 deletions(-)
-
-diff --git a/lp_solve/ccc b/lp_solve/ccc
-index 35b89fb..051a8e6 100644
--- a/lp_solve/ccc
-+++ b/lp_solve/ccc
-@@ -1,41 +1,8 @@
- :
- src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c lp_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
- 
-#determine platform (32/64 bit)
->/tmp/platform.c
-echo '#include <stdlib.h>'>>/tmp/platform.c
-echo '#include <stdio.h>'>>/tmp/platform.c
-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c
-$c /tmp/platform.c -o /tmp/platform
-PLATFORM=`/tmp/platform`
-rm /tmp/platform /tmp/platform.c >/dev/null 2>&1
-
-mkdir bin bin/$PLATFORM >/dev/null 2>&1
-+mkdir bin >/dev/null 2>&1
- 
- math=-lm
- 
-#check if this system has the isnan function
->/tmp/isnan.c
-echo '#include <stdio.h>'>>/tmp/isnan.c
-echo '#include <stdlib.h>'>>/tmp/isnan.c
-echo '#include <math.h>'>>/tmp/isnan.c
-echo 'main(){isnan(0);}'>>/tmp/isnan.c
-$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
-if [ $? = 0 ]
-then NOISNAN=
-else NOISNAN=-DNOISNAN
-fi
-rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1
-
-opts='-O3'
-
-def=
-if [ "$PLATFORM" = "SCO_UNIX" ]
-then opts='-O0'
-     def='-dy -K PIC -DLLONG=long'
-     dl=-ldl
-else dl=-ldl
-fi
-
-$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl
-+$CC $CFLAGS $LDFLAGS -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/lp_solve $math -ldl
-diff --git a/lpsolve55/ccc b/lpsolve55/ccc
-index 4afb1bf..995b0d9 100644
--- a/lpsolve55/ccc
-+++ b/lpsolve55/ccc
-@@ -1,50 +1,11 @@
- :
- src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
- 
-#determine platform (32/64 bit)
->/tmp/platform.c
-echo '#include <stdlib.h>'>>/tmp/platform.c
-echo '#include <stdio.h>'>>/tmp/platform.c
-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c
-$c /tmp/platform.c -o /tmp/platform
-PLATFORM=`/tmp/platform`
-rm /tmp/platform /tmp/platform.c >/dev/null 2>&1
-+mkdir bin >/dev/null 2>&1
- 
-mkdir bin bin/$PLATFORM >/dev/null 2>&1
-+$CC $CFLAGS -fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
- 
-#check if this system has the isnan function
->/tmp/isnan.c
-echo '#include <stdio.h>'>>/tmp/isnan.c
-echo '#include <stdlib.h>'>>/tmp/isnan.c
-echo '#include <math.h>'>>/tmp/isnan.c
-echo 'main(){isnan(0);}'>>/tmp/isnan.c
-$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1
-if [ $? = 0 ]
-then NOISNAN=
-else NOISNAN=-DNOISNAN
-fi
-rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1
-
-def=
-so=
-if [ "$PLATFORM" = "SCO_UNIX" ]
-then def='-dy -K PIC -DNOLONGLONG'
-     dl=-lc
-else dl=-ldl
-     so=y
-fi
-
-opts='-O3'
-
-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-ranlib bin/$PLATFORM/liblpsolve55.a
-
-if [ "$so" != "" ]
-then
-  $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-fi
-+$CC $CFLAGS fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+$CC $LDFLAGS -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
- 
- rm *.o 2>/dev/null
-- 
-2.14.4
-
--- a/recipes-support/lpsolve/lpsolve_5.5.2.5.bb
+++ b/recipes-support/lpsolve/lpsolve_5.5.2.5.bb
@@ -1,34 +0,0 @@
-SUMMARY = "A Mixed Integer Linear Programming (MILP) solver"
-HOMEPAGE = "http://lpsolve.sourceforge.net/5.5/"
-LICENSE = "LGPL2.1"
-LIC_FILES_CHKSUM = "file://README.txt;start_line=6;end_line=7;md5=883769a4ee3f3c1843e536ab0fabb3b2"
-
-SRC_URI = " \
-    http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/lp_solve_${PV}_source.tar.gz \
-    file://0001-Align-compile.patch \
-"
-SRC_URI[md5sum] = "3be57261fc41dd8e210f54017220d5f7"
-SRC_URI[sha256sum] = "201a7c62b8b3360c884ee2a73ed7667e5716fc1e809755053b398c2f5b0cf28a"
-
-S = "${WORKDIR}/lp_solve_5.5"
-
-do_compile() {
-    cd lpsolve55
-    sh -x ccc
-    cd ../lp_solve
-    sh -x ccc    
-}
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 755 lp_solve/bin/lp_solve ${D}${bindir}
-
-    install -d ${D}${libdir}
-    install -m 644 lpsolve55/bin/liblpsolve55.so ${D}/${libdir}
-
-    install -d ${D}${includedir}/lpsolve
-    install -m 644 lp*.h ${D}${includedir}/lpsolve
-}
-
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/liblpsolve55.so"
--- a/recipes-support/mdds/mdds-1/0001-configure.ac-remove-fixed-paths-causing-trouble-when.patch
+++ b/recipes-support/mdds/mdds-1/0001-configure.ac-remove-fixed-paths-causing-trouble-when.patch
@@ -1,6 +1,6 @@
 From a3fcf20a65c476b5b8a3f92ed3e950838f9e21b7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 30 Nov 2017 12:55:30 +0100
+Date: Sun, 13 Mar 2016 01:04:20 +0100
 Subject: [PATCH] configure.ac: remove fixed paths causing trouble when cross
 compiling
 MIME-Version: 1.0
@@ -15,17 +15,17 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 1 file changed, 1 deletion(-)

 diff --git a/configure.ac b/configure.ac
-index f1c9003..1721444 100644
+index d135a2a..09ff3d7 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -29,7 +29,6 @@ AC_SUBST(MISCDIR)
 AC_SUBST(QUICKCHECKDIR)
 
- CPPFLAGS="$CPPFLAGS -Wall -O2 -g -pedantic-errors -DMDDS_DEBUG_NODE_BASE -DMDDS_UNIT_TEST -std=c++11"
+ CPPFLAGS="$CPPFLAGS -Wall -Os -g -pedantic-errors -DMDDS_DEBUG_NODE_BASE -DMDDS_UNIT_TEST -std=c++11"
 -CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include"
 
 if test "$debug_stdcxx" = "yes"; then
   CPPFLAGS="$CPPFLAGS -D_GLIBCXX_DEBUG"
 -- 
-2.9.5
+2.5.0

--- a/recipes-support/mdds/mdds-1_1.1.0.bb
+++ b/recipes-support/mdds/mdds-1_1.1.0.bb
@@ -9,8 +9,8 @@ SRC_URI = " \
    http://kohei.us/files/mdds/src/mdds-${PV}.tar.bz2 \
    file://0001-configure.ac-remove-fixed-paths-causing-trouble-when.patch \
 "
-SRC_URI[md5sum] = "913ef8b1680ad8b8407c3a4bb0c82634"
-SRC_URI[sha256sum] = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1"
+SRC_URI[md5sum] = "c300541adac09008aa4a305eacd1dca6"
+SRC_URI[sha256sum] = "4253ab93fe8bb579321a50e247f1f800191ab99fe2d8c6c181741b8bd3fb161f"

 S = "${WORKDIR}/mdds-${PV}"

--- a/recipes-support/redland/raptor2/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
+++ b/recipes-support/redland/raptor2/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
@@ -0,0 +1,34 @@
+From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 27 Oct 2015 10:21:24 +0100
+Subject: [PATCH] configure.ac: do additional checks on libxml2 also when
+ detected by pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/dajobe/raptor/pull/33
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 10ff870..35fa08e 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -601,7 +601,7 @@ have_libxml=0
+ need_libxml=0
+ 
+ oCPPFLAGS="$CPPFLAGS"
+-if test "X$XML_CONFIG" != X; then
+if test "X$libxml_source" != X; then
+   CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
+   LIBS="$LIBS $LIBXML_LIBS"
+   AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no)
+-- 
+2.1.0
+
--- a/recipes-support/redland/raptor2_2.0.15.bb
+++ b/recipes-support/redland/raptor2_2.0.15.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Library for parsing and serializing RDF syntaxes"
+LICENSE = "GPLv2 | LGPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+DEPENDS = "libxml2 libxslt curl yajl"
+
+SRC_URI = " \
+    http://download.librdf.org/source/${BPN}-${PV}.tar.gz \
+    file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \
+"
+SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"
+SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " \
+    --without-xml2-config \
+    --without-curl-config \
+    --without-xslt-config \
+"
--- a/recipes-support/redland/rasqal_0.9.33.bb
+++ b/recipes-support/redland/rasqal_0.9.33.bb
@@ -12,5 +12,3 @@ SRC_URI[md5sum] = "1f5def51ca0026cd192958ef07228b52"
 SRC_URI[sha256sum] = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c"

 inherit autotools gtk-doc
-
-LDFLAGS += "-lm"
Author	SHA1	Message	Date
Andreas Müller	8093406d8d	libreoffice: fix unoconv installation Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-11-08 12:06:19 +01:00
Andreas Müller	7f45f34a66	libreoffice(-native): add unoconv It useful on target and during build e.g for converting libreoffice files to pdf Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-11-08 11:38:07 +01:00
Andreas Müller	a09756ea89	libreoffice: further gcc6 fix Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-08-25 12:38:55 +02:00
Andreas Müller	b5ceb5d6c7	libreoffice: fix one build error with later gcc Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-08-25 10:25:04 +02:00
Andreas Müller	b869f6da68	libe-book: fix build for annoying gcc6 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-08-24 17:18:09 +02:00
Andreas Müller	c25a33295e	libetonyek: update to 0.1.5 * fix (native) build with gcc6 * later version are available but they require liblangtag which we do not yet have Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>	2016-08-24 13:06:37 +02:00