Accepting request 668318 from LibreOffice:Factory

- Add patch to build with java-11.2: * java112.patch - Version update to 6.2.0.3: * 6.2.0 rc3 release - Reduce disk constraints to 25G it should be enough - Update to 6.2.0.2: * 6.2.0 rc2 release - Switch to the new web based help system bsc#1116451 - Remove upstreamed patches: * libreoffice-java-sched.patch * 0001-call-System.runFinalizersOnExit-by-reflection-since-.patch * boost_1_69.patch * libreoffice-poppler-0.72.patch * bsc1112114.patch - Enable new approach for mariadb connector again - Version update to 6.1.5.1: * 6.1.5 bugfix release - Drop merged patch: * bsc1112113.patch - [Bug 1112114] LO-L3: [PPTX] SmartArt: Basic rendering of the Organizational Chart * bsc1112114.patch - Replace libreoffice-poppler-0.71.patch with libreoffice-poppler-0.72.patch and apply it conditionally. Fix build with poppler 0.72. OBS-URL: https://build.opensuse.org/request/show/668318 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=171
2019-01-26 21:20:27 +00:00 · 2019-01-26 21:20:27 +00:00 · 5536011f69
commit 5536011f69
parent f56cbb1ada bf0fa5b5df
25 changed files with 162 additions and 861 deletions
--- a/0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
+++ b/0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
@ -1,48 +0,0 @@
 From 1d3f2ed0606cc971513dab5932ec7d1dd2a15f90 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
 Date: Thu, 12 Jul 2018 11:57:07 +0200
 Subject: [PATCH] call System.runFinalizersOnExit by reflection, since it was
 removed in jdk11
 Change-Id: I542c87bc1de21727a035cc6ac3b3e20c0ccfb5f7
 ---
 external/hsqldb/UnpackedTarball_hsqldb.mk          |  1 +
 .../patches/hsqldb-runFinalizersOnExit.patch       | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
 diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
 index fc6c18f77c23..cbba770f19a0 100644
 --- a/external/hsqldb/UnpackedTarball_hsqldb.mk
 +++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
 	external/hsqldb/patches/i104901.patch \
 	external/hsqldb/patches/fdo36824.patch \
 	external/hsqldb/patches/limit_as_table_alias.patch \
 +	external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \
 	$(if $(HSQLDB_USE_JDBC_4_1),\
 		external/hsqldb/patches/jdbc-4.1.patch \
 		external/hsqldb/patches/multipleResultSets.patch \
 diff --git a/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
 new file mode 100644
 index 000000000000..214dc2c2b2e1
 --- /dev/null
 +++ b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
@@ -0,0 +1,14 @@
 +--- misc/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java	2008-03-16 23:51:35.000000000 +0100
 ++++ misc/build/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java	2018-07-12 11:46:57.997837180 +0200
 +@@ -160,8 +160,9 @@
 +     public static void runFinalizers() {
 + 
 + //#ifdef JAVA2FULL
 +-        System.runFinalizersOnExit(true);
 +-
 ++        try {
 ++            System.class.getMethod("runFinalizersOnExit", boolean.class).invoke(null, true);
 ++        } catch (Exception e) {}
 + //#endif
 +     }
 + 
 -- 
 2.18.0
--- a/2
+++ b/2
@ -4,7 +4,7 @@
      <size unit="M">4000</size>
    </physicalmemory>
    <disk>
-      <size unit="G">50</size>
+      <size unit="G">25</size>
    </disk>
  </hardware>
 </constraints>
--- a/boost_1_69.patch
+++ b/boost_1_69.patch
@ -1,13 +0,0 @@
 Index: libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx
 ===================================================================
 --- libreoffice-6.1.3.2.orig/sfx2/source/appl/shutdownicon.cxx
 +++ libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx
@@ -141,7 +141,7 @@ bool LoadModule()
 #endif // ENABLE_QUICKSTART_APPLET
     }
     assert(!boost::logic::indeterminate(loaded));
 -    return loaded;
 +    return (bool)loaded;
 }
 }
--- a/bsc1112113.patch
+++ b/bsc1112113.patch
@ -1,528 +0,0 @@
 From 73cc724dc35551ea349b3da0c4ecd6cba2fdd0ae Mon Sep 17 00:00:00 2001
 From: Miklos Vajna <vmiklos@collabora.com>
 Date: Tue, 13 Nov 2018 18:00:50 +0100
 Subject: [PATCH] Related: tdf#117761 oox smartart: backport fixes related to process types
 This is a combination of 9 commits.
 This is the 1st commit:
 oox smartart, accent process: add support for reading values from constraints
 (cherry picked from commit b389aafee9cfba9dc4dfa552347be39ff9fe41b2)
 This is the commit #2:
 oox smartart, accent process: add support for zorder offsets
 (cherry picked from commit cd348a6244a092c251a8e1362cd78de562d7bef6)
 This is the commit #3:
 oox smartart, accent process: fix overlapping shape pairs
 (cherry picked from commit 67e062aa5e5946d4985921fe2b6f87766f363ddc)
 This is the commit #4:
 oox smartart, accent process: handle multiple runs from a data point
 (cherry picked from commit cfa76f538a44d4396574ece59e8a3953c22c6eb7)
 This is the commit #5:
 oox smartart, accent process: handle followSib axis of forEach
 (cherry picked from commit aedc5427e4b6645ff3257e523c33190cf5e1934d)
 This is the commit #6:
 oox smartart, accent process: handle connector shape between pairs
 (cherry picked from commit 7f66a340933339974b5c6d70af4ae3c17e4f001a)
 This is the commit #7:
 oox smartart, accent process: adjust size of connector from constraints
 (cherry picked from commit ddc2786831367577967e806d603f337a2e42806a)
 This is the commit #8:
 oox smartart, continuous block process: read space width from constraint
 (cherry picked from commit ee6787fc5597b7f730c4ee3a1f2a1b261d0a5644)
 Conflicts:
 	oox/source/drawingml/diagram/diagramlayoutatoms.cxx
 This is the commit #9:
 oox smartart, accent process: fix missing bullets and large para indent
 (cherry picked from commit 6277a767f33bb5327408dafff2fed199087e938d)
 Change-Id: I60bbee75f3e834551ebb1963a2f42101f3bd91d4
 Reviewed-on: https://gerrit.libreoffice.org/65352
 Tested-by: Jenkins
 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
 Tested-by: Caolán McNamara <caolanm@redhat.com>
 ---
 diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
 index 6028a11..e04a58beb 100644
 --- a/include/oox/drawingml/shape.hxx
 +++ b/include/oox/drawingml/shape.hxx
@@ -214,6 +214,14 @@
     const LinkedTxbxAttr&     getLinkedTxbxAttributes() { return maLinkedTxbxAttr; };
     bool                isLinkedTxbx() { return mbHasLinkedTxbx; };
 +    void setZOrder(sal_Int32 nZOrder) { mnZOrder = nZOrder; }
 +
 +    sal_Int32 getZOrder() const { return mnZOrder; }
 +
 +    void setZOrderOff(sal_Int32 nZOrderOff) { mnZOrderOff = nZOrderOff; }
 +
 +    sal_Int32 getZOrderOff() const { return mnZOrderOff; }
 +
 protected:
     css::uno::Reference< css::drawing::XShape > const &
