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
102 changed files with 1032 additions and 2593 deletions
--- a/15
+++ b/15
@@ -0,0 +1,15 @@
+This layer depends on:
+
+URI: git://git.openembedded.org/openembedded-core
+branch: master
+revision: HEAD
+
+URI: git://git.openembedded.org/meta-openembedded
+branch: master
+revision: HEAD
+
+Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-office]' in the subject'
+
+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@googlemail.com>
--- a/README.md
+++ b/README.md
@@ -1,30 +0,0 @@
-OE layer for office applications as libreoffice
-----------------------------------------------
-
-
-Layer dependencies:
----------------------
-see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](https://layers.openembedded.org/layerindex/branch/master/layers/) where to find layers
-
-
-Contributing
------------
-* Submit any patches against the `meta-office` layer by using the GitHub pull-request feature.
-
-
-Policies
--------
-* **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 indentation always (shell and python code)
-  * For splitting of long list values use four-space indentation on successive 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 accepted 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
-----------
-
-Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
--- a/appends/harfbuzz/harfbuzz_%.bbappend
+++ b/appends/harfbuzz/harfbuzz_%.bbappend
@@ -1 +0,0 @@
-PACKAGECONFIG_append = " graphite"
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -1,23 +1,8 @@
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"

-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/appends/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"

 BBFILE_COLLECTIONS += "office-layer"
 BBFILE_PATTERN_office-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_office-layer = "7"
-
-LAYERDEPENDS_office-layer = " \
-    core \
-    openembedded-layer \
-    meta-python \
-    gnome-layer \
-    networking-layer \
-"
-
-LAYERSERIES_COMPAT_office-layer = "dunfell gatesgarth hardknott"
-
-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
-    libreoffice-dictionaries->hunspell \
-"
-
--- a/recipes-abiword/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
+++ b/recipes-abiword/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
@@ -1,39 +0,0 @@
-From c646159ce817506131b58fdab1cdc1cd6364df7a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 7 Feb 2016 21:45:20 +0100
-Subject: [PATCH] plugins/aiksaurus/Makefile.am: remove uncomplete options
- WITH_BUILTIN_AIKSAURUS_GTK
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* with gtk2 we won't use it
-* it is missing in configure.ac causing
-
-| plugins/aiksaurus/Makefile.am:5: error: WITH_BUILTIN_AIKSAURUS_GTK does not appear in AM_CONDITIONAL
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- plugins/aiksaurus/Makefile.am | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/plugins/aiksaurus/Makefile.am b/plugins/aiksaurus/Makefile.am
-index d402c58..1034e2a 100644
--- a/plugins/aiksaurus/Makefile.am
-+++ b/plugins/aiksaurus/Makefile.am
-@@ -2,10 +2,6 @@ SUBDIRS =
- 
- if TOOLKIT_GTK
- 
-if WITH_BUILTIN_AIKSAURUS_GTK
-SUBDIRS += aiksaurusgtk3
-platform_lib = aiksaurusgtk3/libAiksaurusGtk3.la
-endif
- 
- endif
- 
-- 
-2.5.0
-
--- a/recipes-abiword/abiword/abiword/0002-Bug-13770-Require-C-11-from-now-on.patch
+++ b/recipes-abiword/abiword/abiword/0002-Bug-13770-Require-C-11-from-now-on.patch
@@ -1,180 +0,0 @@
-From f6d0dc338fe867c1b064682ae7f15bffe019b306 Mon Sep 17 00:00:00 2001
-From: Hubert Figuiere <hub@figuiere.net>
-Date: Tue, 12 Apr 2016 02:55:47 +0000
-Subject: [PATCH] Bug 13770 - Require C++11 from now on.
-
-git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35197 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
-
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- ax_cxx_compile_stdcxx_11.m4  | 133 +++++++++++++++++++++++++++++++++++
- configure.ac                 |   1 +
- src/wp/ap/gtk/ap_UnixApp.cpp |   2 +-
- 3 files changed, 135 insertions(+), 1 deletion(-)
- create mode 100644 ax_cxx_compile_stdcxx_11.m4
-
-diff --git a/ax_cxx_compile_stdcxx_11.m4 b/ax_cxx_compile_stdcxx_11.m4
-new file mode 100644
-index 0000000..af37acd
--- /dev/null
-+++ b/ax_cxx_compile_stdcxx_11.m4
-@@ -0,0 +1,133 @@
-+# ============================================================================
-+#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-+# ============================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
-+#
-+# DESCRIPTION
-+#
-+#   Check for baseline language coverage in the compiler for the C++11
-+#   standard; if necessary, add switches to CXXFLAGS to enable support.
-+#
-+#   The first argument, if specified, indicates whether you insist on an
-+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-+#   -std=c++11).  If neither is specified, you get whatever works, with
-+#   preference for an extended mode.
-+#
-+#   The second argument, if specified 'mandatory' or if left unspecified,
-+#   indicates that baseline C++11 support is required and that the macro
-+#   should error out if no mode with that support is found.  If specified
-+#   'optional', then configuration proceeds regardless, after defining
-+#   HAVE_CXX11 if and only if a supporting mode is found.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved. This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 3
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
-+  template <typename T>
-+    struct check
-+    {
-+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+    };
-+
-+    typedef check<check<bool>> right_angle_brackets;
-+
-+    int a;
-+    decltype(a) b;
-+
-+    typedef check<int> check_type;
-+    check_type c;
-+    check_type&& cr = static_cast<check_type&&>(c);
-+
-+    auto d = a;
-+])
-+
-+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
-+  m4_if([$1], [], [],
-+        [$1], [ext], [],
-+        [$1], [noext], [],
-+        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
-+  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
-+        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
-+        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
-+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
-+  AC_LANG_PUSH([C++])dnl
-+  ac_success=no
-+  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
-+  ax_cv_cxx_compile_cxx11,
-+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+    [ax_cv_cxx_compile_cxx11=yes],
-+    [ax_cv_cxx_compile_cxx11=no])])
-+  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
-+    ac_success=yes
-+  fi
-+
-+  m4_if([$1], [noext], [], [dnl
-+  if test x$ac_success = xno; then
-+    for switch in -std=gnu++11 -std=gnu++0x; do
-+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-+                     $cachevar,
-+        [ac_save_CXXFLAGS="$CXXFLAGS"
-+         CXXFLAGS="$CXXFLAGS $switch"
-+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+          [eval $cachevar=yes],
-+          [eval $cachevar=no])
-+         CXXFLAGS="$ac_save_CXXFLAGS"])
-+      if eval test x\$$cachevar = xyes; then
-+        CXXFLAGS="$CXXFLAGS $switch"
-+        ac_success=yes
-+        break
-+      fi
-+    done
-+  fi])
-+
-+  m4_if([$1], [ext], [], [dnl
-+  if test x$ac_success = xno; then
-+    for switch in -std=c++11 -std=c++0x; do
-+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-+                     $cachevar,
-+        [ac_save_CXXFLAGS="$CXXFLAGS"
-+         CXXFLAGS="$CXXFLAGS $switch"
-+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+          [eval $cachevar=yes],
-+          [eval $cachevar=no])
-+         CXXFLAGS="$ac_save_CXXFLAGS"])
-+      if eval test x\$$cachevar = xyes; then
-+        CXXFLAGS="$CXXFLAGS $switch"
-+        ac_success=yes
-+        break
-+      fi
-+    done
-+  fi])
-+  AC_LANG_POP([C++])
-+  if test x$ax_cxx_compile_cxx11_required = xtrue; then
-+    if test x$ac_success = xno; then
-+      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-+    fi
-+  else
-+    if test x$ac_success = xno; then
-+      HAVE_CXX11=0
-+      AC_MSG_NOTICE([No compiler with C++11 support was found])
-+    else
-+      HAVE_CXX11=1
-+      AC_DEFINE(HAVE_CXX11,1,
-+                [define if the compiler supports basic C++11 syntax])
-+    fi
-+
-+    AC_SUBST(HAVE_CXX11)
-+  fi
-+])
-diff --git a/configure.ac b/configure.ac
-index 48228be..f7be7de 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -131,6 +131,7 @@ win_pkgs="$enchant_req"
- 
- AC_PROG_CC
- AC_PROG_CXX
-+AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
- #AC_PROG_OBJC
- AC_PROG_INSTALL
- # For libtool 1.5.x compatability (AC_PROG_LIBTOOL is deprecated version of LT_INIT)
-diff --git a/src/wp/ap/gtk/ap_UnixApp.cpp b/src/wp/ap/gtk/ap_UnixApp.cpp
-index 061a304..260f8e5 100644
--- a/src/wp/ap/gtk/ap_UnixApp.cpp
-+++ b/src/wp/ap/gtk/ap_UnixApp.cpp
-@@ -863,7 +863,7 @@ static bool is_so (const char *file) {
- 	if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename
- 		return false;
- 	const char *suffix = file+(len-3);
-	if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
-+	if(0 == strcmp (suffix, "." G_MODULE_SUFFIX))
- 		return true;
- 	return false;
- }
--- a/recipes-abiword/abiword/abiword_3.0.4.bb
+++ b/recipes-abiword/abiword/abiword_3.0.4.bb
@@ -1,145 +0,0 @@
-SUMMARY = "AbiWord is free word processing program similar to Microsoft(r) Word"
-HOMEPAGE = "http://www.abiword.org"
-SECTION = "x11/office"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
-DEPENDS  = " \
-    perl-native \
-    gtk+ \
-    gtkmathview \
-    wv \
-    fribidi \
-    jpeg \
-    libpng \
-    librsvg \
-    libwmf-native \
-    asio \
-    evolution-data-server \
-    libxslt \
-    redland rasqal \
-"
-RDEPENDS_${PN}_append_libc-glibc = " \
-    glibc-gconv-ibm850 glibc-gconv-cp1252 \
-    glibc-gconv-iso8859-15 glibc-gconv-iso8859-1 \
-"
-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://0002-Bug-13770-Require-C-11-from-now-on.patch \
-"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
-
-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 features_check autotools-brokensep pkgconfig mime-xdg
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-PACKAGECONFIG ??= " \
-    collab-backend-xmpp \
-    libical \
-"
-PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2"
-PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
-PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth"
-PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2"
-PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls"
-PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control"
-PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-collab-backend-sugar,libgsf libxml2 dbus-glib"
-
-EXTRA_OECONF = " \
-    --disable-static  \
-    --enable-plugins \
-    --enable-clipart \
-    --enable-templates \
-    --without-gnomevfs \
-    --with-gtk2 \
-    --with-libwmf-config=${STAGING_DIR} \
-"
-
-CXXFLAGS += "-std=c++11"
-LDFLAGS += "-lgmodule-2.0"
-
-do_compile() {
-    cd goffice-bits2
-    make goffice-paths.h
-    make libgoffice.la
-    cd ${B}
-    oe_runmake
-}
-
-PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
-
-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 \
-    ${datadir}/${PN}-${SHRT_VER}/system.profile-en_GB \
-    ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt \
-    ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt-en_GB \
-    ${datadir}/${PN}-${SHRT_VER}/templates/Employee-Directory.awt \
-    ${datadir}/${PN}-${SHRT_VER}/templates/Business-Report.awt \
-    ${datadir}/${PN}-${SHRT_VER}/templates/Fax-Coversheet.awt \
-    ${datadir}/${PN}-${SHRT_VER}/templates/Resume.awt \
-    ${datadir}/${PN}-${SHRT_VER}/templates/Two-Columns.awt \
-    ${datadir}/${PN}-${SHRT_VER}/templates/Memo.awt \
-    ${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \
-    ${datadir}/${PN}-${SHRT_VER}/certs \
-    ${datadir}/${PN}-${SHRT_VER}/ui \
-    ${datadir}/${PN}-${SHRT_VER}/xsl* \
-    ${datadir}/${PN}-${SHRT_VER}/mime-info \
-    ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \
-"
-
-# don't steal /usr/lib/libabiword-3.0.so from ${PN}
-# in this case it's needed in ${PN}
-FILES_${PN}-dev = " \
-    ${includedir} \
-    ${libdir}/pkgconfig \
-    ${libdir}/${PN}*.la \
-    ${libdir}/lib${PN}*.la \
-    ${libdir}/${PN}-${SHRT_VER}/plugins/*.la \
-"
-FILES_${PN}-doc += "${datadir}/${PN}-*/readme*"
-
-FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/strings"
-FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*"
-FILES_${PN}-clipart        += "${datadir}/${PN}-${SHRT_VER}/clipart"
-FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings"
-FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*"
-FILES_${PN}-templates      += "${datadir}/${PN}-${SHRT_VER}/templates"
-
-PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*"
-
-python populate_packages_prepend () {
-    abiword_libdir    = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins')
-    do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
-
-    metapkg = "abiword-meta"
-    d.setVar('ALLOW_EMPTY_' + metapkg, "1")
-    d.setVar('FILES_' + metapkg, "")
-    blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
-    metapkg_rdepends = []
-    packages = d.getVar('PACKAGES').split()
-    for pkg in packages[1:]:
-        if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
-            print("Modifying %s" % pkg)
-            metapkg_rdepends.append(pkg)
-    d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
-    d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package')
-    packages.append(metapkg)
-    d.setVar('PACKAGES', ' '.join(packages))
-}
-
-FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt"
--- 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-devtools/cppunit/cppunit_%.bbappend
+++ b/recipes-devtools/cppunit/cppunit_%.bbappend
--- 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] = "0ec0331abbbf653f08eecceb1fb787a0"
-SRC_URI[sha256sum] = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"
+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/0001-Fix-build-with-ICU-68.patch
+++ b/recipes-filter/libcdr/libcdr/0001-Fix-build-with-ICU-68.patch
@@ -1,40 +0,0 @@
-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
-
--- a/recipes-filter/libcdr/libcdr_0.1.1.bb
+++ b/recipes-filter/libcdr/libcdr_0.1.1.bb
@@ -4,11 +4,10 @@ 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 \
-    file://0001-Fix-build-with-ICU-68.patch \
-"
-SRC_URI[sha256sum] = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"
+
+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/0001-Fix-build-with-ICU-68.patch
+++ b/recipes-filter/libe-book/libe-book/0001-Fix-build-with-ICU-68.patch
@@ -1,38 +0,0 @@
-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
-
--- 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,19 +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 = " \
-    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"
-
-inherit autotools pkgconfig
-
-DEPENDS = "icu libxml2 librevenge liblangtag boost-native gperf-native"
-
-BBCLASSEXTEND = "native"
--- a/recipes-filter/libetonyek/libetonyek/0001-Fix-build-with-gcc-10.patch
+++ b/recipes-filter/libetonyek/libetonyek/0001-Fix-build-with-gcc-10.patch
@@ -1,28 +0,0 @@
-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
-
--- a/recipes-filter/libetonyek/libetonyek_0.1.5.bb
+++ b/recipes-filter/libetonyek/libetonyek_0.1.5.bb
@@ -0,0 +1,15 @@
+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 \
+"
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "b37e09b5e3f0b5b05af2b549f7fde8a1"
+SRC_URI[sha256sum] = "29f8097f77a193511e940f7a70dfc6ac7fad57fbfc6e60b81fa1ee011daea903"
+
+inherit autotools pkgconfig
+
+DEPENDS = "glm mdds-1 icu lcms libxml2 librevenge"
+
+BBCLASSEXTEND = "native"
--- a/recipes-filter/libetonyek/libetonyek_0.1.9.bb
+++ b/recipes-filter/libetonyek/libetonyek_0.1.9.bb
@@ -1,17 +0,0 @@
-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"
-
-SRC_URI = " \
-    http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
-    file://0001-Fix-build-with-gcc-10.patch \
-"
-SRC_URI[md5sum] = "b891c14c5233f93fb7db052b5762a692"
-SRC_URI[sha256sum] = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"
-
-inherit autotools pkgconfig
-
-DEPENDS = "glm icu lcms libxml2 librevenge liblangtag mdds-1.2"
-
-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/files/0002-Fix-build-with-gcc-9.patch
+++ b/recipes-filter/libfreehand/files/0002-Fix-build-with-gcc-9.patch
@@ -1,32 +0,0 @@
-From da4a016b7e9c03f36657f684ae62d33fc5a94f9b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 6 Jun 2019 22:09:44 +0200
-Subject: [PATCH] Fix build with gcc 9
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| ../../../libfreehand-0.1.2/src/lib/FHCollector.cpp:285:68: error: implicitly-declared 'constexpr libfreehand::FHTransform& libfreehand::FHTransform::operator=(const libfreehand::FHTransform&)' is deprecated [-Werror=deprecated-copy]
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/lib/FHTransform.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/FHTransform.h b/src/lib/FHTransform.h
-index a53e13a..47f40f7 100644
--- a/src/lib/FHTransform.h
-+++ b/src/lib/FHTransform.h
-@@ -20,6 +20,7 @@ struct FHTransform
-   FHTransform();
-   FHTransform(double m11, double m21, double m12, double m22, double m13, double m23);
-   FHTransform(const FHTransform &trafo);
-+  FHTransform& operator=(const FHTransform& other) = default;
- 
-   void applyToPoint(double &x, double &y) const;
-   void applyToArc(double &rx, double &ry, double &rotation, bool &sweep, double &endx, double &endy) const;
-- 
-2.20.1
-
--- a/recipes-filter/libfreehand/files/0003-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
+++ b/recipes-filter/libfreehand/files/0003-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
@@ -1,32 +0,0 @@
-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
-
-
--- 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,20 +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 \
-    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"
-
-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,14 +4,10 @@ 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"

 inherit autotools pkgconfig

