libreoffice: upgrade 7.1.2.2 -> 7.1.3.2

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit f36398c316)

README.md

@@ -4,7 +4,7 @@ OE layer for office applications as libreoffice
 
 Layer dependencies:
 ----------------------
-see [layer.conf](conf/layer.conf) for dependencies and https://layers.openembedded.org/layerindex/branch/master/layers/ where to find layers
+see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](https://layers.openembedded.org/layerindex/branch/master/layers/) where to find layers
 
 
 Contributing
@@ -14,11 +14,14 @@ Contributing
 
 Policies
 --------
-* Please do not send private emails to maintainers. For questions/suggestions.. use GitHub issues.
+* **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-office/issues).
 * Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
-  * Use 4 spaces for indention always
+  * Use 4 spaces for indentation always (shell and python code)
   * For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
   * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
+* Be aware that **this layer changes other layer's defaults by bbappends**. Maintainer disagrees with common 'configure to death practice' and won't waste time explaining dozens of knobs that are mandatory to get working/useful builds. See
+  [appends](appends).
+  Pull requests removing appends for sake of magic 'compliant' scripts  are not accepted.
 
 
 Maintainers

appends/harfbuzz/harfbuzz_%.bbappend

@@ -1,4 +1 @@
-DEPENDS += "graphite2"
-
-EXTRA_OECONF_remove = "--without-graphite2"
-EXTRA_OECONF_append = " --with-graphite2"
+PACKAGECONFIG_append = " graphite"

conf/layer.conf

@@ -15,5 +15,9 @@ LAYERDEPENDS_office-layer = " \
     networking-layer \
 "
 
-LAYERSERIES_COMPAT_office-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_office-layer = "dunfell gatesgarth hardknott"
+
+SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
+    libreoffice-dictionaries->hunspell \
+"
 

recipes-abiword/abiword/abiword/libical3.patch

@@ -1,15 +0,0 @@
-Index: src/text/ptbl/xp/pd_DocumentRDF.cpp
-===================================================================
---- a/src/text/ptbl/xp/pd_DocumentRDF.cpp	(revision 35456)
-+++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp	(revision 35457)
-@@ -2266,8 +2266,8 @@
-         icalcomponent_set_uid( c,         m_uid.c_str() );
-         icalcomponent_set_location( c,    m_location.c_str() );
-         icalcomponent_set_description( c, m_desc.c_str() );
--        icalcomponent_set_dtstart( c,     icaltime_from_timet( m_dtstart, 0 ) );
--        icalcomponent_set_dtend( c,       icaltime_from_timet( m_dtend, 0 ) );
-+        icalcomponent_set_dtstart( c,     icaltime_from_timet_with_zone( m_dtstart, 0, NULL ) );
-+        icalcomponent_set_dtend( c,       icaltime_from_timet_with_zone( m_dtend, 0, NULL ) );
- 
-         char* data = icalcomponent_as_ical_string( c );
-         std::ofstream oss( filename.c_str() );

recipes-abiword/abiword/abiword_3.0.4.bb

@@ -27,24 +27,23 @@ RCONFLICTS_${PN} = "${PN}-embedded"
 SRC_URI = " \
     http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
     file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \
-    file://0001-Bug-13770-Require-C-11-from-now-on.patch \
-    file://libical3.patch \
+    file://0002-Bug-13770-Require-C-11-from-now-on.patch \
 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
 
-SRC_URI[md5sum] = "cda6dd58c747c133b421cc7eb18f5796"
-SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522"
+SRC_URI[md5sum] = "04e31887049a8c72297881bc153b77c4"
+SRC_URI[sha256sum] = "e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7"
 
 #want 3.x from 3.x.y for the installation directory
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
-inherit distro_features_check autotools-brokensep pkgconfig
+inherit features_check autotools-brokensep pkgconfig mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 PACKAGECONFIG ??= " \
-    collab-backend-xmpp collab-backend-tcp \
+    collab-backend-xmpp \
     libical \
 "
 PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2"
@@ -81,6 +80,7 @@ FILES_${PN} += " \
     ${libdir}/lib${PN}-*.so \
     ${datadir}/mime-info \
     ${datadir}/icons/* \
+    ${datadir}/appdata \
     ${datadir}/${PN}-${SHRT_VER}/glade \
     ${datadir}/${PN}-${SHRT_VER}/scripts \
     ${datadir}/${PN}-${SHRT_VER}/system.profile-en \

recipes-filter/libcdr/libcdr/0001-Fix-build-with-ICU-68.patch