@@ -327,6 +335,12 @@
     bool                            mbHasLinkedTxbx; // this text box has linked text box ?
     css::uno::Sequence<css::beans::PropertyValue> maDiagramDoms;
 +
 +    /// Z-Order.
 +    sal_Int32 mnZOrder = 0;
 +
 +    /// Z-Order offset.
 +    sal_Int32 mnZOrderOff = 0;
 };
 } }
 diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
 index c1aaf6e..5024709 100644
 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
 +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -54,6 +54,50 @@
     return oRet;
 }
 +
 +/**
 + * Determines if nUnit is a font unit (measured in points) or not (measured in
 + * millimeters).
 + */
 +bool isFontUnit(sal_Int32 nUnit)
 +{
 +    return nUnit == oox::XML_primFontSz || nUnit == oox::XML_secFontSz;
 +}
 +
 +/// Determines the connector shape type from a linear alg.
 +sal_Int32 getConnectorType(const oox::drawingml::LayoutNode* pNode)
 +{
 +    sal_Int32 nType = oox::XML_rightArrow;
 +
 +    if (!pNode)
 +        return nType;
 +
 +    for (const auto& pChild : pNode->getChildren())
 +    {
 +        auto pAlgAtom = dynamic_cast<oox::drawingml::AlgAtom*>(pChild.get());
 +        if (!pAlgAtom)
 +            continue;
 +
 +        if (pAlgAtom->getType() != oox::XML_lin)
 +            continue;
 +
 +        sal_Int32 nDir = oox::XML_fromL;
 +        if (pAlgAtom->getMap().count(oox::XML_linDir))
 +            nDir = pAlgAtom->getMap().find(oox::XML_linDir)->second;
 +
 +        switch (nDir)
 +        {
 +            case oox::XML_fromL:
 +                nType = oox::XML_rightArrow;
 +                break;
 +            case oox::XML_fromR:
 +                nType = oox::XML_leftArrow;
 +                break;
 +        }
 +    }
 +
 +    return nType;
 +}
 }
 namespace oox { namespace drawingml {
@@ -269,13 +313,15 @@
     rVisitor.visit(*this);
 }
 -void ConstraintAtom::parseConstraint(std::vector<Constraint>& rConstraints) const
 +void ConstraintAtom::parseConstraint(std::vector<Constraint>& rConstraints,
 +                                     bool bRequireForName) const
 {
 +    if (bRequireForName && maConstraint.msForName.isEmpty())
 +        return;
 +
     // accepting only basic equality constraints
 -    if (!maConstraint.msForName.isEmpty() &&
 -        (maConstraint.mnOperator == XML_none || maConstraint.mnOperator == XML_equ) &&
 -        maConstraint.mnType != XML_none &&
 -        maConstraint.mfValue == 0)
 +    if ((maConstraint.mnOperator == XML_none || maConstraint.mnOperator == XML_equ)
 +        && maConstraint.mnType != XML_none)
     {
         rConstraints.push_back(maConstraint);
     }
@@ -290,7 +336,7 @@
                            const std::vector<Constraint>& rOwnConstraints ) const
 {
     // Algorithm result may depend on the parent constraints as well.
 -    std::vector<Constraint> aParentConstraints;
 +    std::vector<Constraint> aMergedConstraints;
     const LayoutNode* pParent = getLayoutNode().getParentLayoutNode();
     if (pParent)
     {
@@ -298,10 +344,12 @@
         {
             auto pConstraintAtom = dynamic_cast<ConstraintAtom*>(pChild.get());
             if (pConstraintAtom)
 -                pConstraintAtom->parseConstraint(aParentConstraints);
 +                pConstraintAtom->parseConstraint(aMergedConstraints, /*bRequireForName=*/true);
         }
     }
 -    const std::vector<Constraint>& rConstraints = rOwnConstraints.empty() ? aParentConstraints : rOwnConstraints;
 +    aMergedConstraints.insert(aMergedConstraints.end(), rOwnConstraints.begin(),
 +                              rOwnConstraints.end());
 +    const std::vector<Constraint>& rConstraints = aMergedConstraints;
     switch(mnType)
     {
@@ -327,7 +375,19 @@
                     if (aRefType != aRef->second.end())
                         aProperties[rConstr.msForName][rConstr.mnType] = aRefType->second * rConstr.mfFactor;
                     else
 -                        aProperties[rConstr.msForName][rConstr.mnType] = 0; // TODO: val
 +                    {
 +                        // Values are never in EMU, while oox::drawingml::Shape
 +                        // position and size are always in EMU.
 +                        double fUnitFactor = 0;
 +                        if (isFontUnit(rConstr.mnRefType))
 +                            // Points -> EMU.
 +                            fUnitFactor = EMU_PER_PT;
 +                        else
 +                            // Millimeters -> EMU.
 +                            fUnitFactor = EMU_PER_HMM * 100;
 +                        aProperties[rConstr.msForName][rConstr.mnType]
 +                            = rConstr.mfValue * fUnitFactor;
 +                    }
                 }
             }
@@ -376,7 +436,54 @@
         }
         case XML_conn:
 +        {
 +            if (rShape->getSubType() == XML_conn)
 +            {
 +                // There is no shape type "conn", replace it by an arrow based
 +                // on the direction of the parent linear layout.
 +                sal_Int32 nType = getConnectorType(pParent);
 +
 +                rShape->setSubType(nType);
 +                rShape->getCustomShapeProperties()->setShapePresetType(nType);
 +            }
 +
 +            // Parse constraints to adjust the size.
 +            std::vector<Constraint> aDirectConstraints;
 +            const LayoutNode& rLayoutNode = getLayoutNode();
 +            for (const auto& pChild : rLayoutNode.getChildren())
 +            {
 +                auto pConstraintAtom = dynamic_cast<ConstraintAtom*>(pChild.get());
 +                if (pConstraintAtom)
 +                    pConstraintAtom->parseConstraint(aDirectConstraints, /*bRequireForName=*/false);
 +            }
 +
 +            LayoutPropertyMap aProperties;
 +            LayoutProperty& rParent = aProperties[""];
 +            rParent[XML_w] = rShape->getSize().Width;
 +            rParent[XML_h] = rShape->getSize().Height;
 +            rParent[XML_l] = 0;
 +            rParent[XML_t] = 0;
 +            rParent[XML_r] = rShape->getSize().Width;
 +            rParent[XML_b] = rShape->getSize().Height;
 +            for (const auto& rConstr : aDirectConstraints)
 +            {
 +                const LayoutPropertyMap::const_iterator aRef
 +                    = aProperties.find(rConstr.msRefForName);
 +                if (aRef != aProperties.end())
 +                {
 +                    const LayoutProperty::const_iterator aRefType
 +                        = aRef->second.find(rConstr.mnRefType);
 +                    if (aRefType != aRef->second.end())
 +                        aProperties[rConstr.msForName][rConstr.mnType]
 +                            = aRefType->second * rConstr.mfFactor;
 +                }
 +            }
 +            awt::Size aSize;
 +            aSize.Width = rParent[XML_w];
 +            aSize.Height = rParent[XML_h];
 +            rShape->setSize(aSize);
             break;
 +        }
         case XML_cycle:
         {
@@ -428,9 +535,24 @@
             const sal_Int32 nIncX = nDir==XML_fromL ? 1 : (nDir==XML_fromR ? -1 : 0);
             const sal_Int32 nIncY = nDir==XML_fromT ? 1 : (nDir==XML_fromB ? -1 : 0);
 -            // TODO: get values from constraints
             sal_Int32 nCount = rShape->getChildren().size();
             double fSpace = 0.3;
 +
 +            // Find out which contraint is relevant for which (internal) name.
 +            LayoutPropertyMap aProperties;
 +            for (const auto& rConstraint : rConstraints)
 +            {
 +                if (rConstraint.msForName.isEmpty())
 +                    continue;
 +
 +                LayoutProperty& rProperty = aProperties[rConstraint.msForName];
 +                if (rConstraint.mnType == XML_w)
 +                    rProperty[XML_w] = rShape->getSize().Width * rConstraint.mfFactor;
 +
 +                // TODO: get values from differently named constraints as well
 +                if (rConstraint.msForName == "sibTrans" && rConstraint.mnType == XML_w)
 +                    fSpace = rConstraint.mfFactor;
 +            }
             awt::Size aChildSize = rShape->getSize();
             if (nDir == XML_fromL || nDir == XML_fromR)
@@ -443,18 +565,6 @@
                 aCurrPos.X = rShape->getSize().Width - aChildSize.Width;
             if (nIncY == -1)
                 aCurrPos.Y = rShape->getSize().Height - aChildSize.Height;
 -
 -            // Find out which contraint is relevant for which (internal) name.
 -            LayoutPropertyMap aProperties;
 -            for (const auto& rConstraint : rConstraints)
 -            {
 -                if (rConstraint.msForName.isEmpty())
 -                    continue;
 -
 -                LayoutProperty& rProperty = aProperties[rConstraint.msForName];
 -                if (rConstraint.mnType == XML_w)
 -                    rProperty[XML_w] = rShape->getSize().Width * rConstraint.mfFactor;
 -            }
             // See if children requested more than 100% space in total: scale
             // down in that case.
@@ -500,7 +610,7 @@
                 aSize.Width *= fWidthScale;
                 aCurrShape->setSize(aSize);
 -                aCurrShape->setChildSize(aChildSize);
 +                aCurrShape->setChildSize(aSize);
                 aCurrPos.X += nIncX * (aSize.Width + fSpace*aSize.Width);
                 aCurrPos.Y += nIncY * (aChildSize.Height + fSpace*aChildSize.Height);
             }