-CXXFLAGS += "-std=c++11 -DGLM_ENABLE_EXPERIMENTAL=1"
-
 DEPENDS = "glew glm boost"
--- a/recipes-filter/libmspub/libmspub/0001-Fix-build-with-gcc-10.patch
+++ b/recipes-filter/libmspub/libmspub/0001-Fix-build-with-gcc-10.patch
@@ -1,30 +0,0 @@
-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
-
--- a/recipes-filter/libmspub/libmspub_0.1.2.bb
+++ b/recipes-filter/libmspub/libmspub_0.1.2.bb
@@ -4,15 +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 \
-    file://0001-Fix-build-with-gcc-10.patch \
-"
-SRC_URI[md5sum] = "ac6fa9c1c05ece27c58c05e11786fd3a"
-SRC_URI[sha256sum] = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"
+SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "050b8b29c2620fdbfb5d8561d4d08a11"
+SRC_URI[sha256sum] = "b0baabf82d20c08ad000e80fa02154ce2f2ffde1ee60240d6e3a917c3b35560f"

 inherit autotools pkgconfig

 DEPENDS = "icu librevenge"
-
-BBCLASSEXTEND = "native"
--- a/recipes-filter/libmwaw/libmwaw_0.3.17.bb
+++ b/recipes-filter/libmwaw/libmwaw_0.3.17.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = " \
 "

 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "8f81cc27b63d508576a43ef7448f78bec2fde7c7349b08273400e4de897f651c"
+SRC_URI[md5sum] = "a8364bf2e4ece2860ab96d6bee75f1d7"
+SRC_URI[sha256sum] = "fb3fcac71eefe4d80ea76c08d259109bb020836cbd9f8d73f06daed1801a637c"

-inherit autotools-brokensep pkgconfig
+inherit autotools pkgconfig

 DEPENDS = "librevenge"
-
-BBCLASSEXTEND = "native"
--- a/recipes-filter/libodfgen/libodfgen_0.1.5.bb
+++ b/recipes-filter/libodfgen/libodfgen_0.1.5.bb
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "

-SRC_URI = "https://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "ec7ce6c69aac83f8a9e6280d919b3cad"
-SRC_URI[sha256sum] = "323e491f956c8ca2abb12c998e350670930a32317bf9662b0615dd4b3922b831"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libwpd/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "e0a76e8fb84a3aceb70bdb733c7431ac"
+SRC_URI[sha256sum] = "fb8706e38f6acf019f8b50262af2bf850821c6d10dad8708f13e54f1a08294dd"

 inherit autotools pkgconfig perlnative

 DEPENDS = "librevenge"
-
-BBCLASSEXTEND = "native"
--- 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] = "812a21fee1f7b096612ca83fdafb0db7"
-SRC_URI[sha256sum] = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"
+SRC_URI[md5sum] = "fda521a18bbfccc5f034ea02119e7998"
+SRC_URI[sha256sum] = "943e03b1e6c969af4c2133a6671c9630adf3aaf8d460156744a28f58c9f47cd8"

 inherit autotools pkgconfig

--- a/recipes-filter/libwpd/libwpd/0001-Add-include-cstddef-to-fix-build-with-gcc11.patch
+++ b/recipes-filter/libwpd/libwpd/0001-Add-include-cstddef-to-fix-build-with-gcc11.patch
@@ -1,47 +0,0 @@
-From 723fb0cb6c7594a26a858fc295369122507f0174 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 7 May 2021 23:09:56 +0200
-Subject: [PATCH] Add #include <cstddef> to fix build with gcc11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Stolen from [1]
-
-[1] https://src.fedoraproject.org/rpms/libwpd/blob/rawhide/f/libwpd-gcc11.patch
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/lib/WPXContentListener.cpp | 1 +
- src/lib/WPXTable.cpp           | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/lib/WPXContentListener.cpp b/src/lib/WPXContentListener.cpp
-index ab0f9b1..0b559e6 100644
--- a/src/lib/WPXContentListener.cpp
-+++ b/src/lib/WPXContentListener.cpp
-@@ -23,6 +23,7 @@
-  * Corel Corporation or Corel Corporation Limited."
-  */
- 
-+#include <cstddef>
- #include "WPXContentListener.h"
- #include "WPXPageSpan.h"
- #include "libwpd_internal.h"
-diff --git a/src/lib/WPXTable.cpp b/src/lib/WPXTable.cpp
-index 0ad202a..1e68d1d 100644
--- a/src/lib/WPXTable.cpp
-+++ b/src/lib/WPXTable.cpp
-@@ -25,6 +25,7 @@
-  * Corel Corporation or Corel Corporation Limited."
-  */
- 
-+#include <cstddef>
- #include "WPXTable.h"
- 
- #include "libwpd_internal.h"
-- 
-2.30.2
-
--- a/recipes-filter/libwpd/libwpd_0.10.0.bb
+++ b/recipes-filter/libwpd/libwpd_0.10.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Library for importing WordPerfect (tm) documents"
+HOMEPAGE = "http://libwpd.sourceforge.net/"
+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] = "0773d79a1f240ef9f4f20242b13c5bb7"
+SRC_URI[sha256sum] = "f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91"
+
+inherit autotools pkgconfig perlnative
+
+DEPENDS = "librevenge"
--- a/recipes-filter/libwpd/libwpd_0.10.3.bb
+++ b/recipes-filter/libwpd/libwpd_0.10.3.bb
@@ -1,19 +0,0 @@
-SUMMARY = "Library for importing WordPerfect (tm) documents"
-HOMEPAGE = "http://libwpd.sourceforge.net/"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
-"
-
-SRC_URI = " \
-    http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz \
-    file://0001-Add-include-cstddef-to-fix-build-with-gcc11.patch \
-"
-SRC_URI[md5sum] = "d5e44712c4674d499afb8e89d830fcad"
-SRC_URI[sha256sum] = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"
-
-inherit autotools pkgconfig perlnative
-
-DEPENDS = "librevenge"
-
-BBCLASSEXTEND = "native"
--- a/recipes-filter/libwpg/libwpg_0.3.0.bb
+++ b/recipes-filter/libwpg/libwpg_0.3.0.bb
@@ -5,13 +5,11 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
 "

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

 inherit autotools pkgconfig

 DEPENDS = "librevenge libwpd zlib"
 RDEPENDS_${PN} = "perl"