@@ -0,0 +1,40 @@
+From 489797a235041ca43a288f5ce38aace8975bc987 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 24 Nov 2020 22:23:42 +0100
+Subject: [PATCH] Fix build with ICU >= 68
+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/libcdr_utils.cpp | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp
+index 09ab42e..54a6fa3 100644
+--- a/src/lib/libcdr_utils.cpp
++++ b/src/lib/libcdr_utils.cpp
+@@ -97,6 +97,17 @@ static unsigned short getEncodingFromICUName(const char *name)
+   return 0;
+ }
+ 
++// Since icu 68.1 icu we have to:
++#ifndef TRUE
++// Taken from umachibe.h:
++/**
++ * The TRUE value of a UBool.
++ *
++ * @deprecated ICU 68 Use standard "true" instead.
++ */
++#   define TRUE  true
++#endif
++
+ static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLength)
+ {
+   if (!buffer)
+-- 
+2.26.2
+

recipes-filter/libcdr/libcdr_0.1.7.bb

@@ -4,9 +4,11 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "
-SRC_URI = "https://dev-www.libreoffice.org/src/libcdr/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "3040295f7a027c5bcdffbdb5bbdfd00a"
-SRC_URI[sha256sum] = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"
+SRC_URI = " \
+    https://dev-www.libreoffice.org/src/libcdr/${BPN}-${PV}.tar.xz \
+    file://0001-Fix-build-with-ICU-68.patch \
+"
+SRC_URI[sha256sum] = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"
 
 inherit autotools pkgconfig
 

recipes-filter/libe-book/libe-book/0001-Fix-build-with-ICU-68.patch

@@ -0,0 +1,38 @@
+From 70a92974df1d3b35811c2354fcec00c791159b82 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 24 Nov 2020 22:38:21 +0100
+Subject: [PATCH] Fix build with ICU >= 68
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/lib/EBOOKCharsetConverter.cpp | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/lib/EBOOKCharsetConverter.cpp b/src/lib/EBOOKCharsetConverter.cpp
+index 0d85fa3..2631ba4 100644
+--- a/src/lib/EBOOKCharsetConverter.cpp
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -26,6 +26,17 @@ class ConverterException
+ {
+ };
+ 
++// Since icu 68.1 icu we have to:
++#ifndef TRUE
++// Taken from umachibe.h:
++/**
++ * The TRUE value of a UBool.
++ *
++ * @deprecated ICU 68 Use standard "true" instead.
++ */
++#   define TRUE  true
++#endif
++
+ /** Guess character set of the text.
+ 
+   @param[in] text the text
+-- 
+2.26.2
+

recipes-filter/libe-book/libe-book_0.1.3.bb

@@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
 "
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/libebook/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI = " \
+    https://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz \
+    file://0001-Fix-build-with-ICU-68.patch \
+"
 SRC_URI[md5sum] = "2956f1c5e7950b0018979a132165da8b"
 SRC_URI[sha256sum] = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"
 

recipes-filter/libetonyek/libetonyek/0001-Fix-build-with-gcc-10.patch

@@ -0,0 +1,28 @@
+From 4e4e9ac5990ff2436ed127eff6690b06a68bd034 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 5 Jun 2020 17:35:01 +0200
+Subject: [PATCH] Fix build with gcc 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/lib/NUM3Parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp
+index 6dc0e9a..8290290 100644
+--- a/src/lib/NUM3Parser.cpp
++++ b/src/lib/NUM3Parser.cpp
+@@ -8,6 +8,7 @@
+  */
+ 
+ #include <functional>
++#include <algorithm>
+ 
+ #include "NUM3Parser.h"
+ 
+-- 
+2.26.2
+

recipes-filter/libetonyek/libetonyek_0.1.9.bb

@@ -1,15 +1,17 @@
 SUMMARY = "A library for import of import of Apple iWork documents"
 HOMEPAGE = "http://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
+LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
+
+SRC_URI = " \
+    http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
+    file://0001-Fix-build-with-gcc-10.patch \
 "
-SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "b891c14c5233f93fb7db052b5762a692"
 SRC_URI[sha256sum] = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"
 
 inherit autotools pkgconfig
 
-DEPENDS = "glm mdds icu lcms libxml2 librevenge liblangtag mdds-1.2"
+DEPENDS = "glm icu lcms libxml2 librevenge liblangtag mdds-1.2"
 
 BBCLASSEXTEND = "native"

recipes-filter/libfreehand/files/0003-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch

@@ -0,0 +1,32 @@
+From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 4 Oct 2019 01:46:12 +0200
+Subject: [PATCH] Add missing semicolon to fix build with icu 65.1
+
+Change-Id: I7a0b0d600e9f7770245a7485813a944bfac4f088
+Reviewed-on: https://gerrit.libreoffice.org/80224
+Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
+Tested-by: Miklos Vajna <vmiklos@collabora.com>
+
+Upstream-Status: Applied
+---
+ src/lib/libfreehand_utils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/libfreehand_utils.cpp b/src/lib/libfreehand_utils.cpp
+index 439c457..32f23e0 100644
+--- a/src/lib/libfreehand_utils.cpp
++++ b/src/lib/libfreehand_utils.cpp
+@@ -162,7 +162,7 @@ void libfreehand::_appendUTF16(librevenge::RVNGString &text, std::vector<unsigne
+   while (j < length)
+   {
+     UChar32 c;
+-    U16_NEXT(s, j, length, c)
++    U16_NEXT(s, j, length, c);
+     unsigned char outbuf[U8_MAX_LENGTH+1];
+     int i = 0;
+     U8_APPEND_UNSAFE(&outbuf[0], i, c);
+-- 
+2.23.0
+
+

recipes-filter/libfreehand/libfreehand_0.1.2.bb

@@ -8,6 +8,7 @@ SRC_URI = " \
     http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
     file://0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch \
     file://0002-Fix-build-with-gcc-9.patch \
+    file://0003-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch \
 "
 SRC_URI[md5sum] = "c3788f5686839fd097bd77d8f51c3d04"
 SRC_URI[sha256sum] = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"

recipes-filter/libmspub/libmspub/0001-Fix-build-with-gcc-10.patch

@@ -0,0 +1,30 @@
+From d70bd0844f3e2160dac8538446eb437dc988e4d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 5 Jun 2020 16:51:32 +0200
+Subject: [PATCH] Fix build with gcc 10
+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/MSPUBMetaData.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/MSPUBMetaData.h b/src/lib/MSPUBMetaData.h
+index 9167f4f..7825e37 100644
+--- a/src/lib/MSPUBMetaData.h
++++ b/src/lib/MSPUBMetaData.h
+@@ -13,6 +13,7 @@
+ #include <map>
+ #include <utility>
+ #include <vector>
++#include <cstdint>
+ 
+ #include <librevenge/librevenge.h>
+ 
+-- 
+2.26.2
+

recipes-filter/libmspub/libmspub_0.1.4.bb

@@ -4,7 +4,10 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "
-SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI = " \
+    http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
+    file://0001-Fix-build-with-gcc-10.patch \
+"
 SRC_URI[md5sum] = "ac6fa9c1c05ece27c58c05e11786fd3a"
 SRC_URI[sha256sum] = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"
 

recipes-filter/libmwaw/libmwaw_0.3.17.bb

@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "4cda01e4c03c5d2a0f9b678ec13e0549"
-SRC_URI[sha256sum] = "5396f30a1d459208eef6fdd3d642444fedc3c5c13d2e06372c3d30ef00011805"
+SRC_URI[sha256sum] = "8f81cc27b63d508576a43ef7448f78bec2fde7c7349b08273400e4de897f651c"
 
 inherit autotools-brokensep pkgconfig
 

recipes-filter/libodfgen/libodfgen_0.1.7.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/libwpd/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI = "https://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "ec7ce6c69aac83f8a9e6280d919b3cad"
 SRC_URI[sha256sum] = "323e491f956c8ca2abb12c998e350670930a32317bf9662b0615dd4b3922b831"
 

recipes-libreoffice/libreoffice/files/0002-Fix-build-with-icu-68.patch

@@ -0,0 +1,43 @@
+From 389e500a5bda3c463bc3c57f49c23fcd477ece0d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 2 Dec 2020 22:00:50 +0100
+Subject: [PATCH] Fix build with icu >= 68
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| <...>/i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: ‘TRUE’ was not declared in this scope
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ i18npool/source/calendar/calendar_gregorian.cxx | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
+index b7ae49f..3bb1433 100644
+--- a/i18npool/source/calendar/calendar_gregorian.cxx
++++ b/i18npool/source/calendar/calendar_gregorian.cxx
+@@ -33,6 +33,18 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
++// Since icu 68.1 icu we have to:
++#ifndef TRUE
++// Taken from umachibe.h:
++/**
++ * The TRUE value of a UBool.
++ *
++ * @deprecated ICU 68 Use standard "true" instead.
++ */
++#   define TRUE  true
++#endif
++
++
+ #define erDUMP_ICU_CALENDAR 0
+ #define erDUMP_I18N_CALENDAR 0
+ #if erDUMP_ICU_CALENDAR || erDUMP_I18N_CALENDAR
+-- 
+2.26.2
+

recipes-libreoffice/libreoffice/libreoffice-native.bb

@@ -34,7 +34,6 @@ DEPENDS += " \
     libexttextcat-native \
     hyphen-native \
     unzip-native \
-    neon-native \
     liblangtag-native \
     lpsolve-native \
     libwpd-native \
@@ -44,6 +43,7 @@ DEPENDS += " \
     libmspub-native \
     libmwaw-native \
     libodfgen-native \
+    mdds-1.5-native \
 "
 
 SRC_URI += " \

recipes-libreoffice/libreoffice/libreoffice-native/0002-cppuhelper-defaultbootstrap-output-debug-information.patch

@@ -19,8 +19,8 @@ index 945268b..3259d43 100644
 --- a/cppuhelper/source/defaultbootstrap.cxx
 +++ b/cppuhelper/source/defaultbootstrap.cxx
 @@ -11,6 +11,7 @@
+ #include <sal/config.h>
  
- #include <cassert>
  #include <vector>
 +#include <stdio.h>
  

recipes-libreoffice/libreoffice/libreoffice-version.inc

@@ -1,9 +1,5 @@
-PV = "6.3.3.2"
-DIRV = "6.3.3"
+PV = "7.1.3.2"
+DIRV = "7.1.3"
 
-SRC_URI += " \
-    http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
-"
-
-SRC_URI[md5sum] = "2cecdd24f36fbc2e2276e453658381e8"
-SRC_URI[sha256sum] = "d40ee5b29c9a0c2f0df2681f993b04a9f64e13d785fa7b7a1e8349b84149e5cf"
+SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz"
+SRC_URI[sha256sum] = "35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf"

recipes-libreoffice/libreoffice/libreoffice.bb

@@ -1,6 +1,8 @@
 require ${BPN}.inc
 
-inherit gobject-introspection bash-completion gtk-icon-cache
+inherit gobject-introspection bash-completion gtk-icon-cache mime mime-xdg
+
+MIME_XDG_PACKAGES = "${PN}"
 
 SRC_URI += " \
     http://download.documentfoundation.org/libreoffice/src/${DIRV}/${BPN}-translations-${PV}.tar.xz;name=translations \
@@ -9,15 +11,14 @@ SRC_URI += " \
     file://0003-remove-paths-for-gb_Executable_get_command.patch \
     file://0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch \
     file://0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch \
-    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-Use-wrappers-for-gobject-introspection.patch \
-    file://0011-Fix-build-with-poppler-0.82.patch \
+    file://0006-Package.mk-workaround-icu-missing-error-for-without-.patch \
+    file://0007-configure.ac-avoid-finding-calling-pg_config.patch \
+    file://0008-avoid-downloading-by-git-submodules.patch \
+    file://0009-Use-wrappers-for-gobject-introspection.patch \
+    file://0010-Support-install-to-find-bash-completion.in.patch \
 "
 
-SRC_URI[translations.md5sum] = "fcaa3bf5996b0c3cb3e92884b601da54"
-SRC_URI[translations.sha256sum] = "721b760b7a9dc88e7d278dab89a2148a4e9239047f7b8f9ee6741c0f8f84b2fb"
+SRC_URI[translations.sha256sum] = "86138935d274d46d27e4ce92a72d759e7d4491d7b227be952e05735ba5c9b327"
 
 DEPENDS += " \
     ${BPN}-native \
@@ -31,7 +32,6 @@ DEPENDS += " \
     nss \
     zlib \
     jpeg \
-    neon \
     libpng \
     apr \
     serf \
@@ -72,6 +72,7 @@ DEPENDS += " \
     liblangtag \
     lpsolve \
     gpgme \
+    mdds-1.5 \
 "
 
 # necessary to let the call for python-config succeed
@@ -83,18 +84,12 @@ export STAGING_INCDIR
 # Notes:
 #
 # 1. By default many many sources are downloaded from libreoffice mirrors.
-# This can be avoided by --with-system-.. To see what's still loaded check
-# log.do_compile.
-#
-# 2. problems during configure detected for (TBD?)
-# * boost: 'configure: error: Could not find a version of the library!'
-#
-# 3. in case of trouble in do_compile: configure with --enable-verbose might
-# help detecting culprit
-#
-# 5. --enable-scripting-javascript / rhino meta-java
-# 6. Libreoffice Base embedded db / hsqldb meta-java
-# 7. galleries fail to build / prebuild from external sources?
+#    This can be avoided by --with-system-.. To see what's still loaded check
+#    log.do_compile.
+# 2. in case of trouble in do_compile: configure with --enable-verbose might
+#    help detecting culprit
+# 3. --enable-scripting-javascript / rhino meta-java
+# 4. Libreoffice Base embedded db / hsqldb meta-java
 
 EXTRA_OECONF += " \
     --without-java \
@@ -129,22 +124,21 @@ EXTRA_OECONF += " \
     --with-system-mythes \
     --with-system-altlinuxhyph \
     --with-system-gpgmepp \
+    \
+    --with-external-dict-dir=${datadir}/hunspell \
+    --with-system-dicts \
 "
 
-CXXFLAGS += "-DGLM_ENABLE_EXPERIMENTAL=1"
-
 PACKAGECONFIG ??= " \
     gtk3 \
     mariadb \
     postgresql \
 "
 
-PACKAGECONFIG[gtk] = "--enable-gtk , --disable-gtk, gtk+ cairo"
 PACKAGECONFIG[gtk3] = "--enable-gtk3 , --disable-gtk3, gtk+3 cairo"
 PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi"
 PACKAGECONFIG[odk] = "--enable-odk, --disable-odk"
-
-PACKAGECONFIG[mariadb] = "--with-system-mariadb, --disable-ext-mariadb-connector, mariadb"
+PACKAGECONFIG[mariadb] = "--with-system-mariadb, , mariadb"
 PACKAGECONFIG[postgresql] = "--enable-postgresql-sdbc --with-system-postgresql, --disable-postgresql-sdbc, postgresql"
 
 do_configure() {
@@ -176,41 +170,52 @@ do_configure() {
     sed -i 's:-I${includedir}/gpgme++:-I${STAGING_INCDIR}/gpgme++:g' ${B}/config_host.mk
 }
 
-do_install() {
+do_compile_prepend() {
     # INTROSPECTION_SCANNER is exprted but INTROSPECTION_COMPILER is not. This
-    # caused silent 'Permission denied' errors. So give a little help:
+    # caused 'Permission denied' errors. So give a little help:
     export INTROSPECTION_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper
+}
 
+do_install() {
     make DESTDIR=${D} distro-pack-install
 
-    chown -R root:root ${D}${libdir}/girepository-1.0
+    # install LibreOfficeKit (gobject-introspection) manually - became necessary since 6.4.x
+    install -m 0755 -d ${D}${libdir}/girepository-1.0
+    install -m 0644 ${B}/workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.typelib ${D}${libdir}/girepository-1.0/
+    install -m 0755 -d ${D}${libdir}/gir-1.0
+    install -m 0644 ${B}/workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.gir ${D}${libdir}/gir-1.0/
+    install -m 0755 ${B}/instdir/program/liblibreofficekitgtk.so ${D}${libdir}/
+    # install LibreOfficeKit headers
+    install -m 0755 -d ${D}${includedir}/LibreOfficeKit
+    install -m 0644 ${S}/include/LibreOfficeKit/* ${D}${includedir}/LibreOfficeKit/
 
     # unoconv
     install -d ${D}${bindir}
     install -m 0755 ${WORKDIR}/git/unoconv/unoconv ${D}/${bindir}
+
+    # remove some unneeded files
+    rm -rf ${D}${libdir}/libreoffice/readmes
+    rm -rf ${D}${libdir}/libreoffice/share/theme_definitions/ios
+    rmdir ${D}${libdir}/libreoffice/share/theme_definitions
 }
 
 
 FILES_${PN} += " \
-    ${datadir}/mime \
-    ${datadir}/application-registry \
-    ${datadir}/mimelnk \
     ${datadir}/icons \
-    ${datadir}/appdata \
-    ${datadir}/mime-info \
-    ${datadir}/mime/packages \
+    ${datadir}/metainfo \
+    ${datadir}/mime \
 "
 
-FILES_${PN}-dev += "\
-    ${datadir}/gir-1.0 \
-"
+PACKAGES =+ "${PN}-odk ${PN}-officekit"
 
-PACKAGE_BEFORE_PN += "${PN}-odk"
-FILES_${PN}-odk = " \
-    ${libdir}/libreoffice/sdk \
-"
+FILES_${PN}-odk = "${libdir}/libreoffice/sdk"
 INSANE_SKIP_${PN}-odk += "dev-so staticdev"
 
+FILES_${PN}-officekit = " \
+    ${libdir}/girepository-1.0 \
+    ${libdir}/liblibreofficekitgtk.so \
+"
+
 # based http://pkgs.fedoraproject.org/cgit/rpms/libreoffice.git/tree/libreoffice.spec
 LO_LANGUAGE_FILES = " \
     ${libdir}/libreoffice/share/autocorr/*%{1}.dat \
@@ -299,3 +304,5 @@ python lo_do_split_locales() {
 }
 
 PACKAGESPLITFUNCS_prepend = "lo_do_split_locales "
+
+RDEPENDS_${PN} = "hunspell-dictionaries"

recipes-libreoffice/libreoffice/libreoffice.inc

@@ -1,4 +1,4 @@
-DESCRIPTION = "Libre office base"
+SUMMARY = "Libre office base"
 LICENSE = "GPLv3 & LGPLv3 & MPLv1.1"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
@@ -11,6 +11,7 @@ require libreoffice-version.inc
 SRC_URI += " \
     git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
     file://0001-Workaround-boost-library-detection-failures.patch \
+    file://0002-Fix-build-with-icu-68.patch \
 "
 SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
 
@@ -29,6 +30,7 @@ EXTRA_OECONF = " \
     --without-doxygen \
     --enable-release-build \
     --enable-python=system \
+    --disable-skia \
     ${@oe.utils.parallel_make_argument(d, '--with-parallelism=%d')} \
     \
     --with-system-boost \
@@ -65,7 +67,6 @@ EXTRA_OECONF = " \
     --with-system-libvisio \
     --with-system-libexttextcat \
     --with-system-altlinuxhyph \
-    --with-system-neon \
     --with-system-librevenge \
     --with-system-libabw \
     --with-system-libcdr \
@@ -80,7 +81,5 @@ EXTRA_OECONF = " \
     --with-system-libcdr \
     --with-system-libmspub \
     --with-system-libmwaw \
+    --with-system-mdds \
 "
-
-# TODO mdds
-

recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch

@@ -19,7 +19,7 @@ index 393e94f..5cdb930 100644
 +++ b/Makefile.in
 @@ -280,7 +280,7 @@ bootstrap: check-if-root compilerplugins
  # Note: this will pipe through all gbuild targets to ... gbuild
- #       with some translations like "build"->"all" for historic reasons
+ #       with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons
  #
 -build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \
 +build: bootstrap fetch \

recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch

@@ -1,43 +1,40 @@
 From 900b79ed77cd5c126cc4ac9beef488a94ef57b06 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 20 Nov 2015 22:03:58 +0100
+Date: Sat, 3 Oct 2020 14:05:48 +0200
 Subject: [PATCH] ensure that native gendict build by libreoffice is used
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-This is neccessary since last commit using all helpers from native sysroot
-
 Upstream-Status: Inappropriate [oe specific]
 
-Change-Id: I0afbd760bc8810396e04a5e276a68a810042b057
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
  i18npool/CustomTarget_breakiterator.mk | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
-index 4aaf2e5..5837bc8 100644
+index dee46a3..fab7ddf 100644
 --- a/i18npool/CustomTarget_breakiterator.mk
 +++ b/i18npool/CustomTarget_breakiterator.mk
-@@ -22,7 +22,7 @@ $(i18npool_BIDIR)/dict_%.data : \
- 		| $(i18npool_BIDIR)/.dir
+@@ -23,7 +23,7 @@ $(i18npool_BIDIR)/dict_%.data : \
  	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
+ 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC)
  	$(call gb_Helper_abbreviate_dirs,\
 -		$(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
 +		$(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
+ 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC)
  else
  
- $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
-@@ -34,7 +34,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
- 		| $(i18npool_BIDIR)/.dir
+@@ -37,7 +37,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
  	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
+ 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC)
  	$(call gb_Helper_abbreviate_dirs,\
 -		$(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
 +		$(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
+ 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC)
  
  endif
- 
 -- 
-2.1.0
+2.26.2
 

recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch

@@ -27,7 +27,7 @@ index c03bbbc..40b5865 100644
 +				-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build_native,saxparser))) && \
  		sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \
  		rm $$@.tmp)
- 
+ 	$$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),SAX)
 diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
 index 2611d94..d6a1997 100644
 --- a/solenv/gbuild/TargetLocations.mk

recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch

@@ -9,23 +9,29 @@ Content-Transfer-Encoding: 8bit
 
 Upstream-Status: Inappropriate [oe specific]
 
+Sun, 2 Feb 2020:
+Adjusted for 6.4.0.3
+
+Sat, 3 Oct 2020
+Adjusted for 7.0.2.2
+
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
  solenv/gbuild/Package.mk | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
-index 841e819..e5acd28 100644
+index 90e2280..0920cf2 100644
 --- a/solenv/gbuild/Package.mk
 +++ b/solenv/gbuild/Package.mk
-@@ -79,7 +79,6 @@ $(call gb_Package_get_preparation_target,%) :
- # Package_foo makefiles.
+@@ -80,7 +80,6 @@ $(call gb_Package_get_preparation_target,%) :
  $(call gb_Package_get_target,%) :
  	$(call gb_Output_announce,$*,$(true),PKG,2)
+ 	$(call gb_Trace_StartRange,$*,PKG)
 -	$(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
  	rm -f $@ && \
  	mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
- 
+ 	$(call gb_Trace_EndRange,$*,PKG)
 -- 
-2.21.0
+2.26.2
 

recipes-libreoffice/libreoffice/libreoffice/0006-make-sure-that-gengal-uses-native-libraries.patch

@@ -1,33 +0,0 @@
-From 8f21c644930042bca1725b9547f4a4585fe79784 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 9 Dec 2015 23:20:14 +0100
-Subject: [PATCH] make sure that gengal uses native libraries
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [cross specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- solenv/gbuild/Gallery.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
-index 2ce708d..44d1bf4 100644
---- a/solenv/gbuild/Gallery.mk
-+++ b/solenv/gbuild/Gallery.mk
-@@ -23,8 +23,8 @@ define gb_Gallery__make_env_args
- 		$(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \
- "-env:UNO_TYPES=$(foreach item,offapi udkapi,\
- 	$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
---env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD)) \
---env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD))
-+-env:URE_INTERNAL_LIB_DIR=%STAGING_LIBDIR_NATIVE% \
-+-env:LO_LIB_DIR=%STAGING_LIBDIR_NATIVE%
- endef
- 
- define gb_Gallery__command
--- 
-2.5.0
-

recipes-libreoffice/libreoffice/libreoffice/0009-Use-wrappers-for-gobject-introspection.patch

@@ -0,0 +1,49 @@
+From ed13bcd91383a5edcf2010953cf3287b8b26de9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 5 Aug 2019 21:37:07 +0200
+Subject: [PATCH] Use wrappers for gobject-introspection
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With INTROSPECTION_COMPILER not set by configure it is:
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Sun, 2 Feb 2020:
+Adjusted for 6.4.0.3
+
+Mon, 8 Feb 2021
+Adjusted for 7.1.0.3
+
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ sysui/CustomTarget_share.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
+index 1f578f5..2a3aac5 100644
+--- a/sysui/CustomTarget_share.mk
++++ b/sysui/CustomTarget_share.mk
+@@ -167,7 +167,7 @@ ifneq ($(INTROSPECTION_SCANNER),)
+ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \
+ 		$(call gb_Library_get_target,libreofficekitgtk)
+ 	mkdir -p $(dir $@)
+-	PYTHONWARNINGS=default g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
++	PYTHONWARNINGS=default ${INTROSPECTION_SCANNER} "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
+ 				 "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
+                  `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` \
+ 				 -I"${SRCDIR}/include/" \
+@@ -179,7 +179,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \
+ 				 --output="$@" --warn-all --no-libtool
+ 
+ $(share_WORKDIR)/%/LOKDocView-0.1.typelib: $(share_WORKDIR)/%/LOKDocView-0.1.gir
+-	g-ir-compiler "$<" --output="$@"
++	${INTROSPECTION_COMPILER} "$<" --output="$@"
+ 
+ endif
+ 
+-- 
+2.26.2
+

recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch

@@ -0,0 +1,37 @@
+From 9869faf9f67c1bf53b47e20c89f186d7e222acc5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 29 Feb 2020 19:05:07 +0100
+Subject: [PATCH] Support install to find bash-completion.in
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| Error: can't open bin/bash-completion.in for reading: [Errno 2] No such file or directory: 'bin/bash-completion.in'
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ bin/distro-install-desktop-integration | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
+index 1da104e..42991f8 100755
+--- a/bin/distro-install-desktop-integration
++++ b/bin/distro-install-desktop-integration
+@@ -176,10 +176,10 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" >>$DESTDIR/gid_
+ 
+ # create bash completion
+ mkdir -p $DESTDIR/usr/share/bash-completion/completions
+-"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
++"${SRCDIR?}"/bin/generate-bash-completion.py "${SRCDIR?}"/bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
+ test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
+ if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
+-    "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
++    "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers "${SRCDIR?}"/bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
+     test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
+ fi
+ 
+-- 
+2.21.0
+

recipes-libreoffice/libreoffice/libreoffice/0010-Use-wrappers-for-gobject-introspection.patch

@@ -1,41 +0,0 @@
-From ed13bcd91383a5edcf2010953cf3287b8b26de9a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 5 Aug 2019 21:37:07 +0200
-Subject: [PATCH] Use wrappers for gobject-introspection
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With INTROSPECTION_COMPILER not set by configure it is:
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- sysui/desktop/share/create_tree.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
-index 9fc2b99..c49b0b6 100755
---- a/sysui/desktop/share/create_tree.sh
-+++ b/sysui/desktop/share/create_tree.sh
-@@ -86,7 +86,7 @@ cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIX
- # Generate gobject-introspection files
- if [ -n "$INTROSPECTION_SCANNER" ]; then
-     mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0"
--    g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
-+    ${INTROSPECTION_SCANNER} "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
-                  `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \
-                  --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
-                  --library=libreofficekitgtk --library-path="${INSTDIR}/program" \
-@@ -95,6 +95,6 @@ if [ -n "$INTROSPECTION_SCANNER" ]; then
-                  --output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool
- 
-     mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0"
--    g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
-+    ${INTROSPECTION_COMPILER} "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
-                   --output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib"
- fi
--- 
-2.21.0
-

recipes-libreoffice/libreoffice/libreoffice/0011-Fix-build-with-poppler-0.82.patch

@@ -1,128 +0,0 @@
-From 2eadd46ab81058087af95bdfc1fea28fcdb65998 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <oss@cogitri.dev>
-Date: Sat, 26 Oct 2019 14:11:35 +0200
-Subject: [PATCH] Fix build with poppler-0.82
-
-Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc
-Reviewed-on: https://gerrit.libreoffice.org/81545
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <michael.stahl@cib.de>
-
-Upstream-Status: Applied [1]
-
-[1] https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998
----
- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx  | 25 +++++++++++++++++++
- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx  | 16 +++++++++++-
- 2 files changed, 40 insertions(+), 1 deletion(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index ce32a4139c45..3ae3bdc503e0 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state)
-     local offset of character (zero for horizontal writing mode). not
-     taken into account for output pos updates. Used for vertical writing.
-  */
-+
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+void PDFOutDev::drawChar(GfxState *state, double x, double y,
-+                         double dx, double dy,
-+                         double originX, double originY,
-+                         CharCode, int /*nBytes*/, const Unicode *u, int uLen)
-+{
-+#else
- void PDFOutDev::drawChar(GfxState *state, double x, double y,
-                          double dx, double dy,
-                          double originX, double originY,
-                          CharCode, int /*nBytes*/, Unicode *u, int uLen)
- {
-+#endif
-     assert(state);
- 
-     if( u == nullptr )
-@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
-     writeBinaryBuffer(aBuf);
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
-+                          int width, int height, GfxImageColorMap* colorMap,
-+                          poppler_bool /*interpolate*/,
-+                          const int* maskColors, poppler_bool /*inlineImg*/ )
-+{
-+#else
- void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
-                           int width, int height, GfxImageColorMap* colorMap,
-                           poppler_bool /*interpolate*/,
-                           int* maskColors, poppler_bool /*inlineImg*/ )
- {
-+#endif
-     if (m_bSkipImages)
-         return;
-     OutputBuffer aBuf; initBuf(aBuf);
-@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
-         {
-             GfxRGB aMinRGB;
-             colorMap->getColorSpace()->getRGB(
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+                reinterpret_cast<const GfxColor*>(maskColors),
-+#else
-                 reinterpret_cast<GfxColor*>(maskColors),
-+#endif
-                 &aMinRGB );
- 
-             GfxRGB aMaxRGB;
-             colorMap->getColorSpace()->getRGB(
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+                reinterpret_cast<const GfxColor*>(maskColors)+gfxColorMaxComps,
-+#else
-                 reinterpret_cast<GfxColor*>(maskColors)+gfxColorMaxComps,
-+#endif
-                 &aMaxRGB );
- 
-             aMaskBuf.push_back( colToByte(aMinRGB.r) );
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 1a0c3f0caad1..02f6b59f6f15 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -232,10 +232,17 @@ namespace pdfi
-         virtual void eoClip(GfxState *state) override;
- 
-         //----- text drawing
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+        virtual void drawChar(GfxState *state, double x, double y,
-+                              double dx, double dy,
-+                              double originX, double originY,
-+                              CharCode code, int nBytes, const Unicode *u, int uLen) override;
-+#else
-         virtual void drawChar(GfxState *state, double x, double y,
-                               double dx, double dy,
-                               double originX, double originY,
-                               CharCode code, int nBytes, Unicode *u, int uLen) override;
-+#endif
- #if POPPLER_CHECK_VERSION(0, 64, 0)
-         virtual void drawString(GfxState *state, const GooString *s) override;
- #else
-@@ -248,10 +255,17 @@ namespace pdfi
-                                    int width, int height, poppler_bool invert,
-                                    poppler_bool interpolate,
-                                    poppler_bool inlineImg) override;
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-                                int width, int height, GfxImageColorMap *colorMap,
-                                poppler_bool interpolate,
--                               int* maskColors, poppler_bool inlineImg) override;
-+                               const int* maskColors, poppler_bool inlineImg) override;
-+#else
-+        virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-+                       int width, int height, GfxImageColorMap *colorMap,
-+                       poppler_bool interpolate,
-+                       int* maskColors, poppler_bool inlineImg) override;
-+#endif
-         virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
-                                      int width, int height,
-                                      GfxImageColorMap *colorMap,
--- 
-2.21.0
-

recipes-support/graphite2/graphite2.bb

@@ -0,0 +1,17 @@
+SUMMARY = "Font rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE = "http://sourceforge.net/projects/silgraphite"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b0452d508cc4eb104de0226a5b0c8786"
+
+inherit cmake
+
+DEPENDS += "freetype"
+
+SRC_URI = "git://github.com/silnrsi/graphite.git"
+SRCREV = "92f59dcc52f73ce747f1cdc831579ed2546884aa"
+PV = "1.3.14"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
+
+BBCLASSEXTEND = "native"

recipes-support/graphite2/graphite2_1.3.13.bb

@@ -1,18 +0,0 @@
-SUMMARY = "Font rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE = "http://sourceforge.net/projects/silgraphite"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b0452d508cc4eb104de0226a5b0c8786"
-
-inherit cmake
-
-DEPENDS += "freetype"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/silgraphite/${BPN}/${BPN}-${PV}.tgz"
-SRC_URI[md5sum] = "29616d4f9651706036ca25c111508272"
-SRC_URI[sha256sum] = "dd63e169b0d3cf954b397c122551ab9343e0696fb2045e1b326db0202d875f06"
-
-EXTRA_OECMAKE += " \
-    -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-"
-
-BBCLASSEXTEND = "native"

recipes-support/gtkmathview/gtkmathview_0.8.0.bb

@@ -18,7 +18,7 @@ SRC_URI = " \
 SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec"
 S = "${WORKDIR}/git"
 
-inherit distro_features_check autotools pkgconfig
+inherit features_check autotools pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "x11"
 

recipes-support/libexttextcat/libexttextcat_3.4.5.bb

@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "bfa7107c27afda3a3afa4b7ab5a3fe17"
-SRC_URI[sha256sum] = "f24c086cf3523424228ed58b9f678cc7647688822e5407d5fbc155fbfc846293"
+SRC_URI[md5sum] = "69c984b1785b56942179eb0ddc9c758f"
+SRC_URI[sha256sum] = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"
 
 inherit autotools pkgconfig
 

recipes-support/liblangtag/liblangtag_0.6.3.bb

@@ -12,8 +12,8 @@ SRC_URI = " \
     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"
+SRC_URI[md5sum] = "015274eb284b1dc82bf7af1d1774ec64"
+SRC_URI[sha256sum] = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd"
 
 inherit autotools pkgconfig gobject-introspection
 

recipes-support/mdds/mdds-1.5_1.5.0.bb

@@ -1,7 +1,7 @@
 SUMMARY = "A collection of multi-dimensional data structures and indexing algorithms"
 HOMEPAGE = "https://gitlab.com/mdds/mdds"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=60a6093677ded88b5e28677e52a0c011"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=60a6093677ded88b5e28677e52a0c011"
 
 inherit autotools-brokensep pkgconfig
 
@@ -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] = "0a30078082ea1cd50f32ec69499182db"
-SRC_URI[sha256sum] = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"
+SRC_URI[md5sum] = "52cb08e92fec8842a3724bd89051f9d3"
+SRC_URI[sha256sum] = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d"
 
 S = "${WORKDIR}/mdds-${PV}"
 

recipes-support/mdds/mdds_0.12.1.bb

@@ -1,16 +0,0 @@
-SUMMARY = "A collection of multi-dimensional data structures and indexing algorithms"
-HOMEPAGE = "https://gitlab.com/mdds/mdds"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7371ccd26e1d800140423a16d724333e"
-
-inherit autotools-brokensep pkgconfig
-
-SRC_URI = "http://kohei.us/files/${BPN}/src/${BPN}_${PV}.tar.bz2"
-SRC_URI[md5sum] = "ef2560ed5416652a7fe195305b14cebe"
-SRC_URI[sha256sum] = "23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d"
-
-S = "${WORKDIR}/${BPN}_${PV}"
-
-DEPENDS = "boost"
-
-BBCLASSEXTEND = "native"

recipes-support/t1lib/t1lib_5.1.2.bb

@@ -17,7 +17,7 @@ SRC_URI = " \
 SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c"
 SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59"
 
-inherit autotools-brokensep distro_features_check
+inherit autotools-brokensep features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 

recipes-support/xlnt/xlnt_git.bb

@@ -8,6 +8,6 @@ inherit cmake
 #DEPENDS += "freetype"
 
 SRC_URI = "git://github.com/tfussell/xlnt.git"
-SRCREV = "f30260153fcee7e1f775f25ff0cb2750e7826296"
+SRCREV = "e2262a0c65384416c8fb9263a057e7d0d3e381f6"
 S = "${WORKDIR}/git"
-PV = "1.3.0+git${SRCPV}"
+PV = "1.4.0+git${SRCPV}"