@@ -711,13 +821,27 @@
             }
             ParamMap::const_iterator aBulletLvl = maMap.find(XML_stBulletLvl);
 +            int nStartBulletsAtLevel = 0;
             if (aBulletLvl != maMap.end())
 +            {
                 nBaseLevel -= aBulletLvl->second;
 +                nStartBulletsAtLevel = aBulletLvl->second;
 +            }
             for (auto & aParagraph : pTextBody->getParagraphs())
             {
                 sal_Int32 nLevel = aParagraph->getProperties().getLevel();
                 aParagraph->getProperties().setLevel(nLevel - nBaseLevel);
 +                if (nStartBulletsAtLevel > 0 && nLevel >= nStartBulletsAtLevel)
 +                {
 +                    // It is not possible to change the bullet style for text.
 +                    sal_Int32 nLeftMargin = 285750 * (nLevel - nStartBulletsAtLevel) / EMU_PER_HMM;
 +                    aParagraph->getProperties().getParaLeftMargin() = nLeftMargin;
 +                    aParagraph->getProperties().getFirstLineIndentation() = -285750 / EMU_PER_HMM;
 +                    OUString aBulletChar = OUString::fromUtf8(u8"•");
 +                    aParagraph->getProperties().getBulletList().setBulletChar(aBulletChar);
 +                    aParagraph->getProperties().getBulletList().setSuffixNone();
 +                }
             }
             // explicit alignment
@@ -821,8 +945,10 @@
                 if( aVecIter->second != -1 )
                     rPara.getProperties().setLevel(aVecIter->second);
 -                rPara.addRun(
 -                    aDataNode2->second->mpShape->getTextBody()->getParagraphs().front()->getRuns().front());
 +                std::shared_ptr<TextParagraph> pSourceParagraph
 +                    = aDataNode2->second->mpShape->getTextBody()->getParagraphs().front();
 +                for (const auto& pRun : pSourceParagraph->getRuns())
 +                    rPara.addRun(pRun);
                 rPara.getProperties().apply(
                     aDataNode2->second->mpShape->getTextBody()->getParagraphs().front()->getProperties());
             }
 diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
 index 3d4d9c0..500495b 100644
 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
 +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -141,7 +141,7 @@
     virtual void accept( LayoutAtomVisitor& ) override;
     Constraint& getConstraint()
         { return maConstraint; }
 -    void parseConstraint(std::vector<Constraint>& rConstraints) const;
 +    void parseConstraint(std::vector<Constraint>& rConstraints, bool bRequireForName) const;
 private:
     Constraint maConstraint;
 };
@@ -162,6 +162,13 @@
         { maMap[nType]=nVal; }
     void layoutShape( const ShapePtr& rShape,
                       const std::vector<Constraint>& rConstraints ) const;
 +
 +    /// Gives access to <dgm:alg type="..."/>.
 +    sal_Int32 getType() const { return mnType; }
 +
 +    /// Gives access to <dgm:param type="..." val="..."/>.
 +    const ParamMap& getMap() const { return maMap; }
 +
 private:
     sal_Int32 mnType;
     ParamMap  maMap;
 diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
 index ce8e6ab..49a664c 100644
 --- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
 +++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -46,6 +46,14 @@
 void ShapeCreationVisitor::visit(ForEachAtom& rAtom)
 {
 +    if (rAtom.iterator().mnAxis == XML_followSib)
 +    {
 +        // If the axis is the follow sibling, then the last atom should not be
 +        // visited.
 +        if (mnCurrIdx + mnCurrStep >= mnCurrCnt)
 +            return;
 +    }
 +
     const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren();
     sal_Int32 nChildren=1;
@@ -65,7 +73,11 @@
         rAtom.iterator().mnCnt==-1 ? nChildren : rAtom.iterator().mnCnt);
     const sal_Int32 nOldIdx=mnCurrIdx;
 +    const sal_Int32 nOldStep = mnCurrStep;
 +    const sal_Int32 nOldCnt = mnCurrCnt;
     const sal_Int32 nStep=rAtom.iterator().mnStep;
 +    mnCurrStep = nStep;
 +    mnCurrCnt = nCnt;
     for( mnCurrIdx=0; mnCurrIdx<nCnt && nStep>0; mnCurrIdx+=nStep )
     {
         // TODO there is likely some conditions
@@ -75,6 +87,8 @@
     // and restore idx
     mnCurrIdx = nOldIdx;
 +    mnCurrStep = nOldStep;
 +    mnCurrCnt = nOldCnt;
 }
 void ShapeCreationVisitor::visit(ConditionAtom& rAtom)