-
-BBCLASSEXTEND = "native"
--- 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,16 +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"
-
-BBCLASSEXTEND = "native"
--- a/recipes-libreoffice/libreoffice/files/0001-Workaround-boost-library-detection-failures.patch
+++ b/recipes-libreoffice/libreoffice/files/0001-Workaround-boost-library-detection-failures.patch
@@ -1,132 +0,0 @@
-From b5a988f79520d3ea39af37e9d726cf0aafb36019 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 3 Aug 2019 14:51:00 +0200
-Subject: [PATCH] Workaround boost library detection failures
-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>
---
- m4/ax_boost_date_time.m4  | 11 +++++------
- m4/ax_boost_filesystem.m4 | 11 +++++------
- m4/ax_boost_iostreams.m4  | 11 +++++------
- m4/ax_boost_locale.m4     | 11 +++++------
- m4/ax_boost_system.m4     | 11 +++++------
- 5 files changed, 25 insertions(+), 30 deletions(-)
-
-diff --git a/m4/ax_boost_date_time.m4 b/m4/ax_boost_date_time.m4
-index 9b9ec67..0baac6c 100644
--- a/m4/ax_boost_date_time.m4
-+++ b/m4/ax_boost_date_time.m4
-@@ -92,12 +92,11 @@ AC_DEFUN([AX_BOOST_DATE_TIME],
-                 fi
- 
-             else
-               for ax_lib in $ax_boost_user_date_time_lib boost_date_time-$ax_boost_user_date_time_lib; do
-				      AC_CHECK_LIB($ax_lib, main,
-                                   [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
-                                   [link_date_time="no"])
-                  done
-
-+               # ld does not like our LDFLAGS so just trust we set library correctly...
-+               ax_lib=${ax_boost_user_date_time_lib}
-+               BOOST_DATE_TIME_LIB="-l$ax_lib"
-+               AC_SUBST(BOOST_DATE_TIME_LIB)
-+               link_date_time="yes"
-             fi
-             if test "x$ax_lib" = "x"; then
-                 AC_MSG_ERROR(Could not find a version of the boost date_time library!)
-diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
-index b571f89..3996791 100644
--- a/m4/ax_boost_filesystem.m4
-+++ b/m4/ax_boost_filesystem.m4
-@@ -96,12 +96,11 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
- 				done
- 		    fi
-             else
-               for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-                                   [link_filesystem="no"])
-                  done
-
-+               # ld does not like our LDFLAGS so just trust we set library correctly...
-+               ax_lib=${ax_boost_user_filesystem_lib}
-+               BOOST_FILESYSTEM_LIB="-l$ax_lib"
-+               AC_SUBST(BOOST_FILESYSTEM_LIB)
-+               link_filesystem="yes"
-             fi
-             if test "x$ax_lib" = "x"; then
-                 AC_MSG_ERROR(Could not find a version of the boost filesystem library!)
-diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
-index 803d3a3..d165f46 100644
--- a/m4/ax_boost_iostreams.m4
-+++ b/m4/ax_boost_iostreams.m4
-@@ -95,12 +95,11 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
-                 fi
- 
-             else
-               for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do
-				      AC_CHECK_LIB($ax_lib, main,
-                                   [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
-                                   [link_iostreams="no"])
-                  done
-
-+               # ld does not like our LDFLAGS so just trust we set library correctly...
-+               ax_lib=${ax_boost_user_iostreams_lib}
-+               BOOST_IOSTREAMS_LIB="-l$ax_lib"
-+               AC_SUBST(BOOST_IOSTREAMS_LIB)
-+               link_iostreams="yes"
-             fi
-             if test "x$ax_lib" = "x"; then
-                 AC_MSG_ERROR(Could not find a version of the boost iostreams library!)
-diff --git a/m4/ax_boost_locale.m4 b/m4/ax_boost_locale.m4
-index adaedf0..468d708 100644
--- a/m4/ax_boost_locale.m4
-+++ b/m4/ax_boost_locale.m4
-@@ -98,12 +98,11 @@ AC_DEFUN([AX_BOOST_LOCALE],
-                 fi
- 
-             else
-               for ax_lib in $ax_boost_user_locale_lib boost_locale-$ax_boost_user_locale_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
-                                   [link_locale="no"])
-                  done
-
-+               # ld does not like our LDFLAGS so just trust we set library correctly...
-+               ax_lib=${ax_boost_user_locale_lib}
-+               BOOST_LOCALE_LIB="-l$ax_lib"
-+               AC_SUBST(BOOST_LOCALE_LIB)
-+               link_locale="yes"
-             fi
-             if test "x$ax_lib" = "x"; then
-                 AC_MSG_ERROR(Could not find a version of the library!)
-diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
-index 139d066..889b05d 100644
--- a/m4/ax_boost_system.m4
-+++ b/m4/ax_boost_system.m4
-@@ -100,12 +100,11 @@ AC_DEFUN([AX_BOOST_SYSTEM],
-                 fi
- 
-             else
-               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                   [link_system="no"])
-                  done
-
-+               # ld does not like our LDFLAGS so just trust we set library correctly...
-+               ax_lib=${ax_boost_user_system_lib}
-+               BOOST_SYSTEM_LIB="-l$ax_lib"
-+               AC_SUBST(BOOST_SYSTEM_LIB)
-+               link_system="yes"
-             fi
-             if test "x$ax_lib" = "x"; then
-                 AC_MSG_ERROR(Could not find a version of the boost system library!)
-- 
-2.21.0
-
--- a/recipes-libreoffice/libreoffice/files/0001-update-ax_boost-scripts-to-fix-configure-with-system.patch
+++ b/recipes-libreoffice/libreoffice/files/0001-update-ax_boost-scripts-to-fix-configure-with-system.patch
@@ -0,0 +1,182 @@
+From dfba581f6d1dd64fc69ef9db9fc27059366e3f8f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 29 Oct 2015 00:23:24 +0100
+Subject: [PATCH] update ax_boost scripts to fix configure with system boost
+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@googlemail.com>
+---
+ m4/ax_boost_base.m4   | 87 +++++++++++++++++++++++++++++++--------------------
+ m4/ax_boost_system.m4 |  6 ++--
+ 2 files changed, 56 insertions(+), 37 deletions(-)
+
+diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
+index 55de0c4..f3279f2 100644
+--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
+@@ -33,7 +33,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 20
+#serial 26
+ 
+ AC_DEFUN([AX_BOOST_BASE],
+ [
+@@ -91,12 +91,29 @@ if test "x$want_boost" = "xyes"; then
+     dnl are found, e.g. when only header-only libraries are installed!
+     libsubdirs="lib"
+     ax_arch=`uname -m`
+-    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = ppc64le -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64; then
+-        libsubdirs="lib64 lib lib64"
+-    fi
+    case $ax_arch in
+      x86_64)
+        libsubdirs="lib64 libx32 lib lib64"
+        ;;
+      ppc64|s390x|sparc64|aarch64|ppc64le)
+        libsubdirs="lib64 lib lib64 ppc64le"
+        ;;
+    esac
+
+    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
+    dnl them priority over the other paths since, if libs are found there, they
+    dnl are almost assuredly the ones desired.
+    AC_REQUIRE([AC_CANONICAL_HOST])
+    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
+
+    case ${host_cpu} in
+      i?86)
+        libsubdirs="lib/i386-${host_os} $libsubdirs"
+        ;;
+    esac
+ 
+     dnl first we check the system location for boost libraries
+-    dnl this location is chosen if boost libraries are installed with the --layout=system option
+    dnl this location ist chosen if boost libraries are installed with the --layout=system option
+     dnl or if you install boost with RPM
+     if test "$ac_boost_path" != ""; then
+         BOOST_CPPFLAGS="-I$ac_boost_path/include"
+@@ -106,13 +123,8 @@ if test "x$want_boost" = "xyes"; then
+                         break
+                 fi
+         done
+-    else
+-        if test "$cross_compiling" != yes; then
+-            ac_boost_paths='/usr /usr/local /opt /opt/local'
+-        else
+-            ac_boost_paths="/usr/$host/sys-root/mingw"
+-        fi
+-        for ac_boost_path_tmp in $ac_boost_paths ; do
+    elif test "$cross_compiling" != yes; then
+        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+                 for libsubdir in $libsubdirs ; do
+                     if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+@@ -161,6 +173,10 @@ if test "x$want_boost" = "xyes"; then
+     dnl if we found no boost with system layout we search for boost libraries
+     dnl built and installed without the --layout=system option or for a staged(not installed) version
+     if test "x$succeeded" != "xyes"; then
+        CPPFLAGS="$CPPFLAGS_SAVED"
+        LDFLAGS="$LDFLAGS_SAVED"
+        BOOST_CPPFLAGS=
+        BOOST_LDFLAGS=
+         _version=0
+         if test "$ac_boost_path" != ""; then
+             if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+@@ -173,33 +189,36 @@ if test "x$want_boost" = "xyes"; then
+                     VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                     BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+                 done
+                dnl if nothing found search for layout used in Windows distributions
+                if test -z "$BOOST_CPPFLAGS"; then
+                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+                        BOOST_CPPFLAGS="-I$ac_boost_path"
+                    fi
+                fi
+             fi
+         else
+             if test "$cross_compiling" != yes; then
+-                ac_boost_paths='/usr /usr/local /opt /opt/local'
+-            else
+-                ac_boost_paths="/usr/$host/sys-root/mingw"
+-            fi
+-            for ac_boost_path in $ac_boost_paths ; do
+-                if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+-                    for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+-                        _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+-                        V_CHECK=`expr $_version_tmp \> $_version`
+-                        if test "$V_CHECK" = "1" ; then
+-                            _version=$_version_tmp
+-                            best_path=$ac_boost_path
+-                        fi
+                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                            V_CHECK=`expr $_version_tmp \> $_version`
+                            if test "$V_CHECK" = "1" ; then
+                                _version=$_version_tmp
+                                best_path=$ac_boost_path
+                            fi
+                        done
+                    fi
+                done
+
+                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+                if test "$ac_boost_lib_path" = ""; then
+                    for libsubdir in $libsubdirs ; do
+                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+                     done
+                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
+                 fi
+-            done
+-
+-            VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+-            BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+-            if test "$ac_boost_lib_path" = ""; then
+-                for libsubdir in $libsubdirs ; do
+-                    if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+-                done
+-                BOOST_LDFLAGS="-L$best_path/$libsubdir"
+             fi
+ 
+             if test "x$BOOST_ROOT" != "x"; then
+diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
+index 20df5ee..c4c4555 100644
+--- a/m4/ax_boost_system.m4
+++ b/m4/ax_boost_system.m4
+@@ -31,7 +31,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 15
+#serial 17
+ 
+ AC_DEFUN([AX_BOOST_SYSTEM],
+ [
+@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
+ 
+ 			LDFLAGS_SAVE=$LDFLAGS
+             if test "x$ax_boost_user_system_lib" = "x"; then
+-                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
+                for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                  [link_system="no"])
+ 				done
+                 if test "x$link_system" != "xyes"; then
+-                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
+                for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+-- 
+2.1.0
+
--- a/recipes-libreoffice/libreoffice/files/0002-Fix-build-with-icu-68.patch
+++ b/recipes-libreoffice/libreoffice/files/0002-Fix-build-with-icu-68.patch
@@ -1,43 +0,0 @@
-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
-
--- a/recipes-libreoffice/libreoffice/files/0002-fix-gcc-build-error.patch
+++ b/recipes-libreoffice/libreoffice/files/0002-fix-gcc-build-error.patch
@@ -0,0 +1,44 @@
+From b9fa2963cf12e6987b3a0acc219c4fa591e41be8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 3 Feb 2016 10:30:43 +0000
+Subject: [PATCH] fix gcc build error
+
+error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type
+{aka double}' and 'int' to binary 'operator%'
+
+apparently there's a template returning double for abs for the
+non-int/long/float/double argument case. So promote earlier to int so the
+abs<int> is called
+
+Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae
+
+Upstream-Status: Backport
+---
+ sax/source/tools/converter.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
+index 744415e..cf061c9 100644
+--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
+@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
+ 
+ 
+ static void
+-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
+lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset)
+ {
+     if (0 == nOffset)
+     {
+@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear)
+ static void lcl_ConvertToUTC(
+         sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay,
+         sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes,
+-        sal_Int16 const nSourceOffset)
+        int const nSourceOffset)
+ {
+     sal_Int16 nOffsetHours(abs(nSourceOffset) / 60);
+     sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60);
+-- 
+2.7.4
+
--- 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/libreoffice-native.bb
+++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb
@@ -5,14 +5,13 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:"
 inherit native

 DEPENDS += " \
-    cairo-native \
-    libepoxy-native \
    curl-native \
+    gconf-native \
    libpng-native \
    jpeg-native \
    libxml2-native \
-    graphite2-native \
    harfbuzz-native \
+    boost-native \
    icu-native \
    expat-native \
    lcms-native \
@@ -26,6 +25,7 @@ DEPENDS += " \
    mythes-native \
    clucene-core-native \
    libcmis-native \
+    mdds-native \
    libpagemaker-native \
    glm-native \
    libetonyek-native \
@@ -33,71 +33,97 @@ DEPENDS += " \
    libvisio-native \
    libexttextcat-native \
    hyphen-native \
-    unzip-native \
-    liblangtag-native \
-    lpsolve-native \
-    libwpd-native \
-    libwpg-native \
-    libwps-native \
-    libcdr-native \
-    libmspub-native \
-    libmwaw-native \
-    libodfgen-native \
-    mdds-1.5-native \
 "

 SRC_URI += " \
    file://0001-saxparser-output-calling-parametrs-for-debug.patch \
-    file://0002-cppuhelper-defaultbootstrap-output-debug-information.patch \
-    file://0003-add-gengal-debug-information.patch \
-    file://0004-gengal-fix-path-to-redirectrc.patch \
+    file://0002-cppumaker-output-more-detailed-error-message.patch \
+    file://0003-cppuhelper-defaultbootstrap-output-debug-information.patch \
+    file://0004-fix-build-for-x-less-cairp-less-build.patch \
+    file://0005-add-gengal-debug-information.patch \
+    file://0006-gengal-fix-path-to-redirectrc.patch \
 "

 EXTRA_OECONF += " \
+    --enable-verbose \
+    \
+    --enable-python=system \
+    --without-x \
    --without-java \
    \
-    --disable-gui \
+    --with-system-curl \
+    --with-system-libpng \
+    --with-system-jpeg \
+    --with-system-libxml \
+    --with-system-harfbuzz \
+    --with-system-boost \
+    --with-system-icu \
+    --with-system-expat \
+    --with-system-lcms2 \
+    --with-system-nss \
+    --with-system-cppunit \
+    --with-system-libabw \
+    --with-system-libcdr \
+    --with-system-libebook \
+    --with-system-libfreehand \
+    --with-system-hunspell \
+    --with-system-mythes \
+    --with-system-clucene \
+    --with-system-libcmis \
+    --with-system-mdds \
+    --with-system-libpagemaker \
+    --with-system-glm \
+    --with-system-libetonyek \
+    --with-system-vigra \
+    --with-system-libvisio \
+    --with-system-libexttextcat \
+    --with-system-altlinuxhyph \
+    \
+    --without-boost-date-time \
+    --without-boost-iostreams \
+    --without-boost-system \
    --disable-postgresql-sdbc \
    --disable-lotuswordpro \
    --disable-firebird-sdbc \
+    --disable-liblangtag \
    --disable-openssl \
+    --disable-gltf \
+    --disable-collada \
    --disable-scripting-beanshell \
    --disable-scripting-javascript \
+    --disable-graphite \
    --disable-pdfimport \
+    --disable-orcus \
    --disable-coinmp \
 "

 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
-    PYTHON_CFLAGS=-I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR}${PYTHON_ABI} PYTHON_LIBS="-L${STAGING_LIBDIR_NATIVE} -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" oe_runconf
-    # fake for cross-toolset
-    cp -f ${B}/config_host.mk ${B}/config_build.mk
-    cp -f ${B}/config_host_lang.mk ${B}/config_build_lang.mk
-    cp -rf ${B}/config_host ${B}/config_build
+    PYTHON_CFLAGS=-I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR} PYTHON_LIBS="-L${STAGING_LIBDIR_NATIVE} -lpython${PYTHON_BASEVERSION}" oe_runconf
 }

 # for debugging - we can as we're native
 CXXFLAGS += "-g -O0 -DSAL_LOG_INFO -DSAL_LOG_WARN"
 LDFLAGS += "-g"

