Merge pull request #13 from drewmoseley/zeus

libreoffice: Remove non-existent configure option for mariadb.

conf/layer.conf

@@ -6,5 +6,14 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/appends/*/*.bbappend"
 BBFILE_COLLECTIONS += "office-layer"
 BBFILE_PATTERN_office-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_office-layer = "7"
-LAYERSERIES_COMPAT_office-layer = "thud warrior"
+
+LAYERDEPENDS_office-layer = " \
+    core \
+    openembedded-layer \
+    meta-python \
+    gnome-layer \
+    networking-layer \
+"
+
+LAYERSERIES_COMPAT_office-layer = "thud warrior zeus"
 

recipes-libreoffice/libreoffice/libreoffice-native.bb

@@ -8,7 +8,6 @@ DEPENDS += " \
     cairo-native \
     libepoxy-native \
     curl-native \
-    gconf-native \
     libpng-native \
     jpeg-native \
     libxml2-native \

recipes-libreoffice/libreoffice/libreoffice-version.inc

@@ -1,9 +1,9 @@
-PV = "6.3.0.4"
-DIRV = "6.3.0"
+PV = "6.3.3.2"
+DIRV = "6.3.3"
 
 SRC_URI += " \
     http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
 "
 
-SRC_URI[md5sum] = "d24bd7e5116743196c67e7df4b18458f"
-SRC_URI[sha256sum] = "87830107b17fbf6c3831c8e6bf738e7d21fa7826debb88e4948d80caf2a7aed7"
+SRC_URI[md5sum] = "2cecdd24f36fbc2e2276e453658381e8"
+SRC_URI[sha256sum] = "d40ee5b29c9a0c2f0df2681f993b04a9f64e13d785fa7b7a1e8349b84149e5cf"

recipes-libreoffice/libreoffice/libreoffice.bb

@@ -13,10 +13,11 @@ SRC_URI += " \
     file://0008-configure.ac-avoid-finding-calling-pg_config.patch \
     file://0009-avoid-downloading-by-git-submodules.patch \
     file://0010-Use-wrappers-for-gobject-introspection.patch \
+    file://0011-Fix-build-with-poppler-0.82.patch \
 "
 
-SRC_URI[translations.md5sum] = "21459291d488ecd7e4e8fb0fdcc55aca"
-SRC_URI[translations.sha256sum] = "090098f72f2c153ee361e9a01f7b2593b0447e93bf4d694a130b803c0577601c"
+SRC_URI[translations.md5sum] = "fcaa3bf5996b0c3cb3e92884b601da54"
+SRC_URI[translations.sha256sum] = "721b760b7a9dc88e7d278dab89a2148a4e9239047f7b8f9ee6741c0f8f84b2fb"
 
 DEPENDS += " \
     ${BPN}-native \
@@ -143,7 +144,7 @@ PACKAGECONFIG[gtk3] = "--enable-gtk3 , --disable-gtk3, gtk+3 cairo"
 PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi"
 PACKAGECONFIG[odk] = "--enable-odk, --disable-odk"
 
-PACKAGECONFIG[mariadb] = "--with-system-mariadb, --disable-ext-mariadb-connector, mariadb"
+PACKAGECONFIG[mariadb] = "--with-system-mariadb, , mariadb"
 PACKAGECONFIG[postgresql] = "--enable-postgresql-sdbc --with-system-postgresql, --disable-postgresql-sdbc, postgresql"
 
 do_configure() {
@@ -213,9 +214,7 @@ INSANE_SKIP_${PN}-odk += "dev-so staticdev"
 # 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}.res \
-    ${libdir}/libreoffice/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \
-    ${libdir}/libreoffice/share/config/soffice.cfg/*/ui/res/%{1}.zip \
+    ${libdir}/libreoffice/program/resource/*%{1}/LC_MESSAGES \
     ${libdir}/libreoffice/share/registry/Langpack-%{1}.xcd \
     ${libdir}/libreoffice/share/registry/res/registry_%{1}.xcd \
     ${libdir}/libreoffice/share/registry/res/fcfg_langpack_%{1}.xcd \

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

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

recipes-support/xlnt/xlnt_git.bb

@@ -0,0 +1,13 @@
+SUMMARY = "Font rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE = "https://github.com/tfussell/xlnt"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=edf9330898c89b4ef169be15be60107e"
+
+inherit cmake
+
+#DEPENDS += "freetype"
+
+SRC_URI = "git://github.com/tfussell/xlnt.git"
+SRCREV = "f30260153fcee7e1f775f25ff0cb2750e7826296"
+S = "${WORKDIR}/git"
+PV = "1.3.0+git${SRCPV}"