@@ -166,6 +180,38 @@
         std::remove_if(pCurrParent->getChildren().begin(), pCurrParent->getChildren().end(),
             [] (const ShapePtr & aChild) { return aChild->getServiceName() == "com.sun.star.drawing.GroupShape" && aChild->getChildren().empty(); }),
         pCurrParent->getChildren().end());
 +
 +    // Offset the children from their default z-order stacking, if necessary.
 +    std::vector<ShapePtr>& rChildren = pCurrParent->getChildren();
 +    for (size_t i = 0; i < rChildren.size(); ++i)
 +        rChildren[i]->setZOrder(i);
 +
 +    for (size_t i = 0; i < rChildren.size(); ++i)
 +    {
 +        const ShapePtr& pChild = rChildren[i];
 +        sal_Int32 nZOrderOff = pChild->getZOrderOff();
 +        if (nZOrderOff <= 0)
 +            continue;
 +
 +        // Increase my ZOrder by nZOrderOff.
 +        pChild->setZOrder(pChild->getZOrder() + nZOrderOff);
 +        pChild->setZOrderOff(0);
 +
 +        for (sal_Int32 j = 0; j < nZOrderOff; ++j)
 +        {
 +            size_t nIndex = i + j + 1;
 +            if (nIndex >= rChildren.size())
 +                break;
 +
 +            // Decrease the ZOrder of the next nZOrderOff elements by one.
 +            const ShapePtr& pNext = rChildren[nIndex];
 +            pNext->setZOrder(pNext->getZOrder() - 1);
 +        }
 +    }
 +
 +    // Now that the ZOrders are adjusted, sort the children.
 +    std::sort(rChildren.begin(), rChildren.end(),
 +              [](const ShapePtr& a, const ShapePtr& b) { return a->getZOrder() < b->getZOrder(); });
 }
 void ShapeCreationVisitor::visit(ShapeAtom& /*rAtom*/)
@@ -235,7 +281,7 @@
 void ShapeLayoutingVisitor::visit(ConstraintAtom& rAtom)
 {
     if (meLookFor == CONSTRAINT)
 -        rAtom.parseConstraint(maConstraints);
 +        rAtom.parseConstraint(maConstraints, /*bRequireForName=*/true);
 }
 void ShapeLayoutingVisitor::visit(AlgAtom& rAtom)
 diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.hxx b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
 index 2997391..f395f6a 100644
 --- a/oox/source/drawingml/diagram/layoutatomvisitors.hxx
 +++ b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
@@ -33,6 +33,8 @@
     ShapePtr mpParentShape;
     const Diagram& mrDgm;
     sal_Int32 mnCurrIdx;
 +    sal_Int32 mnCurrStep = 0;
 +    sal_Int32 mnCurrCnt = 0;
     const dgm::Point* mpCurrentNode;
     void defaultVisit(LayoutAtom const & rAtom);
 diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
 index 257f490..ad62ba5 100644
 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
 +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -209,6 +209,8 @@
         pShape->setDiagramRotation(rAttribs.getInteger(XML_rot, 0) * PER_DEGREE);
 +        pShape->setZOrderOff(rAttribs.getInteger(XML_zOrderOff, 0));
 +
         ShapeAtomPtr pAtom( new ShapeAtom(mpNode->getLayoutNode(), pShape) );
         LayoutAtom::connect(mpNode, pAtom);
         return new ShapeContext( *this, ShapePtr(), pShape );
 diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
 index 2926614..16bc511 100644
 --- a/oox/source/drawingml/shape.cxx
 +++ b/oox/source/drawingml/shape.cxx
@@ -175,6 +175,8 @@
 , maLinkedTxbxAttr()
 , mbHasLinkedTxbx(false)
 , maDiagramDoms( pSourceShape->maDiagramDoms )
 +, mnZOrder(pSourceShape->mnZOrder)
 +, mnZOrderOff(pSourceShape->mnZOrderOff)
 {}
 Shape::~Shape()
--- a/java112.patch
+++ b/java112.patch
@ -0,0 +1,13 @@
 Index: libreoffice-6.2.0.3/odk/CustomTarget_javadoc.mk
 ===================================================================
 --- libreoffice-6.2.0.3.orig/odk/CustomTarget_javadoc.mk
 +++ libreoffice-6.2.0.3/odk/CustomTarget_javadoc.mk