-# these seem to get lost in our tailored build
-LDFLAGS += "-ldl"
-
-
 do_compile() {
-    BUILDDIR=${B} oe_runmake cross-toolset
-    # gengal was not designed for build - we need to add it and it's dependencies
+    # inspired by ${B}/Makefile
+    BUILDDIR=${B} oe_runmake -f ${S}/Makefile.gbuild build-tools
+    # gengal was not designed for build on its own - we need to add dependencies
    BUILDDIR=${B} oe_runmake Executable_gengal
+    BUILDDIR=${B} oe_runmake Executable_cfgex
    BUILDDIR=${B} oe_runmake Library_ucb1
    BUILDDIR=${B} oe_runmake Library_configmgr
    BUILDDIR=${B} oe_runmake Library_fwk
    BUILDDIR=${B} oe_runmake Library_i18npool
    BUILDDIR=${B} oe_runmake Library_pyuno
+
+    # BUILDDIR=${B} oe_runmake Module_external
 }

 LOBUILDTOOLS = " \
@@ -109,9 +135,13 @@ LOBUILDTOOLS = " \
    genindex_data \
    idxdict \
    propex \
+    rsc \
    saxparser \
    svidl \
+    transex3 \
    ulfex \
+    uiex \
+    unoidl-check \
    unoidl-write \
    xrmex \
 "
--- a/recipes-libreoffice/libreoffice/libreoffice-native/0001-saxparser-output-calling-parametrs-for-debug.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice-native/0001-saxparser-output-calling-parametrs-for-debug.patch
@@ -1,5 +1,5 @@
 From c3baa66501375419563ba6d44685df347ae09a8a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Sun, 22 Nov 2015 21:44:04 +0100
 Subject: [PATCH] saxparser: output calling parametrs for debug
 MIME-Version: 1.0
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit

 Upstream-Status: Inappropriate [configuration]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
 i18npool/source/localedata/saxparser.cxx | 2 ++
 1 file changed, 2 insertions(+)
--- a/recipes-libreoffice/libreoffice/libreoffice-native/0002-cppumaker-output-more-detailed-error-message.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice-native/0002-cppumaker-output-more-detailed-error-message.patch
@@ -0,0 +1,35 @@
+From 98774bf61294703183118b7953f6a92cad6da068 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 26 Nov 2015 17:48:19 +0100
+Subject: [PATCH] cppumaker: output more detailed error message
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ codemaker/source/cppumaker/cpputype.cxx | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
+index 0b3e9fd..26a9a73 100644
+--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
+@@ -3385,11 +3385,7 @@ static OUString failsToSupply(const OUString& name_, const OString& baseName)
+ {
+     return OUString(
+             "\n"
+-            "#if OSL_DEBUG_LEVEL > 0\n"
+-            "                ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n"
+-            "#else\n"
+-            "                ::rtl::OUString(\"service not supplied\")\n"
+-            "#endif\n");
+            "                ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n");
+ }
+ 
+ void ServiceType::dumpHxxFile(
+-- 
+2.1.0
+
--- a/recipes-libreoffice/libreoffice/libreoffice-native/0003-cppuhelper-defaultbootstrap-output-debug-information.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice-native/0003-cppuhelper-defaultbootstrap-output-debug-information.patch
@@ -1,6 +1,6 @@
-From 4577fbcae9790d88f6ccc5de07dd8dbff9d9cf97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 3 Aug 2019 18:15:28 +0200
+From 691674ce51be55f02464c6b6180680a41a64f906 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 1 Dec 2015 00:09:32 +0100
 Subject: [PATCH] cppuhelper / defaultbootstrap: output debug information in
 getBootstrapVariable
 MIME-Version: 1.0
@@ -9,18 +9,18 @@ Content-Transfer-Encoding: 8bit

 Upstream-Status: Inappropriate [configuration]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
 cppuhelper/source/defaultbootstrap.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

 diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
-index 945268b..3259d43 100644
+index 1fbbf8f..75160e8 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>
 
@@ -32,9 +32,9 @@ index 945268b..3259d43 100644
 #include <rtl/ustring.hxx>
 +#include <rtl/string.hxx>
 
- #include "macro_expander.hxx"
- #include "paths.hxx"
-@@ -38,6 +40,10 @@ OUString getBootstrapVariable(
+ using rtl::OUString;
+ 
+@@ -40,6 +42,10 @@ rtl::OUString getBootstrapVariable(
         throw css::uno::DeploymentException(
             "Cannot obtain " + name + " from uno ini");
     }
@@ -46,5 +46,5 @@ index 945268b..3259d43 100644
 }
 
 -- 
-2.21.0
+2.1.0

--- a/recipes-libreoffice/libreoffice/libreoffice-native/0004-fix-build-for-x-less-cairp-less-build.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice-native/0004-fix-build-for-x-less-cairp-less-build.patch
@@ -0,0 +1,72 @@
+From 5caf9ca138e89434249f2878334231011e382687 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 18 Dec 2015 22:09:29 +0100
+Subject: [PATCH] fix build for x-less/cairo-less build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: submitted [1]
+
+[1] https://bugs.documentfoundation.org/show_bug.cgi?id=96587
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ vcl/headless/svpgdi.cxx | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
+index 21efd33..d1f4df1 100644
+--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
+@@ -645,6 +645,7 @@ void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+     dbgOut( m_aDevice );
+ }
+ 
+#if ENABLE_CAIRO_CANVAS
+ #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
+ static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, bool bClosePath)
+ {
+@@ -707,6 +708,7 @@ static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, b
+     }
+ }
+ #endif
+#endif
+ 
+ bool SvpSalGraphics::drawPolyLine(
+     const ::basegfx::B2DPolygon& rPolyLine,
+@@ -717,6 +719,7 @@ bool SvpSalGraphics::drawPolyLine(
+ {
+     bool bRet = false;
+     (void)rPolyLine; (void)fTransparency; (void)rLineWidths; (void)eLineJoin; (void)eLineCap;
+#if ENABLE_CAIRO_CANVAS
+ #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
+     // short circuit if there is nothing to do
+     const int nPointCount = rPolyLine.count();
+@@ -825,6 +828,7 @@ bool SvpSalGraphics::drawPolyLine(
+     }
+     bRet = true;
+ #endif
+#endif
+     return bRet;
+ }
+ 
+@@ -857,6 +861,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
+ {
+     bool bRet = false;
+     (void)rPolyPoly; (void)fTransparency;
+#if ENABLE_CAIRO_CANVAS
+ #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
+     if (m_bUseLineColor || !m_bUseFillColor)
+     {
+@@ -901,6 +906,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
+     }
+     bRet = true;
+ #endif
+#endif
+     return bRet;
+ }
+ 
+-- 
+2.5.0
+
--- a/recipes-libreoffice/libreoffice/libreoffice-native/0005-add-gengal-debug-information.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice-native/0005-add-gengal-debug-information.patch
@@ -1,12 +1,12 @@
 From d15275f988ea61b7ef128ac52f55906500728d7a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Wed, 20 Jan 2016 20:51:02 +0100
 Subject: [PATCH] add gengal debug information
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
 svx/source/gengal/gengal.sh | 5 +++++
 1 file changed, 5 insertions(+)
--- a/recipes-libreoffice/libreoffice/libreoffice-native/0006-gengal-fix-path-to-redirectrc.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice-native/0006-gengal-fix-path-to-redirectrc.patch
@@ -1,5 +1,5 @@
 From 0840b6904d48399818f17487caf593bc2e9727bd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Wed, 20 Jan 2016 23:16:10 +0100
 Subject: [PATCH] gengal: fix path to redirectrc
 MIME-Version: 1.0
@@ -7,7 +7,7 @@ Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

 Change-Id: I4a221b828a2ac9b8fd585d34f8e5197bf40c6498
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
 svx/source/gengal/gengal.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/recipes-libreoffice/libreoffice/libreoffice-version.inc
+++ b/recipes-libreoffice/libreoffice/libreoffice-version.inc
@@ -1,5 +1,9 @@
-PV = "7.1.5.2"
-DIRV = "7.1.5"
+PV = "5.0.5.2"
+DIRV = "5.0.5"

-SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz"
-SRC_URI[sha256sum] = "aeaf30367665bdfdcf780d2b28e304352255de778db41d32d12cd77d5b2385ce"
+SRC_URI += " \
+    http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
+"
+
+SRC_URI[md5sum] = "2a04618e59a4d6b0638a3cb2b896e35e"
+SRC_URI[sha256sum] = "1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88"
--- a/recipes-libreoffice/libreoffice/libreoffice.bb
+++ b/recipes-libreoffice/libreoffice/libreoffice.bb
@@ -1,8 +1,6 @@
 require ${BPN}.inc

-inherit gobject-introspection bash-completion gtk-icon-cache mime mime-xdg
-
-MIME_XDG_PACKAGES = "${PN}"
+inherit gtk-icon-cache pythonnative

 SRC_URI += " \
    http://download.documentfoundation.org/libreoffice/src/${DIRV}/${BPN}-translations-${PV}.tar.xz;name=translations \
@@ -11,14 +9,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://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 \
+    file://0006-make-sure-that-gengal-uses-native-libraries.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 \
 "

-SRC_URI[translations.sha256sum] = "b86740debc717bdeca918ba068ead6c7a16e70a232eeac43bbb31e2a02d0c559"
+SRC_URI[translations.md5sum] = "9698d9d5948988a8f130d909bb0675ce"
+SRC_URI[translations.sha256sum] = "67ad8bf35e55f3acb77a4fa9f1e07784a2acde72dcc9126567c833af70748b8d"

 DEPENDS += " \
    ${BPN}-native \
@@ -32,6 +30,7 @@ DEPENDS += " \
    nss \
    zlib \
    jpeg \
+    neon \
    libpng \
    apr \
    serf \
@@ -44,6 +43,7 @@ DEPENDS += " \
    cups \
    gstreamer1.0-plugins-base \
    \
+    mdds \
    glm \
    redland \
    libabw \
@@ -69,10 +69,6 @@ DEPENDS += " \
    mythes \
    hyphen \
    graphite2 \
-    liblangtag \
-    lpsolve \
-    gpgme \
-    mdds-1.5 \
 "

 # necessary to let the call for python-config succeed
@@ -84,72 +80,98 @@ 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. 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
+# 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?

 EXTRA_OECONF += " \
    --without-java \
    --with-lang=ALL \
    \
+    --disable-collada \
    --disable-coinmp \
+    --enable-python=system \
    --with-tls=nss \
    --without-galleries \
    \
    --with-system-poppler \
    --with-system-openldap \
+    --with-system-zlib \
+    --with-system-jpeg \
+    --with-system-neon \
+    --with-system-libpng \
+    --with-system-nss \
    --with-system-apr \
    --with-system-serf \
    --with-system-libatomic_ops \
+    --with-system-lcms2 \
+    --with-system-libxml \
    --with-system-icu \
    --with-system-expat \
    --with-system-curl \
+    --with-system-harfbuzz \
+    --with-system-glew \
    --with-system-openssl \
    \
    --with-system-cppunit \
    --with-system-glm \
+    --with-system-mdds \
    --with-system-redland \
    --with-system-libabw \
+    --with-system-libwps \
+    --with-system-libwpg \
+    --with-system-libwpd \
+    --with-system-libcdr \
    --with-system-libcmis \
    --with-system-libebook \
+    --with-system-libmwaw \
    --with-system-libetonyek \
    --with-system-libvisio \
+    --with-system-libmspub \
    --with-system-libpagemaker \
    --with-system-libodfgen \
+    --with-system-libgltf \
    --with-system-libexttextcat \
    --with-system-clucene \
+    --with-system-vigra \
+    --with-system-hunspell \
    --with-system-mythes \
    --with-system-altlinuxhyph \
-    --with-system-gpgmepp \
-    \
-    --with-external-dict-dir=${datadir}/hunspell \
-    --with-system-dicts \
+    --with-system-graphite \
 "

 PACKAGECONFIG ??= " \
-    gtk3 \
+    gtk \
    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, , 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
-    export PYTHON_CFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}
-    export PYTHON_LIBS="-L${STAGING_LIBDIR} -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
+    export PYTHON_CFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}
+    export PYTHON_LIBS="-L${STAGING_LIBDIR} -lpython${PYTHON_BASEVERSION}"
    oe_runconf

    mkdir -p ${B}/workdir/Executable