@@ -32,7 +32,7 @@ $(call gb_CustomTarget_get_workdir,odk/d
 		$(call gb_Jar_get_target,ridl)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
 	$(call gb_Helper_abbreviate_dirs,\
 -		$(JAVADOC) -J-Xmx120m -use -splitindex \
 +		$(JAVADOC) -source $(JAVA_SOURCE_VER) -J-Xmx120m -use -splitindex \
 		-windowtitle "Java UNO Runtime Reference" \
 		-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\
 		-tag attention:a:"Attention:" \
--- a/libreoffice-6.1.4.2.tar.xz
+++ b/libreoffice-6.1.4.2.tar.xz
@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:648fe9177e0813625a99e775dac1354a416eef2f3ef44eab4e770d08293b37fe
 size 207710664
--- a/libreoffice-6.1.4.2.tar.xz.asc
+++ b/libreoffice-6.1.4.2.tar.xz.asc
@ -1,16 +0,0 @@
 -----BEGIN PGP SIGNATURE-----
 iQIcBAABAgAGBQJcEenIAAoJEPQ0oe+v7q6jzigP/i6pE9iu8BZb0LqOgvYZ1aSB
 +aCzBThvtxcJM7MIZcTxe9paDdAWnhka5IQhpjLTBplxf9K7Lo94ljvaMcHFZNMU
 diV/Hd+avGGJI//5/UEwTIkbmSs96ErKU8UQHLOogbSI2j7OlALIercZRmcrzOrB
 lbF28euFThDiG6knKD/ocuFg0GkLgcBXQmEyJXitfrQnIh5uQQjyV9hd93X3hK/o
 lbupzVs0ldufXmuQf0v/AjB3rjOe+RCcN/gkE2MHLcJ8QoeK2POUTuHlradSBR3r
 Vw0ZH1mG+jU1FU0OGonX7jP7A7QBcPIxYJ7NmtziGgulSKZYNOhImLFBav+aPNJO
 XvMMCkHtKMRn+6t8soYQRoZZymgOAgDfYLC8it2crxmaUHMs4I3WPy5R+e4eLEV6
 i8q9gBPO2r3DUph/0t7qU1hscOZ/8KiauciE66PiNPyDTvTJBBHN/fbqHSXTTPf9
 YPvubsv9zBbRKNP10yXg4ja8/7pRbmgF6/oN/igPTImlmfTqigMEIs07E41/VoOq
 7kPsTE1MeZVFiSD//dwIbpyM6d3kWzyX/byltQNqTVqoLf/PCxNwakXfBX5nEMNn
 XRjT5ku3dRil00zC/nTd+53N8ntuLBhb+RoFkJLdfcw2Ig7BkNkIb21duFH1omI0
 UKm4vr28lgZR46jadg0S
 =64CE
 -----END PGP SIGNATURE-----
--- a/libreoffice-6.2.0.3.tar.xz
+++ b/libreoffice-6.2.0.3.tar.xz
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:87d0581afbc582fdccf5e95a749a38572c62979a4b1c7f144b4854b93d6b1ade
 size 213476336
--- a/libreoffice-6.2.0.3.tar.xz.asc
+++ b/libreoffice-6.2.0.3.tar.xz.asc
@ -0,0 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlxIy9wACgkQ9DSh76/u
 rqPv2w/+IEi29Bot0EruxzCpc6CkVeZuPixl3ue9iQtwDy25CN6uilgoxWLw7f7/
 /MY3Z6wWJ3RzC+r8TEI+jZ2vbnlAvlhUrYpTMudTBdTWkBmNtsoqHCdCspd/qdD0
 j5awVunnLjuCn8VQCCtdQsnsycqoSH7w5rjBaGARbfOTw69EaFIqlbO3criKFA4Z
 Nh/D7g4HlGLVxOuAtVAS3FOKhdmGfuICmBx+7q37vGQY23cEzbE1SjfAwS5LMYev
 x9FSZgTn/kouTKWErTtY7uJES2SYVQTGcBdDFho2y0Hm0L3u2H+uIqZGGbacVXoZ
 /wkkPWdxpnxeTdGNxHHkgtu8vtaXt6lHM1EkPLx9FtchllsCSYNOzDitKqIIpsyK
 /7r9gRw1Y2w+K2ggj5pe0Cq6/mS0XGC9IStsSa8LmZvyD7yuKjOOLsMXbS3vbWd8
 dUtLvXuk2Mgt9H1LP14VOW0qfF+NPE/5WMtoK1lc4lAuvdbXZSZDHg0+fs6o7FYi
 N4CJZQ+4r7UuDY+ciwx/thRVnJ3KGc0smoETPYGewIT7Gog1FTw42IqPIAv3uoW1
 tLyrekW+yiR0d9RLx+/DCq1scMsHoCUEsirIwDyerkPL6NTFxi9K58Jb9fojeHBd
 DoGwq/HPh2lOmrfQA4X2dVR6WujR7i8JX+UGfKme2miaQTPYHvM=
 =SNmR
 -----END PGP SIGNATURE-----
--- a/libreoffice-help-6.1.4.2.tar.xz
+++ b/libreoffice-help-6.1.4.2.tar.xz
@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:f5b21510942e63829744cf0dfdcf556ada854fced168e54a25105a3d3b484445
 size 15757700
--- a/libreoffice-help-6.1.4.2.tar.xz.asc
+++ b/libreoffice-help-6.1.4.2.tar.xz.asc
@ -1,16 +0,0 @@
 -----BEGIN PGP SIGNATURE-----
 iQIcBAABAgAGBQJcEenRAAoJEPQ0oe+v7q6jhMkP/2sJ8r7hw2BRjv3Uu8NPFVW6
 +we/lU3bhqnwEpCntqu3p/47IDYM+h+IUyRlZ4AQKQ8q5JYYTg0LpEfxZibx/bjW
 nGkzQ+naqQH7xkUreDwPzN7uAejz6V14hVgmnlwHiXkq0sZ8/qXUsMaaOAdsTWsd
 w310S98XLNhCjDNo0Pym3v3G3+8h4wbJKHxywai4xFvXlai2nPAtkUzMe/W60ebb
 LZNI/wzfVzaUca4nttj25r/F1n0T4QCAm48lzYtxaBQPkC/U60ot3NhlU3AZ/dZZ
 JTDX+HF2QwwoDfpL/sddlkD/qOAPTO+TnjmJnhObkAWpaDWRrW1iIiltPMySU51G
 EmbJ61CeSCktiJKgdluk90i7Euyr4DX3wZEJ311mbN7h2EupgMCv/cLJjP8LnvK1
 yaVwDBK5DH/zV/+j4mQ52iOuN940KKbAvZkr6u4Cl0L1dxwO5QBVIkuelqGeIMXE
 21i31URdmZRn18igSaP6DPquHI/E6PYQXmVUYwuR9ObqTk3gsm8CLrLGIc/hCvM4
 WkO+5ex1vvrsQLNm3lsLnY2XuC3Qt0GVgZ5HXN+eg1Iha2bjD8sdH7qHrEbX6fx4
 ouDO/iTX8W3CC9gxnBlRzDlJP1mPqYS7Sa5g7yAuKWN2ueHKcQE07ORyi6tD2B8H
 NfUv29L5rMq2PZUPvWQA
 =YiRk
 -----END PGP SIGNATURE-----
--- a/libreoffice-help-6.2.0.3.tar.xz
+++ b/libreoffice-help-6.2.0.3.tar.xz
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:a6e7c7cf927182572405af1be100363abc9ca9fbbdd9999b4418f97e54d481cc
 size 16186548
--- a/libreoffice-help-6.2.0.3.tar.xz.asc
+++ b/libreoffice-help-6.2.0.3.tar.xz.asc
@ -0,0 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlxIy+EACgkQ9DSh76/u
 rqO6iBAAxNLNCZ9pPk/MHGzxWhqDvmsLEqAW8syntcV/VDYjKbKiFBeqLpL42jnn
 M5/S13X9JAJQWOpiCgDaz+j22ueYr7xju3sXyRI/xwXbnvo1NJzsS177P3lD0q8H
 4MBsnrCwTwy+9cY94Y17IDrTFzOIFtNPK77YNlKJKEL4nFXOt/mODUmXmS+TgBqL
 5X5Xa1DXvujDhLnr507NGL3gKjzIDF0q3z1WLDC/+LeWDzRWcvryMzxAtktb9V6p
 Drgs+Xa9Ppz1XRrhezAzUHcBx13fNY4kAKxg8olIhxotgRXLIKuB+LV2bhAu/u8x
 jX15PL5saz8a+G8bpKS9JExiaiiiW6zdH+uDW2VZorD/55lldxGttbjp5EnzRgFN
 +vHfXrpzKSbcVVFG7ugOqOz2pojfYmZFkTxw57OFyG7vDneitwNnIzkgh3KJMQuZ
 O5tbOcKTo/P0jeq5lgjLTPLUQnEmv/WosZpy4ga5IkA1vMhEcTmLe6laf7UzMaj5
 EivwsdtAsasAQqad0CsGUdLyAxYRf7eLXEwBoOyZ94mOLnqd234rzp1mZXaNMFhv
 6RH8qDE3O0uJf2baRYUkEmjBf1hLh22QcxQ34iYdO28hmwEeveJaTKIR+GpcNZ5v
 1TKFL5pRc86a327Cpu9B2GWS9MlnsUG3R2sgikd2NU/EbxPq23w=
 =LUqW
 -----END PGP SIGNATURE-----
--- a/libreoffice-java-sched.patch
+++ b/libreoffice-java-sched.patch
@ -1,13 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 index aa44107f8e79..8a40119e9bc6 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -6824,7 +6824,7 @@ you must use the "--with-jdk-home" configure option explicitly])
             JDK=sun
             dnl Sun JDK specific tests
 -            _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
 +            _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//`
             _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
             if test "$_jdk_ver" -lt 10600; then