@@ -165,61 +187,47 @@ do_configure() {

    # ensure gengal loads native libraries
    sed -i 's:%STAGING_LIBDIR_NATIVE%:${STAGING_LIBDIR_NATIVE}:g' ${S}/solenv/gbuild/Gallery.mk
-
-    # adjust gpgme++ path
-    sed -i 's:-I${includedir}/gpgme++:-I${STAGING_INCDIR}/gpgme++:g' ${B}/config_host.mk
-}
-
-do_compile_prepend() {
-    # INTROSPECTION_SCANNER is exprted but INTROSPECTION_COMPILER is not. This
-    # 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

-    # 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}/icons \
-    ${datadir}/metainfo \
    ${datadir}/mime \
+    ${datadir}/application-registry \
+    ${datadir}/mimelnk \
+    ${datadir}/icons \
+    ${datadir}/appdata \
+    ${datadir}/mime-info \
+    ${datadir}/mime/packages \
+    \
 "

-PACKAGES =+ "${PN}-odk ${PN}-officekit"
-
-FILES_${PN}-odk = "${libdir}/libreoffice/sdk"
+PACKAGE_BEFORE_PN += "${PN}-odk"
+FILES_${PN}-odk = " \
+    ${libdir}/libreoffice/sdk \
+"
 INSANE_SKIP_${PN}-odk += "dev-so staticdev"

-FILES_${PN}-officekit = " \
-    ${libdir}/girepository-1.0 \
-    ${libdir}/liblibreofficekitgtk.so \
+FILES_${PN}-dbg += " \
+    ${libdir}/libreoffice/*/.debug \
+    ${libdir}/libreoffice/*/*/.debug \
+    ${libdir}/libreoffice/*/*/*/.debug \
 "

 # based http://pkgs.fedoraproject.org/cgit/rpms/libreoffice.git/tree/libreoffice.spec
 LO_LANGUAGE_FILES = " \
    ${libdir}/libreoffice/share/autocorr/*%{1}.dat \
-    ${libdir}/libreoffice/program/resource/*%{1}/LC_MESSAGES \
+    ${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 \
@@ -228,15 +236,15 @@ LO_LANGUAGE_FILES = " \
 python lo_do_split_locales() {
    import glob, subprocess

-    packages = (d.getVar('PACKAGES') or "").split()
+    packages = (d.getVar('PACKAGES', True) or "").split()

-    datadir = d.getVar('datadir')
+    datadir = d.getVar('datadir', True)
    if not datadir:
        bb.note("datadir not defined")
        return

-    dvar = d.getVar('PKGD')
-    pn = d.getVar('LOCALEBASEPN')
+    dvar = d.getVar('PKGD', True)
+    pn = d.getVar('LOCALEBASEPN', True)

    if pn + '-locale' in packages:
        packages.remove(pn + '-locale')
@@ -244,9 +252,9 @@ python lo_do_split_locales() {
    # extract locales from translation source path
    # this won't add en-US which comes with base sources
    locales = []
-    transpaths = glob.glob('%s/translations/source/*' % d.getVar('S'))
+    transpaths = glob.glob('%s/translations/source/*' % d.getVar('S', True))
    for l in transpaths:
-        locale = l.replace('%s/translations/source/' % d.getVar('S'), '')
+        locale = l.replace('%s/translations/source/' % d.getVar('S', True), '')
        if not locale in locales:
            locales.append(locale)

@@ -254,13 +262,13 @@ 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, ''))

    # check for files matching at each location / language
    langfiles = dict()
-    for transvar in d.getVar('LO_LANGUAGE_FILES').split():
+    for transvar in d.getVar('LO_LANGUAGE_FILES', True).split():
        filesfound = 0
        for locale in sorted(locales):
            pattern = transvar.replace('%{1}', locale)
@@ -278,13 +286,13 @@ python lo_do_split_locales() {
            if translocation in fallbacksearchresult:
                fallbacksearchresult.replace(translocation, '')
        else:
-            bb.warn('%s language file pattern not found:  %s' % (d.getVar('PN'), transvar))
+            bb.warn('%s language file pattern not found:  %s' % (d.getVar('PN', True), transvar))

    # setup packages for locales with files found
-    summary = d.getVar('SUMMARY') or pn
-    description = d.getVar('DESCRIPTION') or ""
-    locale_section = d.getVar('LOCALE_SECTION')
-    mlprefix = d.getVar('MLPREFIX') or ""
+    summary = d.getVar('SUMMARY', True) or pn
+    description = d.getVar('DESCRIPTION', True) or ""
+    locale_section = d.getVar('LOCALE_SECTION', True)
+    mlprefix = d.getVar('MLPREFIX', True) or ""
    for locale in locales:
        if locale in langfiles:
            ln = legitimize_package_name(locale)
@@ -304,5 +312,3 @@ python lo_do_split_locales() {
 }

 PACKAGESPLITFUNCS_prepend = "lo_do_split_locales "
-
-RDEPENDS_${PN} = "hunspell-dictionaries"
--- a/recipes-libreoffice/libreoffice/libreoffice.inc
+++ b/recipes-libreoffice/libreoffice/libreoffice.inc
@@ -1,4 +1,4 @@
-SUMMARY = "Libre office base"
+DESCRIPTION = "Libre office base"
 LICENSE = "GPLv3 & LGPLv3 & MPLv1.1"
 LIC_FILES_CHKSUM = " \
    file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
@@ -10,76 +10,25 @@ 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 \
+    file://0001-update-ax_boost-scripts-to-fix-configure-with-system.patch \
+    file://0002-fix-gcc-build-error.patch \
+    file://0003-Werror-shift-negative-value-GCC-6.patch \
 "
 SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"

-inherit autotools pkgconfig python3native distutils3-base perlnative
+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 \
-    --enable-python=system \
-    --disable-skia \
-    ${@oe.utils.parallel_make_argument(d, '--with-parallelism=%d')} \
+    --enable-verbose \
+    --with-parallelism=${@oe.utils.cpu_count()} \
    \
-    --with-system-boost \
-    --with-boost-date-time=boost_date_time \
-    --with-boost-filesystem=boost_filesystem \
-    --with-boost-locale=boost_locale\
-    --with-boost-iostreams=boost_iostreams\
-    --with-boost-system=boost_system\
-    \
-    --with-system-cairo \
-    --with-system-epoxy \
-    --with-system-curl \
-    --with-system-libpng \
-    --with-system-jpeg \
-    --with-system-libxml \
-    --with-system-graphite \
-    --with-system-harfbuzz \
-    --with-system-icu \
-    --with-system-expat \
-    --with-system-lcms2 \
-    --with-system-nss \
-    --with-system-cppunit \
-    --with-system-libabw \
-    --with-system-libcdr \
-    --with-system-libebook \
-    --with-system-libfreehand \
-    --with-system-hunspell \
-    --with-system-mythes \
-    --with-system-clucene \
-    --with-system-libcmis \
-    --with-system-libpagemaker \
-    --with-system-glm \
-    --with-system-libetonyek \
-    --with-system-libvisio \
-    --with-system-libexttextcat \
-    --with-system-altlinuxhyph \
    --with-system-librevenge \
    --with-system-libabw \
    --with-system-libcdr \
    --with-system-libebook \
    --with-system-libfreehand \
-    --with-system-liblangtag \
-    --with-system-zlib \
-    --with-system-lpsolve \
-    --with-system-libwpd \
-    --with-system-libwpg \
-    --with-system-libwps \
-    --with-system-libcdr \
-    --with-system-libmspub \
-    --with-system-libmwaw \
-    --with-system-mdds \
 "
--- a/recipes-libreoffice/libreoffice/libreoffice/0001-configure.ac-skip-some-cross-compile-sections-they-d.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0001-configure.ac-skip-some-cross-compile-sections-they-d.patch
@@ -1,33 +1,42 @@
-From a2df22788f500ceba2574af12201f6f4286713df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 3 Aug 2019 22:10:36 +0200
+From 8407698e81ad907287a87bbc561544c0a84ae3c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 21 Oct 2015 23:27:01 +0200
 Subject: [PATCH] configure.ac: skip some cross-compile sections - they do not
 work for oe-environment
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

-Upstream-Status: Inappropriate [oe specific]
+Upstream-Status: Inappropriate [configuration]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index 955aea1..f310c00 100644
+index 50003a6..02d1cc3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4487,7 +4487,7 @@ dnl ===================================================================
+@@ -4570,7 +4570,7 @@ dnl machine when doing cross-compilation
+ dnl ===================================================================
 
 m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
- m4_pattern_allow([PKG_CONFIG_LIBDIR])
 -if test "$cross_compiling" = "yes"; then
 +if test "$cross_compiling" = "yesfoo"; then
     AC_MSG_CHECKING([for BUILD platform configuration])
     echo
     rm -rf CONF-FOR-BUILD config_build.mk
-@@ -8334,7 +8334,7 @@ if test $enable_python = system; then
+@@ -7749,7 +7749,7 @@ fi
+ dnl ===================================================================
+ dnl Check for system cppunit
+ dnl ===================================================================
+-if test "$cross_compiling" != "yes"; then
+if test "$cross_compiling" != "yesfoo"; then
+     libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit >= 1.12.0])
+ fi
+ 
+@@ -8014,7 +8014,7 @@ if test $enable_python = system; then
         # Fallback: Accept these in the environment, or as set above
         # for MacOSX.
         :
@@ -37,5 +46,5 @@ index 955aea1..f310c00 100644
         # we actually do check anew.
         unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
 -- 
-2.21.0
+2.1.0

--- a/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch
@@ -1,31 +1,31 @@
-From d31a93121791963d75f6572ac2b393371d72ece0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 3 Aug 2019 22:20:06 +0200
+From 231a054d94ee9eced6e116829d5a9f7706d7bb41 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 27 Oct 2015 01:16:47 +0100
 Subject: [PATCH] Makefile.in: avoid building target cross-toolset
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

-Upstream-Status: Inappropriate [oe-specific]
+Upstream-Status: Inappropriate [cross compiling specific]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/Makefile.in b/Makefile.in
-index 393e94f..5cdb930 100644
+index 61b16ab..37405f2 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -280,7 +280,7 @@ bootstrap: check-if-root compilerplugins
+@@ -242,7 +242,7 @@ bootstrap: compilerplugins
 # Note: this will pipe through all gbuild targets to ... gbuild
- #       with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons
+ #       with some translations like "build"->"all" for historic reasons
 #