--- a/libreoffice-poppler-0.71.patch
+++ b/libreoffice-poppler-0.71.patch
@ -1,169 +0,0 @@
 diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 --- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx	2018-11-01 20:43:55.802520387 +0000
 +++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-11-01 20:44:33.399286879 +0000
@@ -514,7 +514,7 @@
 PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
     m_pDoc( pDoc ),
     m_aFontMap(),
 -    m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
 +    m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
     m_bSkipImages(false)
 {
 }
@@ -943,11 +943,11 @@
 }
 void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
 -                              int width, int height, GBool invert,
 +                              int width, int height, bool invert,
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                              GBool /*interpolate*/,
 +                              bool /*interpolate*/,
 #endif
 -                              GBool /*inlineImg*/ )
 +                              bool /*inlineImg*/ )
 {
     if (m_bSkipImages)
         return;
@@ -976,9 +976,9 @@
 void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
                           int width, int height, GfxImageColorMap* colorMap,
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                          GBool /*interpolate*/,
 +                          bool /*interpolate*/,
 #endif
 -                          int* maskColors, GBool /*inlineImg*/ )
 +                          int* maskColors, bool /*inlineImg*/ )
 {
     if (m_bSkipImages)
         return;
@@ -1027,13 +1027,13 @@
                                 int width, int height,
                                 GfxImageColorMap* colorMap,
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                GBool /*interpolate*/,
 +                                bool /*interpolate*/,
 #endif
                                 Stream* maskStr,
                                 int maskWidth, int maskHeight,
 -                                GBool maskInvert
 +                                bool maskInvert
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                , GBool /*maskInterpolate*/
 +                                , bool /*maskInterpolate*/
 #endif
                                )
 {
@@ -1049,13 +1049,13 @@
                                     int width, int height,
                                     GfxImageColorMap* colorMap,
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                    GBool /*interpolate*/,
 +                                    bool /*interpolate*/,
 #endif
                                     Stream* maskStr,
                                     int maskWidth, int maskHeight,
                                     GfxImageColorMap* maskColorMap
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                    , GBool /*maskInterpolate*/
 +                                    , bool /*maskInterpolate*/
 #endif
                                    )
 {
 diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
 --- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx	2018-11-01 20:43:55.802520387 +0000
 +++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2018-11-01 20:44:33.402620221 +0000
@@ -151,17 +151,17 @@
         // Does this device use upside-down coordinates?
         // (Upside-down means (0,0) is the top left corner of the page.)
 -        virtual GBool upsideDown() override { return gTrue; }
 +        virtual bool upsideDown() override { return true; }
         // Does this device use drawChar() or drawString()?
 -        virtual GBool useDrawChar() override { return gTrue; }
 +        virtual bool useDrawChar() override { return true; }
         // Does this device use beginType3Char/endType3Char?  Otherwise,
         // text in Type 3 fonts will be drawn with drawChar/drawString.
 -        virtual GBool interpretType3Chars() override { return gFalse; }
 +        virtual bool interpretType3Chars() override { return false; }
         // Does this device need non-text content?
 -        virtual GBool needNonText() override { return gTrue; }
 +        virtual bool needNonText() override { return true; }
         //----- initialization and control
@@ -237,40 +237,40 @@
         //----- image drawing
         virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
 -                                   int width, int height, GBool invert,
 +                                   int width, int height, bool invert,
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                   GBool interpolate,
 +                                   bool interpolate,
 #endif
 -                                   GBool inlineImg) override;
 +                                   bool inlineImg) override;
         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
                                int width, int height, GfxImageColorMap *colorMap,
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                               GBool interpolate,
 +                               bool interpolate,
 #endif
 -                               int *maskColors, GBool inlineImg) override;
 +                               int *maskColors, bool inlineImg) override;
         virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
                                      int width, int height,
                                      GfxImageColorMap *colorMap,
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                     GBool interpolate,
 +                                     bool interpolate,
 #endif
                                      Stream *maskStr, int maskWidth, int maskHeight,
 -                                     GBool maskInvert
 +                                     bool maskInvert
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                     , GBool maskInterpolate
 +                                     , bool maskInterpolate
 #endif
                                     ) override;
         virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
                                          int width, int height,
                                          GfxImageColorMap *colorMap,
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                         GBool interpolate,
 +                                         bool interpolate,
 #endif
                                          Stream *maskStr,
                                          int maskWidth, int maskHeight,
                                          GfxImageColorMap *maskColorMap
 #if POPPLER_CHECK_VERSION(0, 12, 0)
 -                                         , GBool maskInterpolate
 +                                         , bool maskInterpolate
 #endif
                                         ) override;
 diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
 --- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx	2018-11-01 20:43:55.802520387 +0000
 +++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx	2018-11-01 20:44:33.402620221 +0000
@@ -69,7 +69,7 @@
     // read config file
     globalParams = new GlobalParams();
 -    globalParams->setErrQuiet(gTrue);
 +    globalParams->setErrQuiet(true);
 #if defined(_MSC_VER)
     globalParams->setupBaseFonts(nullptr);
 #endif
@@ -143,7 +143,7 @@
                 i,
                 PDFI_OUTDEV_RESOLUTION,
                 PDFI_OUTDEV_RESOLUTION,
 -                0, gTrue, gTrue, gTrue);
 +                0, true, true, true);
         rDoc.processLinks(&aOutDev, i);
     }
--- a/libreoffice-translations-6.1.4.2.tar.xz
+++ b/libreoffice-translations-6.1.4.2.tar.xz
@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:010505af211b9e4aa841c27443957297c58a7bb434ee8cce0d7ef2fa91b6fed1
 size 141263088