-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \
-+build: bootstrap fetch \
-         $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) \
-         install-gdb-printers
- 	$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal)
+-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
+build: bootstrap fetch
+ ifneq ($(filter-out WNT MACOSX IOS,$(OS)),)
+ 	mkdir -p $(INSTDIR)
+ 	$(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR) -c
 -- 
-2.21.0
+2.1.0

--- a/recipes-libreoffice/libreoffice/libreoffice/0003-remove-paths-for-gb_Executable_get_command.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0003-remove-paths-for-gb_Executable_get_command.patch
@@ -1,5 +1,5 @@
 From 502ff5208fc4326960b9d1e9f25642046dc64a28 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Sat, 21 Nov 2015 23:56:19 +0100
 Subject: [PATCH] remove paths for gb_Executable_get_command
 MIME-Version: 1.0
@@ -10,7 +10,7 @@ use binaries found in our native sysroot

 Upstream-Status: Inappropriate [oe specific]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
 solenv/gbuild/TargetLocations.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch
@@ -1,40 +1,43 @@
 From 900b79ed77cd5c126cc4ac9beef488a94ef57b06 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 3 Oct 2020 14:05:48 +0200
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 20 Nov 2015 22:03:58 +0100
 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]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Change-Id: I0afbd760bc8810396e04a5e276a68a810042b057
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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 dee46a3..fab7ddf 100644
+index 4aaf2e5..5837bc8 100644
 --- a/i18npool/CustomTarget_breakiterator.mk
 +++ b/i18npool/CustomTarget_breakiterator.mk
-@@ -23,7 +23,7 @@ $(i18npool_BIDIR)/dict_%.data : \
+@@ -22,7 +22,7 @@ $(i18npool_BIDIR)/dict_%.data : \
+ 		| $(i18npool_BIDIR)/.dir
 	$(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
 
-@@ -37,7 +37,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
+ $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
+@@ -34,7 +34,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
+ 		| $(i18npool_BIDIR)/.dir
 	$(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.26.2
+2.1.0

--- a/recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch
@@ -1,45 +1,47 @@
-From 39afebf39613d0788a205ff6694e64085e7f5899 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 3 Aug 2019 22:28:59 +0200
+From cf939a0c4e49d34f5bd795dbbbd1a7ae396ce622 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 6 Dec 2015 22:23:17 +0100
 Subject: [PATCH] add a new gb_Rdb_get_target_for_build_native and use it
 i18npool/CustomTarget_localedata
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

-Upstream-Status: Inappropriate [oe-specific]
+We need to use native saxparser

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Upstream-Status: Inappropriate [cross specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
 i18npool/CustomTarget_localedata.mk | 2 +-
 solenv/gbuild/TargetLocations.mk    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

 diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
-index c03bbbc..40b5865 100644
+index 481b3ee..28cd67c 100644
 --- a/i18npool/CustomTarget_localedata.mk
 +++ b/i18npool/CustomTarget_localedata.mk
-@@ -24,7 +24,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
- 		$$(call gb_Helper_print_on_error, \
- 			$$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
- 				-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER)) \
-				-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser))) && \
-+				-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build_native,saxparser))) && \
+@@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
+ 	$$(call gb_Helper_abbreviate_dirs, \
+ 		$$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
+ 			-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER)) \
+-			-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser)) \
+			-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build_native,saxparser)) \
+ 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
 		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
+index 82857a9..d1c2e92 100644
 --- a/solenv/gbuild/TargetLocations.mk
 +++ b/solenv/gbuild/TargetLocations.mk
-@@ -155,6 +155,7 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final
+@@ -138,6 +138,7 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final
 gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done
 gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
 gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb
 +gb_Rdb_get_target_for_build_native = %STAGING_LIBDIR_NATIVE%/$(1).rdb
+ gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
- gb_MoTarget_get_target = $(WORKDIR)/MoTarget/$(1).mo
 gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf
 -- 
-2.21.0
+2.5.0