--- a/libreoffice-translations-6.1.4.2.tar.xz.asc
+++ b/libreoffice-translations-6.1.4.2.tar.xz.asc
@ -1,16 +0,0 @@
 -----BEGIN PGP SIGNATURE-----
 iQIcBAABAgAGBQJcEenVAAoJEPQ0oe+v7q6jZpgQALga4TdAjiME3SN6qMjjcuQE
 rplwddLi/6Dt3QKa9A1q4hzb/BF2E1ffzCtE3h4yN8gjVGZvI9ZolPZtZppmNCIK
 1crNlt+hA4Se8XQxs3yco3ZaNuVEEaqi04aj6XpXepIAZxyxpiZq4Of7ewl/ApSO
 T6AqbOyVS0FU4t1Bgc5wxykePWvxKWdYxQVXlvgx9NmPiTfG7nY26FH/TYQwnKGb
 lrasFuY/NE87f9JMbWLOGGkEzkqKhqOccubK+DHaJzON67gGlMcvXqtHYl5nvpHm
 6eMX+p6v6yFFAvqpMnd5j2zgcllHYegqp2d1ejoyBP9Vfrd8stblhoFzt9K1THUg
 64OWZPlNFqckwjekLIUyu7RT/LPiSArQ1Q4m6KpamC398OrYLmpKBeT33WBq41a1
 HiG8WY7AkdteMMtzeG/UaUNNX8CB5azGZEYrA/9yW3kbkOwz6HdSw2geibuAlCxO
 yTma7/HXkZ/qXMdEMmHkhZZcYUUbsnC9JlyahZM4mJFc4CNn0BVvBJNDP6TuY1TC
 oJ9aLT32v8ugbNc6GN2E/QL9l5/Cgsh9ASUen/8nHmac6UixVOlb7Xpt4ruzOMkA
 LVqcN2wigO9FVKn+gCvfJBQTQdksav+JsBD1ef3UvGO074iObI5U5l4QYoIzOQtF
 8My2fJIEP2sSOZvpeFjH
 =j3XX
 -----END PGP SIGNATURE-----
--- a/libreoffice-translations-6.2.0.3.tar.xz
+++ b/libreoffice-translations-6.2.0.3.tar.xz
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:9165c136e366a75a3a9403c2d1f0b1d48d708e72877f9180cbae25c0e33d7e03
 size 141589344
--- a/libreoffice-translations-6.2.0.3.tar.xz.asc
+++ b/libreoffice-translations-6.2.0.3.tar.xz.asc
@ -0,0 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlxIy+IACgkQ9DSh76/u
 rqOS6xAAoNRTkT173SYlIoDII2NT/CNcGnFi1lSHDQVKskQLlNzvqm0qiV3x8jdy
 0kRqWaROi7WWbutFegCQQGOEtD0eEDDf1nLSIEw5SQMyMYpz8IjuGJl/DhPqZi/V
 majsPakik2G9xVk4d2+Yo76myYkkwp3/oXpA4dOygEeryDrjVVLYS+QL93yZ1MzW
 V8T/cLleAu/AhxcAENTYHtcZMGDx2rJ6xct6+1iJqMXl0KUCO/qAO8ObFmqy4NJr
 TGV4u+nTug6uZOr9oTzGAvJz8fLn7djfbFj8TKxtwrykfLs5q1GhrLCwCkJBrFtK
 f8OMTxKf86dGjrkQkKnoXa96QYV1BqQTIypvUQyfv8Tp8Vl5JN2hhDE2JuJG9ltK
 S/sfLsQh29YFhVyTbvaJhsN3W7ddyURVg5NzuI1Z+JEV/J7uT8OMhhI0Fy6+Voea
 B1I4WUnzBt3HAKXkP0ykwCWag3GETo1/RQcF/n9ulM25LRc+ngr4biTaFMegIstf
 H1/1WlheaNr+Vip1fVTKuPrEjNCT1d3EMciHnrITV3365jdqbMdrFL5t4+4l4VOd
 Vi2R34TNL/snh1pr+VNZsR/lEtfinMQMUEMuF8hILLdMq+MpC5Mme3slmTuUieGl
 WsQ2/ir0F9sUfF6Jf3x3bjGBU/9b/p+Kkj0pHfysn9N9sVS+AI8=
 =x8DA
 -----END PGP SIGNATURE-----
--- a/libreoffice.changes
+++ b/libreoffice.changes
@ -1,3 +1,55 @@
 -------------------------------------------------------------------
 Thu Jan 24 13:19:29 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 - Add patch to build with java-11.2:
  * java112.patch
 -------------------------------------------------------------------
 Thu Jan 24 08:10:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 - Version update to 6.2.0.3:
  * 6.2.0 rc3 release
 -------------------------------------------------------------------
 Wed Jan 23 14:10:31 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 - Reduce disk constraints to 25G it should be enough
 -------------------------------------------------------------------
 Wed Jan 23 13:41:21 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 - Update to 6.2.0.2:
  * 6.2.0 rc2 release
 - Switch to the new web based help system bsc#1116451
 - Remove upstreamed patches:
  * libreoffice-java-sched.patch
  * 0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
  * boost_1_69.patch
  * libreoffice-poppler-0.72.patch
  * bsc1112114.patch
 - Enable new approach for mariadb connector again
 -------------------------------------------------------------------
 Wed Jan 23 13:11:42 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 - Version update to 6.1.5.1:
  * 6.1.5 bugfix release
 - Drop merged patch:
  * bsc1112113.patch
 -------------------------------------------------------------------
 Tue Jan 22 11:12:15 UTC 2019 - Andras Timar <andras.timar@collabora.com>
 - [Bug 1112114] LO-L3: [PPTX] SmartArt: Basic rendering of the Organizational Chart
  * bsc1112114.patch
 -------------------------------------------------------------------
 Fri Jan 18 20:41:07 UTC 2019 - bjorn.lie@gmail.com
 - Replace libreoffice-poppler-0.71.patch with
  libreoffice-poppler-0.72.patch and apply it conditionally. Fix
  build with poppler 0.72.
 -------------------------------------------------------------------
 Fri Dec 21 15:01:49 UTC 2018 - Andras Timar <andras.timar@collabora.com>
--- a/libreoffice.spec
+++ b/libreoffice.spec
@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
@ -52,7 +52,7 @@
 %bcond_with gtk3
 %endif
 Name:           libreoffice
-Version:        6.1.4.2
+Version:        6.2.0.3
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0-or-later AND MPL-2.0+
@ -89,9 +89,9 @@ Source2004:     %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 Source2005:     %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # Needed for integration tests
 Source2006:     https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
-Source2007:     https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies%2BODFTOOLKIT-460%2BODFTOOLKIT-475.jar
+Source2007:     https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
 # PDFium is bundled everywhere
-Source2008:     %{external_url}/pdfium-3426.tar.bz2
+Source2008:     %{external_url}/pdfium-3550.tar.bz2
 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
 # to avoid BerkleyDB incompatibility with the plain build
 Patch1:         scp2-user-config-suse.diff
@ -99,22 +99,15 @@ Patch1:         scp2-user-config-suse.diff
 # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
 Patch2:         nlpsolver-no-broken-help.diff
 Patch3:         mediawiki-no-broken-help.diff
-# Fix java detection on pcs with 99+ cpus, it prints too many warnings and then
+Patch4:         java112.patch
 # math does not work
 Patch4:         libreoffice-java-sched.patch
 Patch5:         old-boost.patch
 Patch6:         0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
 Patch11:        boost_1_69.patch
 # PATCH-FIX-UPSTREAM libreoffice-poppler-0.71.patch -- Fix build with poppler 0.71
 Patch12:        libreoffice-poppler-0.71.patch
 # [Bug 1112113] LO-L3: [PPTX] SmartArt: Basic rendering of Accent Process and Continuous Block Process
 Patch13:        bsc1112113.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  %{name}-share-linker
 BuildRequires:  ant
 BuildRequires:  autoconf
 BuildRequires:  awk
 BuildRequires:  binutils-gold
 BuildRequires:  bison
 BuildRequires:  bsh2
 BuildRequires:  commons-logging