--- a/recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch
@@ -1,37 +0,0 @@
-From e3ab0c8f837571765af845f409e058afe0a84921 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 3 Aug 2019 22:45:49 +0200
-Subject: [PATCH] Package.mk: workaround icu missing error for
- --without-galleries
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-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 90e2280..0920cf2 100644
--- a/solenv/gbuild/Package.mk
-+++ b/solenv/gbuild/Package.mk
-@@ -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.26.2
-
--- a/recipes-libreoffice/libreoffice/libreoffice/0006-make-sure-that-gengal-uses-native-libraries.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0006-make-sure-that-gengal-uses-native-libraries.patch
@@ -0,0 +1,33 @@
+From 8f21c644930042bca1725b9547f4a4585fe79784 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.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@googlemail.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
+
--- a/recipes-libreoffice/libreoffice/libreoffice/0007-Package.mk-workaround-icu-missing-error-for-without-.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0007-Package.mk-workaround-icu-missing-error-for-without-.patch
@@ -0,0 +1,29 @@
+From d194f5aef8bf1c16097729d448b34316d621e557 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 24 Jan 2016 16:55:11 +0100
+Subject: [PATCH] Package.mk: workaround icu missing error for
+ --without-galleries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ solenv/gbuild/Package.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
+index 5cbe70c..2cb4e38 100644
+--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
+@@ -79,7 +79,6 @@ $(call gb_Package_get_preparation_target,%) :
+ # Package_foo makefiles.
+ $(call gb_Package_get_target,%) :
+ 	$(call gb_Output_announce,$*,$(true),PKG,2)
+-	$(if $(PACAKGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
+ 	rm -f $@ && \
+ 	mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
+ 
+-- 
+2.5.0
+
--- a/recipes-libreoffice/libreoffice/libreoffice/0007-configure.ac-avoid-finding-calling-pg_config.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0007-configure.ac-avoid-finding-calling-pg_config.patch
@@ -1,47 +0,0 @@
-From 7b4896cb093d1836a1a13f3f0a8b447c1a0465d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 3 Aug 2019 22:53:02 +0200
-Subject: [PATCH] configure.ac: avoid finding/calling pg_config
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- configure.ac | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f310c00..2573cc1 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -8668,18 +8668,12 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
-                 pg_supp_path="$P_SEP$d$pg_supp_path"
-             done
-         fi
-        AC_PATH_PROG(PGCONFIG, pg_config, ,$PATH$pg_supp_path)
-        if test -n "$PGCONFIG"; then
-            POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
-            POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
-        else
-            PKG_CHECK_MODULES(POSTGRESQL, libpq, [
-              POSTGRESQL_INC=$POSTGRESQL_CFLAGS
-              POSTGRESQL_LIB=$POSTGRESQL_LIBS
-            ],[
-              AC_MSG_ERROR([pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH])
-            ])
-        fi
-+        PKG_CHECK_MODULES(POSTGRESQL, libpq, [
-+          POSTGRESQL_INC=$POSTGRESQL_CFLAGS
-+          POSTGRESQL_LIB=$POSTGRESQL_LIBS
-+        ],[
-+          AC_MSG_ERROR([pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH])
-+        ])
-         FilterLibs "${POSTGRESQL_LIB}"
-         POSTGRESQL_LIB="${filteredlibs}"
-     else
-- 
-2.21.0
-
--- a/recipes-libreoffice/libreoffice/libreoffice/0008-configure.ac-avoid-finding-calling-pg_config.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0008-configure.ac-avoid-finding-calling-pg_config.patch
@@ -0,0 +1,37 @@
+From a3d541ac396929b6ab78fcd5d8e8ccc85a6b3a2d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 28 Jan 2016 00:49:41 +0100
+Subject: [PATCH] configure.ac: avoid finding/calling pg_config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [cross compiling specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6a0e646..f253a81 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -8302,12 +8302,8 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
+                 pg_supp_path="$P_SEP$d$pg_supp_path"
+             done
+         fi
+-        AC_PATH_PROG(PGCONFIG, pg_config, ,$PATH$pg_supp_path)
+-        if test -z "$PGCONFIG"; then
+-            AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
+-        fi
+-        POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
+-        POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
+        POSTGRESQL_INC=
+        POSTGRESQL_LIB=
+     else
+         # if/when anything else than PostgreSQL uses Kerberos,
+         # move this out of `test "x$enable_postgresql_sdbc" != "xno"'
+-- 
+2.5.0
+
--- a/recipes-libreoffice/libreoffice/libreoffice/0009-Use-wrappers-for-gobject-introspection.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0009-Use-wrappers-for-gobject-introspection.patch
@@ -1,49 +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]
-
-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
-
--- a/recipes-libreoffice/libreoffice/libreoffice/0009-avoid-downloading-by-git-submodules.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0009-avoid-downloading-by-git-submodules.patch
@@ -1,5 +1,5 @@
 From f52d4fea70f71b844b4ad757df61423e08366083 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Sun, 31 Jan 2016 21:10:32 +0100
 Subject: [PATCH] avoid downloading by git submodules
 MIME-Version: 1.0
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit

 Upstream-Status: Inappropriate [configuration]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)
@@ -25,8 +25,8 @@ index 9df3182..ccae843 100644
 +GIT_NEEDED_SUBMODULES=
 +
 AC_SUBST(ALL_LANGS)
- AC_DEFINE_UNQUOTED(WITH_LANG,"$WITH_LANG")
 AC_SUBST(WITH_LANG)
+ AC_SUBST(WITH_LANG_LIST)
 -- 
 2.5.0

--- a/recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch
+++ b/recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch
@@ -1,37 +0,0 @@
-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
-
--- a/recipes-support/clucene/clucene-core_2.3.3.4.bb
+++ b/recipes-support/clucene/clucene-core_2.3.3.4.bb
@@ -21,9 +21,8 @@ inherit cmake

 DEPENDS = "boost zlib"

-EXTRA_OECMAKE = " \
-    -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-    -DENABLE_COMPILE_TESTS=OFF \
-    -DBUILD_CONTRIBS_LIB=ON"
+EXTRA_OECMAKE = "-DENABLE_COMPILE_TESTS=OFF -DBUILD_CONTRIBS_LIB=ON"
+
+FILES_${PN}-dev += "${libdir}/cmake"

 BBCLASSEXTEND = "native"
--- 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/graphite2/graphite2.bb
+++ b/recipes-support/graphite2/graphite2.bb
@@ -1,17 +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 = "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"
--- a/recipes-support/graphite2/graphite2_1.3.5.bb
+++ b/recipes-support/graphite2/graphite2_1.3.5.bb
@@ -0,0 +1,12 @@
+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=acba2ba259d936c324b90ab679e6b901"
+
+inherit cmake
+
+DEPENDS += "freetype"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/silgraphite/${BPN}/${BPN}-${PV}.tgz"
+SRC_URI[md5sum] = "5b8d22a8bbf031838e31432868c0109c"
+SRC_URI[sha256sum] = "f4712626eda0a1804367133460770560b545bbe75b1c4aab480c9b8e4e1c64bd"
--- a/recipes-support/gtkmathview/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch
+++ b/recipes-support/gtkmathview/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch
@@ -1,31 +0,0 @@
-From 90411a7f5e0e9582e79f0a8ccc1e2f158615e451 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 19 May 2018 23:18:11 -0700
-Subject: [PATCH] Fix formatting for modern c++11 compilers
-
-Fixes
-error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/backend/svg/SVG_RenderingContext.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/backend/svg/SVG_RenderingContext.cc b/src/backend/svg/SVG_RenderingContext.cc
-index 55d6097..0d50702 100644
--- a/src/backend/svg/SVG_RenderingContext.cc
-+++ b/src/backend/svg/SVG_RenderingContext.cc
-@@ -68,7 +68,7 @@ void
- SVG_RenderingContext::documentStart(const BoundingBox& bbox)
- {
-   beginDocument(bbox);
-  metadata("Created by "PACKAGE" version "VERSION);
-+  metadata("Created by " PACKAGE " version " VERSION);
- }
- 
- void
-- 
-2.17.0
-
--- a/recipes-support/gtkmathview/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
+++ b/recipes-support/gtkmathview/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
@@ -1,28 +0,0 @@
-From c92890c5e18bb6ee23bdb14074bacf306dd9428f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 5 May 2015 20:35:01 -0700
-Subject: [PATCH] include cstdio to get printf definitions
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/engine/boxml/BoxMLHOVElement.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/engine/boxml/BoxMLHOVElement.cc b/src/engine/boxml/BoxMLHOVElement.cc
-index 1a2812c..96c9eea 100644
--- a/src/engine/boxml/BoxMLHOVElement.cc
-+++ b/src/engine/boxml/BoxMLHOVElement.cc
-@@ -21,7 +21,7 @@
- // <http://www.gnu.org/licenses/>.
- 
- #include <config.h>
-
-+#include <cstdio>
- #include "BoxMLAttributeSignatures.hh"
- #include "BoxMLHOVElement.hh"
- #include "BoxMLHElement.hh"
-- 
-2.1.4
-
--- a/recipes-support/gtkmathview/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch
+++ b/recipes-support/gtkmathview/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch
@@ -1,63 +0,0 @@
-From 9c226fbc6a42540cb492fcfcb81ff16fffb086d6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Tue, 30 Aug 2016 23:24:53 +0200
-Subject: [PATCH] configure.ac: header detection of hash_map is broken - pin to
- correct implementation
-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>
---
- configure.ac | 31 ++++---------------------------
- 1 file changed, 4 insertions(+), 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f2118e..16c09d5 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -252,35 +252,12 @@ AC_SUBST(GTKMATHVIEW_SIZEOF_WCHAR_T, "$ac_cv_sizeof_wchar_t")
- 
- AC_LANG_PUSH(C++)
- 
-AC_CHECK_HEADERS(unordered_map,
-	[
-		AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided])
-		GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1
-	],
-	[
-		GMV_HAVE_UNORDERED_MAP_CFLAGS=
-	]
-)
-+GMV_HAVE_UNORDERED_MAP_CFLAGS=
- AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS)
-AC_CHECK_HEADERS(hash_map,
-	[
-		AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided])
-		GMV_HAVE_HASH_MAP_CFLAGS=-DGMV_HAVE_HASH_MAP=1
-	],
-	[
-		GMV_HAVE_HASH_MAP_CFLAGS=
-	]
-)
-+GMV_HAVE_HASH_MAP_CFLAGS=
- AC_SUBST(GMV_HAVE_HASH_MAP_CFLAGS)
-AC_CHECK_HEADERS(ext/hash_map,
-	[
-		AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided])
-		GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1
-	],
-	[
-		GMV_HAVE_EXT_HASH_MAP_CFLAGS=
-	]
-)
-+AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided])
-+GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1
- AC_SUBST(GMV_HAVE_EXT_HASH_MAP_CFLAGS)
- 
- AC_MSG_CHECKING([whether the C++ compiler supports the standard character traits])
-- 
-2.5.5
-
--- a/recipes-support/gtkmathview/gtkmathview/0003-gcc-6.0-build-fixes.patch
+++ b/recipes-support/gtkmathview/gtkmathview/0003-gcc-6.0-build-fixes.patch
@@ -1,93 +0,0 @@
-From: Gert Wollny <gw.fossdev@gmail.com>
-Date: Sun, 26 Jun 2016 13:25:00 +0200
-Description: gcc 6.0 build fixes
-Bug: https://bugs.debian.org/811682
-
-Slightly adapted to our environment
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
--- a/src/engine/common/View.cc
-+++ b/src/engine/common/View.cc
-@@ -291,7 +291,7 @@
- 	  }
-     }
- 
-  return false;
-+  return SmartPtr<Element>();
- }
- 
- bool
--- a/src/backend/common/tfm/TFM.hh
-+++ b/src/backend/common/tfm/TFM.hh
-@@ -37,7 +37,7 @@
-     unsigned char face;
-     const char* codingScheme;
-     int designSize;
-    int checksum;
-+    unsigned int checksum;
-     unsigned int nDimensions;
-     unsigned int nCharacters;
-   };
-@@ -52,7 +52,7 @@
-   struct Kerning
-   {
-     UChar8 index;
-    int value;
-+    unsigned int value;
-   };
- 
-   struct Ligature
-@@ -67,7 +67,7 @@
-     UChar8 index;
-     int width;
-     int height;
-    int depth;
-+    unsigned int depth;
-     int italicCorrection;
-     unsigned char nKernings;
-     const Kerning* kerning;
--- a/src/backend/common/StandardSymbolsShaper.hh
-+++ b/src/backend/common/StandardSymbolsShaper.hh
-@@ -32,20 +32,20 @@
-   struct HStretchyChar
-   {
-     Char16 ch;
-    Char8 normal;
-    Char8 left;
-    Char8 glue;
-    Char8 right;
-+    UChar8 normal;
-+    UChar8 left;
-+    UChar8 glue;
-+    UChar8 right;
-   };
-   
-   struct VStretchyChar
-   {
-     Char16 ch;
-    Char8 normal;
-    Char8 top;
-    Char8 glue;
-    Char8 middle;
-    Char8 bottom;
-+    UChar8 normal;
-+    UChar8 top;
-+    UChar8 glue;
-+    UChar8 middle;
-+    UChar8 bottom;
-   };
- 
- protected:
--- a/src/backend/common/StandardSymbolsShaper.cc
-+++ b/src/backend/common/StandardSymbolsShaper.cc
-@@ -29,7 +29,7 @@
- #include "ShapingContext.hh"
- 
- struct GlyphMap {
-  Char8 index;
-+  UChar8 index;
-   Char16 ch;
- };
- 
--- a/recipes-support/gtkmathview/gtkmathview/use_hostcxx.patch
+++ b/recipes-support/gtkmathview/gtkmathview/use_hostcxx.patch
@@ -1,18 +0,0 @@
-Use build_cc to compile the programs to run on build host
-helps with cross compiling
-
-Upstream-Status: Inappropriate [Cross-compiled OE specific]
-
-diff --git a/src/common/mathvariants/Makefile.am b/src/common/mathvariants/Makefile.am
-index 636ccf0..ed9921d 100644
--- a/src/common/mathvariants/Makefile.am
-+++ b/src/common/mathvariants/Makefile.am
-@@ -52,7 +52,7 @@ XSLTPROC = xsltproc
- %.cc : %_gen.cc $(srcdir)/variant.top $(srcdir)/variant.bot
- 	cat $(srcdir)/variant.top >$@
- 	$(XSLTPROC) --novalid --param temp "false()" $(srcdir)/extract.xsl $(<:%_gen.cc=$(srcdir)/xml/%.xml) >>$@
-	$(CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $<
-+	$(BUILD_CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $<
- 	echo "Char32 " >>$@
- 	basename map_variant_$@ .cc | tr "-" "_" >>$@
- 	echo "(Char32 ch)" >>$@
--- a/recipes-support/gtkmathview/gtkmathview_0.8.0.bb
+++ b/recipes-support/gtkmathview/gtkmathview_0.8.0.bb
@@ -1,28 +0,0 @@
-HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
-DEPENDS = "t1lib gtk+ popt libxslt-native libxml2"
-
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-
-PR = "r3"
-PV = "0.8.0+git${SRCPV}"
-
-SRC_URI = " \
-    git://github.com/GNOME/gtkmathview.git \
-    file://use_hostcxx.patch \
-    file://0001-include-cstdio-to-get-printf-definitions.patch \
-    file://0002-configure.ac-header-detection-of-hash_map-is-broken-.patch \
-    file://0003-gcc-6.0-build-fixes.patch \
-    file://0001-Fix-formatting-for-modern-c-11-compilers.patch \
-"
-SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec"
-S = "${WORKDIR}/git"
-
-inherit features_check autotools pkgconfig
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-do_configure_append() {
-    # avoid host polution inf pkg-config files
-    sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'`
-}
--- a/recipes-support/libcmis/libcmis_0.5.1.bb
+++ b/recipes-support/libcmis/libcmis_0.5.1.bb
@@ -12,8 +12,8 @@ SRC_URI = " \
    file://0001-Avoid-cross-compile-unsafe-paths.patch \
 "

-SRC_URI[md5sum] = "e3ebb4f603e62e748685b6376d5719d9"
-SRC_URI[sha256sum] = "ed6f681a48abbf3c2324564b17a180d21fa9503230e8708825e1ad80daee4f81"
+SRC_URI[md5sum] = "3270154f0f40d86fce849b161f914101"
+SRC_URI[sha256sum] = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"

 inherit autotools pkgconfig

--- a/recipes-support/libexttextcat/libexttextcat_3.4.4.bb
+++ b/recipes-support/libexttextcat/libexttextcat_3.4.4.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
 "

 SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "69c984b1785b56942179eb0ddc9c758f"
-SRC_URI[sha256sum] = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"
+SRC_URI[md5sum] = "bfa7107c27afda3a3afa4b7ab5a3fe17"
+SRC_URI[sha256sum] = "f24c086cf3523424228ed58b9f678cc7647688822e5407d5fbc155fbfc846293"

 inherit autotools pkgconfig

--- 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.3.bb
+++ b/recipes-support/liblangtag/liblangtag_0.6.3.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] = "015274eb284b1dc82bf7af1d1774ec64"
-SRC_URI[sha256sum] = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd"
-
-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,36 +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"
-
-BBCLASSEXTEND = "native"
--- a/recipes-support/mdds/mdds-1.5/0001-configure.ac-remove-fixed-paths-causing-trouble-when.patch
+++ b/recipes-support/mdds/mdds-1.5/0001-configure.ac-remove-fixed-paths-causing-trouble-when.patch
@@ -1,28 +0,0 @@
-From 97cb7eaa45c08a9b9850200e10ab5668df324ec3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 2 Aug 2019 16:45:27 +0200
-Subject: [PATCH] configure.ac: remove fixed paths causing trouble when cross
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7d06139..d3ad7fc 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,6 @@ AC_SUBST(MISCDIR)
- AC_SUBST(QUICKCHECKDIR)
- 
- CPPFLAGS="$CPPFLAGS -Wall -O2 -g -pedantic-errors"
-CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include"
- CXXFLAGS="$CXXFLAGS -Wshadow -std=c++11"
- 
- AC_ARG_ENABLE(debug-stdcxx,
-- 
-2.21.0
-
--- a/recipes-support/mdds/mdds-1.5_1.5.0.bb
+++ b/recipes-support/mdds/mdds-1.5_1.5.0.bb
@@ -1,19 +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://LICENSE;md5=60a6093677ded88b5e28677e52a0c011"
-
-inherit autotools-brokensep pkgconfig
-
-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] = "52cb08e92fec8842a3724bd89051f9d3"
-SRC_URI[sha256sum] = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d"
-
-S = "${WORKDIR}/mdds-${PV}"
-
-DEPENDS = "boost"
-
-BBCLASSEXTEND = "native"
--- a/recipes-support/mdds/mdds-1.2/0001-configure.ac-remove-fixed-paths-causing-trouble-when.patch
+++ b/recipes-support/mdds/mdds-1.2/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@gmail.com>
-Date: Thu, 30 Nov 2017 12:55:30 +0100
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+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
@@ -9,23 +9,23 @@ Content-Transfer-Encoding: 8bit

 Upstream-Status: Inappropriate [cross specific]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+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 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.2_1.3.1.bb
+++ b/recipes-support/mdds/mdds-1.2_1.3.1.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/mdds/mdds_0.12.1.bb
+++ b/recipes-support/mdds/mdds_0.12.1.bb
@@ -0,0 +1,16 @@
+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"
--- 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"
--- a/recipes-support/t1lib/t1lib-5.1.2/configure.patch
+++ b/recipes-support/t1lib/t1lib-5.1.2/configure.patch
@@ -1,143 +0,0 @@
-From 81c1ba940415595584a837ab1078c64855072f0c Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Mon, 21 Nov 2011 12:00:54 +0100
-Subject: [PATCH] t1lib: add 5.1.2
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Upstream-Status: Inappropriate [oe-specific]
-
---
- configure.in | 95 ++++++++++++++++++++++++------------------------------------
- 1 file changed, 38 insertions(+), 57 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index eade4c0..e649ea9 100644
--- a/configure.in
-+++ b/configure.in
-@@ -74,9 +74,9 @@ T1LIB_PATCHLEVEL=builtin(eval, MACRO_T1LIB_LT_REVISION)
- T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\"
- 
- 
-dnl We use this file by Andreas Zeller to check for libXaw
-builtin(include, ac-tools/ice_find_athena.m4)
-builtin(include, ac-tools/aclocal.m4)
-+#dnl We use this file by Andreas Zeller to check for libXaw
-+#builtin(include, ac-tools/ice_find_athena.m4)
-+#builtin(include, ac-tools/aclocal.m4)
- 
- dnl We want these before the checks, so the checks can modify their values.
- test -z "$LDLIBS" && LDLIBS=-lm   AC_SUBST(LDLIBS)
-@@ -162,6 +162,7 @@ fi
- 
- dnl **** Check for underscore on external symbols ****
- 
-+AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix])
- AC_CACHE_CHECK("whether external symbols need an underscore prefix",
-                ac_cv_c_extern_prefix,
- [saved_libs=$LIBS
-@@ -179,68 +180,48 @@ then
-   AC_DEFINE(NEED_UNDERSCORE_PREFIX)
- fi
- 
-dnl **** Check which ANSI integer type is 16 bit 
-
-AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type,
-		AC_TRY_RUN([
-int main(void) {
-  if (sizeof(short)==2)
-    return(0);
-  else if (sizeof(int)==2)
-    return(1);
-  else
-    return(2);
-}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=))
-if test "$ac_16bit_type" = "short"
-then
-  T1_AA_TYPE16="-DT1_AA_TYPE16=short"
-  T1_INT16="short"
-else
-  T1_AA_TYPE16="-DT1_AA_TYPE16=int"
-  T1_INT16="int"
-+dnl **** Check which ANSI integer type is 16 bit
-+T1_AA_TYPE16=""
-+for type in short int; do
-+	if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then
-+		T1_AA_TYPE16="-DT1_AA_TYPE16=$type"
-+		T1_INT16="$type"
-+		break
-+	fi
-+done
-+
-+if test x"$T1_AA_TYPE16" = "x"; then
-+	AC_MSG_ERROR("Unable to determine which integer type is 16 bit.")
- fi
- 
-
- dnl **** Check which ANSI integer type is 32 bit 
-
-AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type,
-		AC_TRY_RUN([
-int main(void) {
-  if (sizeof(int)==4)
-    return(0);
-  else if (sizeof(long)==4)
-    return(1);
-  else
-    return(2);
-}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=))
-if test "$ac_32bit_type" = "int"
-then
-  T1_AA_TYPE32="-DT1_AA_TYPE32=int"
-  T1_INT32="int"
-else
-  T1_AA_TYPE32="-DT1_AA_TYPE32=long"
-  T1_INT32="long"
-+T1_AA_TYPE32=""
-+for type in int long; do
-+	if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then
-+		T1_AA_TYPE32="-DT1_AA_TYPE32=$type"
-+		T1_INT32="$type"
-+		break
-+	fi
-+done
-+
-+if test x"$T1_AA_TYPE32" = "x"; then
-+	AC_MSG_ERROR("Unable to determine which integer type is 32 bit.")
- fi
- 
-
- dnl **** Check which ANSI integer type is 64 bit 
-
-AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type,
-		AC_TRY_RUN([
-int main(void) {
-  if (sizeof(long)==8)
-    return(0);
-  else
-    return(1);
-}], ac_64bit_type="long", ac_64bit_type="<none>"))
-if test "$ac_64bit_type" = "long"
-then
-  T1_AA_TYPE64="-DT1_AA_TYPE64=long"
-else
-  T1_AA_TYPE64=
-+T1_AA_TYPE64=""
-+for type in long long_long; do
-+	if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then
-+		AC_MSG_WARN("$type is 64 bit")
-+		T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\""
-+		break
-+	fi
-+done
-+
-+if test x"$T1_AA_TYPE64" = "x"; then
-+	AC_MSG_ERROR("Unable to determine which integer type is 64 bit.")
- fi
- 
-
- CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\""
- 
- dnl **** Check for functions and header files ****
--- a/recipes-support/t1lib/t1lib-5.1.2/format_security.patch
+++ b/recipes-support/t1lib/t1lib-5.1.2/format_security.patch
@@ -1,58 +0,0 @@
-From cea83003de3ffebde92becd1e599fe3b28f0a7c4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 Mar 2017 23:13:36 -0800
-Subject: [PATCH] t1lib: Fix printf format string errors
-
-Fix printf formats to use format qualifiers
-fixes
-
-error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
---
- lib/t1lib/t1subset.c | 2 +-
- lib/type1/objects.c  | 2 +-
- lib/type1/objects.h  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/t1lib/t1subset.c b/lib/t1lib/t1subset.c
-index da427b2..e76974f 100644
--- a/lib/t1lib/t1subset.c
-+++ b/lib/t1lib/t1subset.c
-@@ -759,7 +759,7 @@ char *T1_SubsetFont( int FontID,
- 	     tr_len);
-     T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf,
- 		 T1LOG_DEBUG);
-    l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */
-+    l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */
-   }
-   
-   /* compute size of output file */
-diff --git a/lib/type1/objects.c b/lib/type1/objects.c
-index c413a0f..f828e6a 100644
--- a/lib/type1/objects.c
-+++ b/lib/type1/objects.c
-@@ -957,7 +957,7 @@ struct xobject *TypeErr(name, obj, expect, ret) /* non-ANSI avoids overly strict
-  
-        sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n",
-                   name, TypeFmt(expect), TypeFmt(obj->type));
-       IfTrace0(TRUE,typemsg);
-+       IfTrace1(TRUE, "%s", typemsg);
-  
-        ObjectPostMortem(obj);
-  
-diff --git a/lib/type1/objects.h b/lib/type1/objects.h
-index 13cbae7..3a1d337 100644
--- a/lib/type1/objects.h
-+++ b/lib/type1/objects.h
-@@ -214,7 +214,7 @@ struct xobject {
- /*SHARED*/
- /* NDW: personally, I want to see status and error messages! */
- #define IfTrace0(condition,model)                                 \
-        {if (condition) printf(model);}
-+        {if (condition) fputs(model,stdout);}
- #define IfTrace1(condition,model,arg0)                            \
-         {if (condition) printf(model,arg0);}
- #define IfTrace2(condition,model,arg0,arg1)                       \
--- a/recipes-support/t1lib/t1lib-5.1.2/libtool.patch
+++ b/recipes-support/t1lib/t1lib-5.1.2/libtool.patch
@@ -1,146 +0,0 @@
-From bab41f5e1fc1fc809da1371e6a0222e0eb21e5f0 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Mon, 21 Nov 2011 12:00:54 +0100
-Subject: [PATCH] t1lib: add 5.1.2
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Upstream-Status: Pending
-
---
- Makefile.in           | 5 +++--
- examples/Makefile.in  | 5 +++--
- lib/Makefile.in       | 6 ++++--
- lib/t1lib/Makefile.in | 6 ++++--
- lib/type1/Makefile.in | 6 ++++--
- type1afm/Makefile.in  | 6 ++++--
- xglyph/Makefile.in    | 6 ++++--
- 7 files changed, 26 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 29c3468..396c020 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -18,7 +18,8 @@
- # Last modified:       2005-05-01
- #
- 
-SHELL     = /bin/sh
-+SHELL     = @SHELL@
-+LIBTOOL   = @LIBTOOL@
- CC        = @CC@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@
-@@ -149,7 +150,7 @@ distclean: clean
- 	$(RM) examples/Makefile
- 	$(RM) xglyph/Makefile
- 	$(RM) doc/Makefile
-	$(RM) libtool
-+	$(RM) $(LIBTOOL)
- 
- 
- # The following two targets are for building and cleaning the python-
-diff --git a/examples/Makefile.in b/examples/Makefile.in
-index b301db5..7a6a514 100644
--- a/examples/Makefile.in
-+++ b/examples/Makefile.in
-@@ -14,9 +14,10 @@
- # Last modified:       2001-04-01
- #
- 
-+top_builddir = @top_builddir@
- 
-LIBTOOL   = ../libtool
-SHELL     = /bin/sh
-+LIBTOOL   = @LIBTOOL@
-+SHELL     = @SHELL@
- CC        = @CC@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index 89e5e86..6e0f960 100644
--- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -15,8 +15,10 @@
- #
- # Contributions by H.Kakugawa to use libtool!
- 
-LIBTOOL   = ../libtool
-SHELL     = /bin/sh
-+top_builddir = @top_builddir@
-+
-+LIBTOOL   = @LIBTOOL@
-+SHELL     = @SHELL@
- CC        = @CC@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@
-diff --git a/lib/t1lib/Makefile.in b/lib/t1lib/Makefile.in
-index a6c2478..32434b3 100644
--- a/lib/t1lib/Makefile.in
-+++ b/lib/t1lib/Makefile.in
-@@ -14,8 +14,10 @@
- #
- # Modified by H.Kakugawa to use libtool
- 
-LIBTOOL   = ../../libtool
-SHELL     = /bin/sh
-+top_builddir = @top_builddir@
-+
-+LIBTOOL   = @LIBTOOL@
-+SHELL     = @SHELL@
- CC        = @CC@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@
-diff --git a/lib/type1/Makefile.in b/lib/type1/Makefile.in
-index 241f124..42efa94 100644
--- a/lib/type1/Makefile.in
-+++ b/lib/type1/Makefile.in
-@@ -14,8 +14,10 @@
- #
- # Modified by H.Kakugawa to use libtool
- 
-LIBTOOL   = ../../libtool
-SHELL     = /bin/sh
-+top_builddir = @top_builddir@
-+
-+LIBTOOL   = @LIBTOOL@
-+SHELL     = @SHELL@
- CC        = @CC@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@
-diff --git a/type1afm/Makefile.in b/type1afm/Makefile.in
-index 61611e1..9b51406 100644
--- a/type1afm/Makefile.in
-+++ b/type1afm/Makefile.in
-@@ -15,8 +15,10 @@
- #
- # Modified by H.Kakugawa to use libtool
- 
-LIBTOOL   = ../libtool
-SHELL     = /bin/sh
-+top_builddir = @top_builddir@
-+
-+LIBTOOL   = @LIBTOOL@
-+SHELL     = @SHELL@
- CC        = @CC@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@
-diff --git a/xglyph/Makefile.in b/xglyph/Makefile.in
-index 8da9b63..741334c 100644
--- a/xglyph/Makefile.in
-+++ b/xglyph/Makefile.in
-@@ -15,8 +15,10 @@
- #
- # Modified by H.Kakugawa to use libtool
- 
-LIBTOOL   = ../libtool
-SHELL     = /bin/sh
-+top_builddir = @top_builddir@
-+
-+LIBTOOL   = @LIBTOOL@
-+SHELL     = @SHELL@
- CC        = @CC@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@
--- a/recipes-support/t1lib/t1lib_5.1.2.bb
+++ b/recipes-support/t1lib/t1lib_5.1.2.bb
@@ -1,31 +0,0 @@
-SUMMARY = "A Type1 Font Rastering Library"
-SECTION = "libs"
-DEPENDS = "virtual/libx11 libxaw"
-
-LICENSE = "LGPLv2 & GPLv2"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \
-    file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \
-"
-
-SRC_URI = " \
-    ${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
-    file://configure.patch \
-    file://libtool.patch \
-    file://format_security.patch \
-"
-SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c"
-SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59"
-
-inherit autotools-brokensep features_check
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
-
-# Fix GNU_HASH problem
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-EXTRA_OECONF = "--with-x --without-athena"
-EXTRA_OEMAKE = "without_doc"
-
-FILES_${PN} += " ${datadir}/t1lib/t1lib.config"
-FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf"
--- a/recipes-support/vigra/vigra_1.10.0.bb
+++ b/recipes-support/vigra/vigra_1.10.0.bb
@@ -13,10 +13,7 @@ inherit cmake

 DEPENDS = "tiff jpeg libpng"