@ -127,6 +120,7 @@ BuildRequires:  doxygen >= 1.8.4
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  flute
 BuildRequires:  fontforge
 BuildRequires:  gcc-c++
 BuildRequires:  glm-devel
 BuildRequires:  graphviz
@ -147,6 +141,11 @@ BuildRequires:  libformula
 BuildRequires:  libjpeg-devel
 BuildRequires:  liblayout
 BuildRequires:  libloader
 %if 0%{?suse_version} >= 1500
 BuildRequires:  libmariadb-devel
 %else
 BuildRequires:  libmysqlclient-devel
 %endif
 BuildRequires:  librepository
 BuildRequires:  libserializer
 BuildRequires:  libtool
@ -171,10 +170,12 @@ BuildRequires:  perl(Archive::Zip)
 BuildRequires:  perl(Digest::MD5)
 BuildRequires:  pkgconfig(apr-util-1)
 BuildRequires:  pkgconfig(bluez)
-BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(dbus-1) >= 0.60
 BuildRequires:  pkgconfig(epoxy) >= 1.2
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(gl)
 # >= 2.4 is needed for bluetooth support ; >= 2.40 is needed for gtk3
 BuildRequires:  pkgconfig(glib-2.0) >= 2.4
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(graphite2) >= 0.9.3
@ -200,9 +201,9 @@ BuildRequires:  pkgconfig(libfreehand-0.1)
 BuildRequires:  pkgconfig(liblangtag)
 BuildRequires:  pkgconfig(libmspub-0.1) >= 0.1
 BuildRequires:  pkgconfig(libmwaw-0.3) >= 0.3.13
-BuildRequires:  pkgconfig(libnumbertext) >= 1.0.0
+BuildRequires:  pkgconfig(libnumbertext) >= 1.0.5
 BuildRequires:  pkgconfig(libodfgen-0.1) >= 0.1.4
-BuildRequires:  pkgconfig(liborcus-0.13)
+BuildRequires:  pkgconfig(liborcus-0.14)
 BuildRequires:  pkgconfig(libpagemaker-0.0)
 BuildRequires:  pkgconfig(libpq)
 BuildRequires:  pkgconfig(libqxp-0.0)
@ -212,11 +213,11 @@ BuildRequires:  pkgconfig(libstaroffice-0.0) >= 0.0.6
 BuildRequires:  pkgconfig(libvisio-0.1) >= 0.1
 BuildRequires:  pkgconfig(libwpd-0.10) >= 0.10
 BuildRequires:  pkgconfig(libwpg-0.3)
-BuildRequires:  pkgconfig(libwps-0.4) >= 0.4.9
+BuildRequires:  pkgconfig(libwps-0.4) >= 0.4.10
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(libzmf-0.0)
-BuildRequires:  pkgconfig(mdds-1.2) >= 1.2.3
+BuildRequires:  pkgconfig(mdds-1.4) >= 1.4.1
 BuildRequires:  pkgconfig(mythes)
 BuildRequires:  pkgconfig(nspr) >= 4.8
 BuildRequires:  pkgconfig(nss) >= 3.9.3
@ -815,6 +816,12 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %{-T: \
 %dir %{_datadir}/libreoffice/help/%{_langpack_lang} \
 %{_datadir}/libreoffice/help/%{_langpack_lang}/* \
 %if "%{-L*}" == "en-US" \
 %{_datadir}/libreoffice/help/*.js \
 %{_datadir}/libreoffice/help/*.css \
 %{_datadir}/libreoffice/help/*.html \
 %{_datadir}/libreoffice/help/media* \
 %endif \
 } \
 %{!-E: \
 %define autotextdir %{_datadir}/%{name}/share/autotext \
@ -848,6 +855,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %langpack -l da -n Danish -X -m da_DK -T
 %langpack -l de -n German -X -M -T
 %langpack -l dgo -n Dogri
 %langpack -l dsb -n Lower_Sorbian
 %langpack -l dz -n Dzongkha -s ctl -T
 %langpack -l el -n Greek  -m el_GR -T
 %langpack -l en -n English -L en-US -X -M -g en_US -T -j en_US
@ -954,10 +962,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch2
 %patch3
 %patch4 -p1
 %patch6 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch990 -p1
 # Disable some of the failing tests (some are random)
@ -1016,6 +1020,7 @@ export NOCONFIGURE=yes
 %configure \
        --with-parallelism=%{jobs} \
        --enable-eot \
        --enable-ld=gold \
 %if %{with lto}
        --enable-lto \
 %endif
@ -1028,7 +1033,6 @@ export NOCONFIGURE=yes
        --with-system-ucpp \
        --with-system-dicts \
        --with-vendor=SUSE \
        --with-alloc=system \
        --with-tls=nss \
        --disable-openssl \
        --with-lang=ALL \
@ -1066,7 +1070,7 @@ export NOCONFIGURE=yes
        --with-external-dict-dir=%{_datadir}/hunspell \
        --with-external-hyph-dir=%{_datadir}/hyphen \
        --with-external-thes-dir=%{_datadir}/mythes \
-        --with-help \
+        --with-help=html \
        --without-export-validation \
        --enable-odk \
        --disable-qt5 \
@ -1088,9 +1092,9 @@ export NOCONFIGURE=yes
        --enable-ext-nlpsolver \
        --enable-ext-numbertext \
        --enable-ext-wiki-publisher \
        --disable-ext-mariadb-connector \
        --enable-scripting-beanshell \
        --enable-scripting-javascript \
        --enable-build-opensymbol \
        --disable-vlc \
        --disable-ccache \
        --disable-coinmp \
@ -1513,6 +1517,9 @@ exit 0
 %{_datadir}/%{name}/share/config/images_sifr_dark.zip
 %{_datadir}/%{name}/share/config/images_tango.zip
 %{_datadir}/%{name}/share/config/images_helpimg.zip
 %{_datadir}/%{name}/share/config/images_breeze_svg.zip
 %{_datadir}/%{name}/share/config/images_colibre_svg.zip
 %{_datadir}/%{name}/share/config/images_elementary_svg.zip
 %files -f file-lists/branding_upstream.txt branding-upstream
--- a/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies%2BODFTOOLKIT-460%2BODFTOOLKIT-475.jar
+++ b/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies%2BODFTOOLKIT-460%2BODFTOOLKIT-475.jar
@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769
 size 23988041
--- a/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
+++ b/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
 size 23988874
--- a/pdfium-3426.tar.bz2
+++ b/pdfium-3426.tar.bz2
@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957
 size 6348500
--- a/pdfium-3550.tar.bz2
+++ b/pdfium-3550.tar.bz2
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679
 size 6923846