-EXTRA_OECMAKE += " \
-    -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-    -DWITH_VIGRANUMPY=0 \
-"
+EXTRA_OECMAKE += "-DWITH_VIGRANUMPY=0"

 do_install_append() {
    # doc does not have useful content and is installed at the wrong location
--- a/recipes-support/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
+++ b/recipes-support/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
@@ -1,29 +0,0 @@
-From eebe1f27f4b27b05eb4b9b55f9df1124acf4d092 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Fri, 1 Aug 2014 12:25:24 +0200
-Subject: [PATCH] configure: use 'foreign' mode to avoid errors with missing
- NEWS/AUTHORS/etc
-
-Upstream-status: Pending
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3d7eef6..1784bdd 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -41,7 +41,7 @@ VERSION=$WV_VERSION
- PACKAGE=wv
- 
- dnl Initialize automake stuff
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-+AM_INIT_AUTOMAKE([foreign])
- 
- # Specify a configuration file
- AM_CONFIG_HEADER(config.h)
-- 
-1.9.0
-
--- a/recipes-support/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch
+++ b/recipes-support/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch
@@ -1,28 +0,0 @@
-From 079529b8d5e339e2211fa2f8c15543a738a627bc Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 27 Jun 2017 14:50:51 -0700
-Subject: [PATCH] wvRTF.c: Specify print format in rtf_output()
-
-Upstream-status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- wvRTF.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wvRTF.c b/wvRTF.c
-index 361d258..4f24b30 100644
--- a/wvRTF.c
-+++ b/wvRTF.c
-@@ -192,7 +192,7 @@ output_rtfUserData (rtfUserData * ud)
-     rtf_output_char ('{');
- 
-     /* font color */
-    rtf_output (rtfColors[ud->cCol]);
-+    rtf_output ("%s", rtfColors[ud->cCol]);
- 
-     /* font face */
-     rtf_output ("\\f%d", ud->cFont);
-- 
-2.13.2
-
--- a/Show More
+++ b/Show More
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