pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 668095 from LibreOffice:Unstable

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/668095
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=742
This commit is contained in:
Tomáš Chvátal 2019-01-23 13:54:06 +00:00 committed by Git OBS Bridge
parent 0c4b1248c8
commit 63cc3cb4f2
23 changed files with 104 additions and 980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
0001-call-System.runFinalizersOnExit-by-reflection-since-.patch
View File

@ -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

13
boost_1_69.patch
View File

@ -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;
}
}

577
bsc1112114.patch
View File

@ -1,577 +0,0 @@
From bdbd61880eb0453aa43f70b978022b3842e5c263 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Fri, 21 Dec 2018 17:51:17 +0100
Subject: [PATCH] Related: tdf#117761 oox smartart: backport fixes related to org chart
This is a combination of 10 commits.
This is the 1st commit:
oox smartart, org chart: add initial hierChild/Root algorithms
hierChild is supposed to align and position its child layout nodes in a
linear path under the hierRoot layout node, so initially just use a
simple vertical layout algorithm.
(cherry picked from commit 3103f9f9461f6eabb61a70be73862ef4be98010e)
This is the commit #2:
oox smartart, org chart: handle multiple elements in hierChild
In case one manager has multiple employees, then we laid out only the
first one. Recognize non-assistant type as the node type (as a start) to
get the correct number of employees (when there are no assistants), and
also render employees on a horizontal (and not on a vertical) path.
With this, the 1 manager and multiple employees case looks reasonable.
(cherry picked from commit dcd378bf614c99d705312259a0a0a25b40d88e2b)
This is the commit #3:
oox smartart, org chart: fix font color when defined with quick styles
createStyleMatrixContext() assumed that <dgm:style> contains
<dgm:fontRef>, but it contains <a:fontRef> instead.
This resulted in a 0 mnThemedIdx, which meant that since commit
89206c472ecf18bfde6824cea8004921cd404365 (bnc#862510: PPTX import: Wrong
text color inside shape, 2014-12-21) we ignored the theme color in
oox::drawingml::Shape::createAndInsert().
(cherry picked from commit 5dfd5755c709e91d2903bd7be4582f7832e89780)
This is the commit #4:
oox smartart, org chart: fix vertical order of assistant nodes
It seems the manager -> assistant -> employees ordering is not part of
the file format. The order is stored twice in the file: the hierRoot
algorithm has 3 layout nodes as a children, and also the data model has
an order of the presentation nodes: both describe that employees go
before assistant nodes.
In contrast to that, PowerPoint orders XML_asst nodes before XML_node
ones, so teach the hierRoot algorithm about this.
This requires tracking the data model node type for each in-diagram
drawingML shape, so that layout can determine if a hierRoot algorithm
children has an assistant node or not.
(cherry picked from commit 22086e70c4f3bb41620ff81ecaf57fd2af6ccbce)
This is the commit #5:
oox smartart, org chart: handle multiple paragraphs on data node
This problem was similar to the one fixed in
cfa76f538a44d4396574ece59e8a3953c22c6eb7 (oox smartart, accent process:
handle multiple runs from a data point, 2018-11-21), but this there we
handled multiple runs and this handles multiple paragraphs.
It seems some smartart types allow multiple paragraphs in a diagram
node, others only allow multiple runs. Org chart is in the former
category.
(cherry picked from commit dfc97dd381ef516ca4a7e99b29f9da1033a380f4)
This is the commit #6:
oox smartart, org chart: fix height of manager nodes without employees
Employees and/or assistants reduce the height of managers -- this effect
is wanted even if there are no employees/assistants.
(cherry picked from commit 8638cc1b737195df16a160b148d2cd2c68131174)
This is the commit #7:
oox smartart, org chart: improve width of non-manager nodes
The default case is that all managers have assistants/employees, so
nodes under a manager can only use the horizontal space under the
manager to avoid overlapping.
But in case the previous / next sibling of the manager have no child
nodes (assistant/employee) then we can use that space to make the child
nodes larger. This improves readability of the chart's text a lot and
brings the layout closer to what PowerPoint does for the same input.
Handle all this in the hierChild algorithm, i.e. the container for a
list of assistants or a list of employees, which means "parent" in this
context always refers to a manager node.
(cherry picked from commit 3a655975e5ea43417885513d0752da3627dd25ed)
This is the commit #8:
oox smartart, org chart: implement support for hierBranch conditions
The relevant part of the layout is the <dgm:layoutNode
name="hierChild2"> element that has a <dgm:choose> with two branches:
<dgm:if name="Name34" func="var" arg="hierBranch" op="equ" val="std">
<dgm:if name="Name36" func="var" arg="hierBranch" op="equ" val="init">
The connectors were missing as we took the first branch
(ConditionAtom::getDecision() returned true if the arg was hierBranch),
even hierBranch on the parent layout node was set to "init".
With this, the correct number of connectors are created, previously all
employee connectors were missing. Their size / position is still
incorrect, though.
(cherry picked from commit ae34f471030869dfc0da1784597cae6f9131f8c5)
This is the commit #9:
oox smartart, org chart: fix shape type of connectors
PowerPoint renders these as bent connectors, not as arrow shapes.
Also add a bit of vertical spacing between the nodes, otherwise the
connectors have no way to be visible. Their position is still incorrect,
though.
(cherry picked from commit 1791e08e9f27453ac5563ef400c715e30c791133)
This is the commit #10:
oox smartart, org chart: fix position and size of connector shapes
Finally the bugdoc rendering result is reasonable and even looks like a
tree as it should.
(cherry picked from commit 2bfb9117b287a371066a157267614b9bdb367d71)
Change-Id: I4e7a729afd3d2c5af2e7f41903737bd56be406fa
---
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index e04a58beb..4a57121 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -222,6 +222,10 @@
sal_Int32 getZOrderOff() const { return mnZOrderOff; }
+ void setDataNodeType(sal_Int32 nDataNodeType) { mnDataNodeType = nDataNodeType; }
+
+ sal_Int32 getDataNodeType() const { return mnDataNodeType; }
+
protected:
css::uno::Reference< css::drawing::XShape > const &
@@ -341,6 +345,9 @@
/// Z-Order offset.
sal_Int32 mnZOrderOff = 0;
+
+ /// Type of data node for an in-diagram shape.
+ sal_Int32 mnDataNodeType = 0;
};
} }
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx
index 326b4f9..b98d0ee 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -111,7 +111,7 @@
mrPoint.mnDirection = rAttribs.getToken( XML_val, XML_norm );
break;
case DGM_TOKEN( hierBranch ):
- mrPoint.mnHierarchyBranch = rAttribs.getToken( XML_val, XML_std );
+ mrPoint.moHierarchyBranch = rAttribs.getToken( XML_val );
break;
case DGM_TOKEN( orgChart ):
mrPoint.mbOrgChartEnabled = rAttribs.getBool( XML_val, false );
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 1a981a8..242ff09 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -73,7 +73,6 @@
mnMaxChildren(-1),
mnPreferredChildren(-1),
mnDirection(XML_norm),
- mnHierarchyBranch(XML_std),
mnResizeHandles(XML_rel),
mnCustomAngle(-1),
mnPercentageNeighbourWidth(-1),
@@ -118,7 +117,7 @@
sal_Int32 mnMaxChildren;
sal_Int32 mnPreferredChildren;
sal_Int32 mnDirection;
- sal_Int32 mnHierarchyBranch;
+ OptValue<sal_Int32> moHierarchyBranch;
sal_Int32 mnResizeHandles;
sal_Int32 mnCustomAngle;
sal_Int32 mnPercentageNeighbourWidth;
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
index 836faa3..616f8eb 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
@@ -111,7 +111,7 @@
const AttributeList& rAttribs,
ShapeStyleRef& o_rStyle )
{
- o_rStyle.mnThemedIdx = (nElement == DGM_TOKEN(fontRef)) ?
+ o_rStyle.mnThemedIdx = (nElement == A_TOKEN(fontRef)) ?
rAttribs.getToken( XML_idx, XML_none ) : rAttribs.getInteger( XML_idx, 0 );
return new ColorContext( *this, o_rStyle.maPhClr );
}
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 5024709..513dc99 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -29,6 +29,7 @@
#include <drawingml/textparagraph.hxx>
#include <drawingml/textrun.hxx>
#include <drawingml/customshapeproperties.hxx>
+#include <tools/gen.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -72,31 +73,129 @@
if (!pNode)
return nType;
+ // This is cheaper than visiting the whole sub-tree.
+ if (pNode->getName().startsWith("hierChild"))
+ return oox::XML_bentConnector3;
+
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)
+ switch (pAlgAtom->getType())
{
- case oox::XML_fromL:
- nType = oox::XML_rightArrow;
+ case oox::XML_lin:
+ {
+ 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;
+ }
break;
- case oox::XML_fromR:
- nType = oox::XML_leftArrow;
+ }
+ case oox::XML_hierChild:
+ {
+ // TODO <dgm:param type="connRout" val="..."/> should be able
+ // to customize this.
+ nType = oox::XML_bentConnector3;
break;
+ }
}
}
return nType;
+}
+
+/**
+ * Determines if pShape is (or contains) a presentation of a data node of type
+ * nType.
+ */
+bool containsDataNodeType(const oox::drawingml::ShapePtr& pShape, sal_Int32 nType)
+{
+ if (pShape->getDataNodeType() == nType)
+ return true;
+
+ for (const auto& pChild : pShape->getChildren())
+ {
+ if (containsDataNodeType(pChild, nType))
+ return true;
+ }
+
+ return false;
+}
+
+/**
+ * Calculates the offset and scaling for pShape (laid out with the hierChild
+ * algorithm) based on the siblings of pParent.
+ */
+void calculateHierChildOffsetScale(const oox::drawingml::ShapePtr& pShape,
+ const oox::drawingml::LayoutNode* pParent, sal_Int32& rXOffset,
+ double& rWidthScale)
+{
+ if (!pParent)
+ return;
+
+ const std::vector<oox::drawingml::ShapePtr>& rParents = pParent->getNodeShapes();
+ for (size_t nParent = 0; nParent < rParents.size(); ++nParent)
+ {
+ const oox::drawingml::ShapePtr& pParentShape = rParents[nParent];
+ const std::vector<oox::drawingml::ShapePtr>& rChildren = pParentShape->getChildren();
+ auto it = std::find_if(
+ rChildren.begin(), rChildren.end(),
+ [pShape](const oox::drawingml::ShapePtr& pChild) { return pChild == pShape; });
+ if (it == rChildren.end())
+ // This is not our parent.
+ continue;
+
+ if (nParent > 0)
+ {
+ if (rParents[nParent - 1]->getChildren().size() == 1)
+ {
+ // Previous sibling of our parent has no children: can use that
+ // space, so shift to the left and scale up.
+ rWidthScale += 1.0;
+ rXOffset -= pShape->getSize().Width;
+ }
+ }
+ if (nParent < rParents.size() - 1)
+ {
+ if (rParents[nParent + 1]->getChildren().size() == 1)
+ // Next sibling of our parent has no children: can use that
+ // space, so scale up.
+ rWidthScale += 1.0;
+ }
+ }
+}
+
+/// Sets the position and size of a connector inside a hierChild algorithm.
+void setHierChildConnPosSize(const oox::drawingml::ShapePtr& pShape)
+{
+ // Connect to the top center of the child.
+ awt::Point aShapePoint = pShape->getPosition();
+ awt::Size aShapeSize = pShape->getSize();
+ tools::Rectangle aRectangle(Point(aShapePoint.X, aShapePoint.Y),
+ Size(aShapeSize.Width, aShapeSize.Height));
+ Point aTo = aRectangle.TopCenter();
+
+ // Connect from the bottom center of the parent.
+ Point aFrom = aTo;
+ aFrom.setY(aFrom.getY() - aRectangle.getHeight() * 0.3);
+
+ tools::Rectangle aRect(aFrom, aTo);
+ aRect.Justify();
+ aShapePoint = awt::Point(aRect.Left(), aRect.Top());
+ aShapeSize = awt::Size(aRect.getWidth(), aRect.getHeight());
+ pShape->setPosition(aShapePoint);
+ pShape->setSize(aShapeSize);
}
}
@@ -284,8 +383,32 @@
case XML_var:
{
const dgm::Point* pPoint = getPresNode();
- if (pPoint && maCond.mnArg == XML_dir)
+ if (!pPoint)
+ break;
+
+ if (maCond.mnArg == XML_dir)
return compareResult(maCond.mnOp, pPoint->mnDirection, maCond.mnVal);
+ else if (maCond.mnArg == XML_hierBranch)
+ {
+ sal_Int32 nHierarchyBranch = pPoint->moHierarchyBranch.get(XML_std);
+ if (!pPoint->moHierarchyBranch.has())
+ {
+ // If <dgm:hierBranch> is missing in the current presentation
+ // point, ask the parent.
+ OUString aParent = navigate(mrLayoutNode, XML_presParOf, pPoint->msModelId,
+ /*bSourceToDestination*/ false);
+ DiagramData::PointNameMap& rPointNameMap
+ = mrLayoutNode.getDiagram().getData()->getPointNameMap();
+ auto it = rPointNameMap.find(aParent);
+ if (it != rPointNameMap.end())
+ {
+ const dgm::Point* pParent = it->second;
+ if (pParent->moHierarchyBranch.has())
+ nHierarchyBranch = pParent->moHierarchyBranch.get();
+ }
+ }
+ return compareResult(maCond.mnOp, nHierarchyBranch, maCond.mnVal);
+ }
break;
}
@@ -445,6 +568,12 @@
rShape->setSubType(nType);
rShape->getCustomShapeProperties()->setShapePresetType(nType);
+
+ if (nType == XML_bentConnector3)
+ {
+ setHierChildConnPosSize(rShape);
+ break;
+ }
}
// Parse constraints to adjust the size.
@@ -522,7 +651,81 @@
case XML_hierChild:
case XML_hierRoot:
+ {
+ // hierRoot is the manager -> employees vertical linear path,
+ // hierChild is the first employee -> last employee horizontal
+ // linear path.
+ const sal_Int32 nDir = mnType == XML_hierRoot ? XML_fromT : XML_fromL;
+ if (rShape->getChildren().empty() || rShape->getSize().Width == 0
+ || rShape->getSize().Height == 0)
+ break;
+
+ sal_Int32 nCount = rShape->getChildren().size();
+
+ if (mnType == XML_hierChild)
+ {
+ // Connectors should not influence the size of non-connect
+ // shapes.
+ nCount = std::count_if(
+ rShape->getChildren().begin(), rShape->getChildren().end(),
+ [](const ShapePtr& pShape) { return pShape->getSubType() != XML_conn; });
+ }
+
+ // A manager node's height should be independent from if it has
+ // assistants and employees, compensate for that.
+ bool bTop = mnType == XML_hierRoot && rShape->getInternalName() == "hierRoot1";
+
+ // Add spacing, so connectors have a chance to be visible.
+ double fSpace = (nCount > 1 || bTop) ? 0.3 : 0;
+
+ double fHeightScale = 1.0;
+ if (mnType == XML_hierRoot && nCount < 3 && bTop)
+ fHeightScale = fHeightScale * nCount / 3;
+
+ if (mnType == XML_hierRoot && nCount == 3)
+ {
+ // Order assistant nodes above employee nodes.
+ std::vector<ShapePtr>& rChildren = rShape->getChildren();
+ if (!containsDataNodeType(rChildren[1], XML_asst)
+ && containsDataNodeType(rChildren[2], XML_asst))
+ std::swap(rChildren[1], rChildren[2]);
+ }
+
+ sal_Int32 nXOffset = 0;
+ double fWidthScale = 1.0;
+ if (mnType == XML_hierChild)
+ calculateHierChildOffsetScale(rShape, pParent, nXOffset, fWidthScale);
+
+ awt::Size aChildSize = rShape->getSize();
+ if (nDir == XML_fromT)
+ {
+ aChildSize.Height /= (nCount + nCount * fSpace);
+ }
+ else
+ aChildSize.Width /= nCount;
+ aChildSize.Height *= fHeightScale;
+ aChildSize.Width *= fWidthScale;
+
+ awt::Point aChildPos(nXOffset, 0);
+ for (auto& pChild : rShape->getChildren())
+ {
+ pChild->setPosition(aChildPos);
+ pChild->setSize(aChildSize);
+ pChild->setChildSize(aChildSize);
+
+ if (mnType == XML_hierChild && pChild->getSubType() == XML_conn)
+ // Connectors should not influence the position of
+ // non-connect shapes.
+ continue;
+
+ if (nDir == XML_fromT)
+ aChildPos.Y += aChildSize.Height + aChildSize.Height * fSpace;
+ else
+ aChildPos.X += aChildSize.Width;
+ }
+
break;
+ }
case XML_lin:
{
@@ -896,6 +1099,7 @@
while( aVecIter != aVecEnd )
{
DiagramData::PointNameMap& rMap = mrDgm.getData()->getPointNameMap();
+ // pPresNode is the presentation node of the aDataNode2 data node.
DiagramData::PointNameMap::const_iterator aDataNode2 = rMap.find(aVecIter->first);
if (aDataNode2 == rMap.end())
{
@@ -903,6 +1107,8 @@
++aVecIter;
continue;
}
+
+ rShape->setDataNodeType(aDataNode2->second->mnType);
if( aVecIter->second == 0 )
{
@@ -941,16 +1147,19 @@
rShape->setTextBody(pTextBody);
}
- TextParagraph& rPara=pTextBody->addParagraph();
- if( aVecIter->second != -1 )
- rPara.getProperties().setLevel(aVecIter->second);
+ const TextParagraphVector& rSourceParagraphs
+ = aDataNode2->second->mpShape->getTextBody()->getParagraphs();
+ for (const auto& pSourceParagraph : rSourceParagraphs)
+ {
+ TextParagraph& rPara = pTextBody->addParagraph();
+ if (aVecIter->second != -1)
+ rPara.getProperties().setLevel(aVecIter->second);
- 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());
+ for (const auto& pRun : pSourceParagraph->getRuns())
+ rPara.addRun(pRun);
+ const TextBodyPtr& rBody = aDataNode2->second->mpShape->getTextBody();
+ rPara.getProperties().apply(rBody->getParagraphs().front()->getProperties());
+ }
}
++aVecIter;
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
index 49a664c..e2d6c46 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -57,7 +57,8 @@
const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren();
sal_Int32 nChildren=1;
- if( rAtom.iterator().mnPtType == XML_node )
+ // Approximate the non-assistant type with the node type.
+ if (rAtom.iterator().mnPtType == XML_node || rAtom.iterator().mnPtType == XML_nonAsst)
{
// count child data nodes - check all child Atoms for "name"
// attribute that is contained in diagram's
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 16bc511..55d1546 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -177,6 +177,7 @@
, maDiagramDoms( pSourceShape->maDiagramDoms )
, mnZOrder(pSourceShape->mnZOrder)
, mnZOrderOff(pSourceShape->mnZOrderOff)
+, mnDataNodeType(pSourceShape->mnDataNodeType)
{}
Shape::~Shape()

3
libreoffice-6.1.5.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab1cac8ba2302dad91211ea9f08ab3f5e0645e75d628572077a2c473e0954635
size 207920688

16
libreoffice-6.1.5.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlw/nWwACgkQ9DSh76/u
rqMq0BAAtpAxKbpESFHB9tqlTgMUJmqS8d8oeqUySlc9ZRv5fVGurIPjpnBEOlrm
JKArmgnHU4D0zaglx6pbuXcWzQGrDkf9l0nxoXymN5zPezFtjKuVfKXWkIjNN3/o
MghWCa4WPPQtFuQ76xEVmGx6fHnRwxL5vfdXj+PT0B2bpOt9Ve1TiBh6r+t2cWyV
0EVJaHLSBu5NN5p0wvs6xf8f/TNZk+OQa4+PVfoaxb6r4zXhhjLin8GOoD/fH63Q
4nydTn26K1s27GO9RSunf8FtZWGUxzOMJyc7n5/9TzLeDnTohgOIMUSYqug1NGs/
2X898fU9wCPv5MZTB/tsdEYegxLJGIYvh9ClT5FNweQC3mbnD6SRrjO8tnH19xmJ
2Kp+pt4SpoTGwbMZT9bB0i8dfN0gwJNI+ThlgFDpOm4TbuZrRVEYAk7Vzx15CU5K
bz/7J/+fyi1XO1mmAs02FP8OrjlS8E0TGDPQd6RFpQ8W+wnf2qy902/MHYyePLgS
uFPnAyGf3fOg5aYe73VL8Z92XpinlEQqOKSgwD7xwPSXRSzy7+89YeBDEtcIpq3O
5qnBReiMRhyIGV//Epd6EDLD28eKefFSFKmuwvzm+iwnCQVnyykDAnnV8tyg+xaj
S6PIQHWc+4pW9p1BqibpmTOTvveGQbRUZu+KHm+MhTuWt/Tws+g=
=XObO
-----END PGP SIGNATURE-----

3
libreoffice-6.2.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab801f12ef100c2916218bd60c4b79026df653755877485da46f07a6913cc948
size 213471412

16
libreoffice-6.2.0.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlw1K2gACgkQ9DSh76/u
rqOYVA//TEfwzo6HmCSpHbMH7IzE86Cu94ihBHON2L2XQdUXMCsmKERnBbBcOYbh
c+VGZEEcdJe3w4Ych8+77L/3SBlrt4uAb+N7CcZ4UNdAG3tsl1JAQ6mx+YTu8A7R
C6OA4BfG4229HFMw7zSO0ie7iuD4P2NLOlQ+f4pwBBuhDQD9G55wRPOUOaOYJY21
T9zQDLGmucqy7bcR9c4l0ziKpRS1sSa14bPDXSay89u5ZMQSTMPTam+Rp1HOKKk7
dohMNL0VpYXngYnh2CJJ1UqIczUYGwWqYptX1gu4X41WvJHhUeF2PoTTU/5w7XCf
IUdOZeg3AC6BTrQ/A91mUXsEhx56gUaFTwaJNaElT9i3q/I9UEeUBH1MjjBdC4Oo
dogbyP1hrt9ENkTOwGZd1QVcNA2jqr+RoynVOU2nt45CSXVdGv+I2Id0w/pyHdEV
oJOGQi4nxxg+/yD9HtMlptGUNJGwa6f1yd+MSDmWhT41fbt6kMqHRJq+s7ES8Rge
5i2ITDJr7hyii3fEL4pEfDl+UucBeubGu/3Je374hfV1rEDIbgaAxRhPoZ0a+iDS
JV+VstygzDXFP4+JR8VULi6/Mgq76rgI3BxP5dl+ocjGEKL7sEPwvzpMZLFP8o76
dDlaZocPKmRqMTNgkPr6Z3Y69nOWXXg4gspi5bELj0K6QQyBRcg=
=gZoT
-----END PGP SIGNATURE-----

3
libreoffice-help-6.1.5.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dba43de2fb549a5760a2ac683d7ec120df67af32f864b0fe3cb7a23e8d13506e
size 15756964

16
libreoffice-help-6.1.5.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlw/nXAACgkQ9DSh76/u
rqPAKw//daDzfmKO0hu6i1GZiLLqxKDcyu49A3Ur+cLPnaTsRWBmcMJPXyXDTz9D
08O/drR/cnTUaugIJ4XgCK7O0i//JJANc3cIsiij6+nv79CqIUdhk9GGTbeSGmV1
IFa6tSz5RNFkTRuhVoZWZmJBqrpQNwnVyuA7EXnQPrHTp21q2Ah1572p6bw5v+7V
erEhsjTmc7oHN+RVFSTcvxszxyN5ZLPYjoYCdxysF3x0l0XTA3g1QDCAeJut2eLv
tDpj/OAoEqg/w82HsmIH/f294y/iAc+PiBZLO49RjJw8ioNn2hm6ySH8EkpK3aqj
kVV8aRbuTG68Gunfn/2waLaWwfGplMMUfBwBybQAZ4RsfXLPyBPhGcbk+CabO4EF
ITtF6OazIb1mCyu/wRG5Gs/h413zZnJiSQYQR0eeL2mUn5ebXmGImYxxKF+zl/pJ
UB9h7PsynDCtKnKh7m5dU2P++6+U6QdxP+pixvQMOrPH4IRw4ghaEvPZkEpv5Ut1
Jo7Hj/hq8M227UBBO/qrTPmytNmsbHJl3YhmkLuv7PjZyevDE6ef89w3LCmHqfw1
9mfiZF+CEpzAAtQEmeo5S6T+Fzj6jFjaWmOBtxZURcfq4JtowDJoJjT3mOZAYdX/
XBA/pwU5Gz35cqICX5pdjSOFVejGMqc2GIX4dJehgZp1PB0urmQ=
=3zTt
-----END PGP SIGNATURE-----

3
libreoffice-help-6.2.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c64d491d9e27b945d7ea882f9239dd953eb48b2cc8cfd5e9966c076e69d4850
size 16186468

16
libreoffice-help-6.2.0.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlw1K2wACgkQ9DSh76/u
rqP/cw//S8NBjSnccdV+t7v1ppbgJ6mR3Vl5zpmILtkyAeK24AeQgTHWmkvTJWgy
WybIYrTV+RQhH4JOw3FKyUg3f/7Uogw+EGDO0+Cn1PaRQKMouh/VOeAy5XzU38tG
XMIEsvW+814DzNKjLF9+e956OAivg3UUFfLcCQtuxk/Nc8fLoDbZaa5/O6Tmu5Ko
k/qHecVeVrSfbv2vT6TuvVzONFfaD7v3Je/laSoLHD+yXwft7I0qWhMXO4tme+VM
Ew3O/d5S9Zg3le5jxhZHLVNRonVLYBH6u1GIwRQb00YayjQF/aI+4c0AOvgjuz81
ixhT541SRTsTt3q4S7xrAJzoU7u7/nDpSZJqRwlo2FpH/L1cEX/pRMuOlUMkmSzr
Q1MRLTtDG+5Nngp9Jz9d4xMZxdnaUgWFjokKDFw0rKZ6hGfGxCOzrwR2UwjZA0Xc
x8BQCqfrxjqcFlZ656nuJP3G7yZ1vl+QdNjR5Wz+I7Be7R9usXXiwuerya/4u62p
z1quSz3mOnffC89jQb3B4h1I7DBoLF9peySwBOl3Ht5faZoZGXavGApsbOCubDR2
sOLuIYQPWLXlorwm4EuxsC7en1gwAAEKbDmieQ+U0mPtvH1bnn9PA3p+Ts098hSF
kevGhYXLet7L3lfOBiDxMsYd7XYydxnr05CZlN56sbzvVtj09Pc=
=sQwu
-----END PGP SIGNATURE-----

13
libreoffice-java-sched.patch
View File

@ -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

238
libreoffice-poppler-0.72.patch
View File

@ -1,238 +0,0 @@
From 557ee0a0f4e40b934c72515f41f3a605803ddb1d Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Wed, 24 Oct 2018 17:48:53 +0300
Subject: [PATCH] fix build with poppler 0.70
---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 575a90acb..99219f7e6 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
printf( "restoreState\n" );
}
+#if POPPLER_CHECK_VERSION(0, 70, 0)
+void PDFOutDev::setDefaultCTM(const double *pMat)
+#else
void PDFOutDev::setDefaultCTM(double *pMat)
+#endif
{
assert(pMat);
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index da021a2a0..27440f2bb 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -166,7 +166,11 @@ namespace pdfi
//----- initialization and control
// Set default transform matrix.
+#if POPPLER_CHECK_VERSION(0, 70, 0)
+ virtual void setDefaultCTM(const double *ctm) override;
+#else
virtual void setDefaultCTM(double *ctm) override;
+#endif
// Start a page.
virtual void startPage(int pageNum, GfxState *state
--
2.19.1
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);
}
--- libreoffice-6.1.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-12-14 20:04:01.633697240 +0000
+++ libreoffice-6.1.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-12-14 20:04:18.020410653 +0000
@@ -555,7 +555,7 @@
LinkAction* pAction = link->getAction();
if (pAction && pAction->getKind() == actionURI)
{
- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
@@ -757,7 +757,7 @@
aFont = it->second;
- std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
+ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
printf( " %d %d %d %d %f %d %s",
aFont.isEmbedded,
aFont.isBold,

3
libreoffice-translations-6.1.5.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:879de3e2fea295578dbf1436cb05b356c0d20db5e7028975975fb062c74c89e8
size 141270052

16
libreoffice-translations-6.1.5.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlw/nXAACgkQ9DSh76/u
rqP05w/8DwvW5fVGMW9ir6Yk9YG61XMyPBmM6BrcSWfLnwkzHpB3jd8IaUwWiSd/
v8LOpZuFa4SEJyoYnMBg/ej1n1fYtLsiC2y3OTLMoqdkPNzVT6QGK20UyHnXEF1w
xkn3qUhO1CF0/m6TwO0/3ftRGA1WqQkluA4wS1NOXD8n4B5Kw1HEKryZhdcYdl/t
JalAXJrk4jbwQ36YTzs1dY/blooL7BDumHw12nGYcLXRIbF2C0raFt+1o5W+aSsm
jTsyAK9VFUeN5Tl7RF0Gf3ve2kX9gKnbnKUn4W5Bu7XELmT8h4hqtfE1aK7u+0oJ
EOZY2QocSEKfuRN9MhT5p3IwHQ9REcgqOOqw4v3EBJdAy88geHbduZ8t7TYSUE/X
C8rKU+OS3+Qf98lttyVprVXoW9TcREnFQWkRiCN9lMRNPR5PUedexR4NadRGRU1l
u/jUHE4RrCASGOalXT0X/bpQNKuxNBaE/4c70opTddeZfK9NITgk+UJnTondrdnc
nF7oRP4kZ46brlaO28yeVVQbzqXBOeuorh07zfW26h2EWT0Le48k+wMsB+HUVNhY
+U+MZYKF19fOSCta19UbHzdGTF7FI8yZnzTCowWtaGnP1HepcYFWnbLYvc1xkEjF
eAMTX5D8uIlyELGQYPJmH8wCjazsfi6nL47+7risn6F/n1JXRHg=
=M8T2
-----END PGP SIGNATURE-----

3
libreoffice-translations-6.2.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74b0bc5ab4e89ddab21bc227fe8ef3e52dad0f984c974f051488ab853556ca34
size 141366500

16
libreoffice-translations-6.2.0.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlw1K20ACgkQ9DSh76/u
rqPyfA//bJtRYfPd6LDvGplCuT2eJpDSuoAhk/nz+ozVstCBWOQ8w3eM4Uh6vT9v
xgDpg7rw55TXnYBwVvWxGVZZq8JPv0ePv6ecud7lsJ/sO/Za0snsXBY8mRbTaVGV
jqD20JmaR8ovSEJc5F5jCYFJDzVESj3gOUXoTUCiZTgy1GRsgLAPz+vq+w+zoexa
a+zYpQXN8c7M5tTe5I9goPZMmxtu6tnLdtxsP41iQT0cHLVEAN+MNUtO2dn0T/0b
oRvI3O0WfVylsbtqJ9Vupbs3uax/ddbh6q6yW8cIA3gmHXW9jsdpF4m6v/9bPUOv
pjVIrDYsosqBPQRELyeigw6cNzaqsZmWMWhcxMvyRKNqCLrc8XSVJSLnX+Cx7P/4
D1nx23xCRJeQV0V4SyGtQvJKushSjNF0uuwyjMpAL5RaUpVZXvwDAuM6X1Jxh6jY
vhe8egT2Ya/IunG5Ys7Uu3aaVg9n2X2G/9e3Sl20KVsjHSkWpHuF6cBdVLzdCu8/
S70XpHQtm4DlcDQQUlTAg2fB0Gqgk04Ycela00Z0xwhUfCBPyFYOGRl5eGh8KKQk
vLB7igs97dwlhLO4gxsdGcN/FQ5x9mqfKvN5Z9svfgaJMsa7+3Me6yr8XkrrWavr
80oKNUnHYv5QGH3UtmiUq+crTj8/WcPl+HPP1Q+QRRTxqdE3BjU=
=FDVH
-----END PGP SIGNATURE-----

14
libreoffice.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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
- 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>

55
libreoffice.spec
View File

@ -52,7 +52,7 @@
%bcond_with gtk3
%endif
Name: libreoffice
Version: 6.1.5.1
Version: 6.2.0.2
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,14 @@ 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
# 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.72.patch -- Fix build with poppler 0.72
Patch12: libreoffice-poppler-0.72.patch
# [Bug 1112114] LO-L3: [PPTX] SmartArt: Basic rendering of the Organizational Chart
Patch14: bsc1112114.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 +119,7 @@ BuildRequires: doxygen >= 1.8.4
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: flute
BuildRequires: fontforge
BuildRequires: gcc-c++
BuildRequires: glm-devel
BuildRequires: graphviz
@ -147,6 +140,7 @@ BuildRequires: libformula
BuildRequires: libjpeg-devel
BuildRequires: liblayout
BuildRequires: libloader
BuildRequires: libmariadb-devel
BuildRequires: librepository
BuildRequires: libserializer
BuildRequires: libtool
@ -171,10 +165,12 @@ BuildRequires: perl(Archive::Zip)
BuildRequires: perl(Digest::MD5)
BuildRequires: pkgconfig(apr-util-1)
BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(epoxy) >= 1.2
BuildRequires: pkgconfig(dbus-1) >= 0.60
BuildRequires: pkgconfig(epoxy) >= 1.5
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 +196,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 +208,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 +811,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 +850,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
@ -953,13 +956,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif # Leap 42/SLE-12
%patch2
%patch3
%patch4 -p1
%patch6 -p1
%patch11 -p1
if pkg-config --atleast-version=0.72 poppler; then
%patch12 -p1
fi
%patch14 -p1
%patch990 -p1
# Disable some of the failing tests (some are random)
@ -1018,6 +1014,7 @@ export NOCONFIGURE=yes
%configure \
--with-parallelism=%{jobs} \
--enable-eot \
--enable-ld=gold \
%if %{with lto}
--enable-lto \
%endif
@ -1030,7 +1027,6 @@ export NOCONFIGURE=yes
--with-system-ucpp \
--with-system-dicts \
--with-vendor=SUSE \
--with-alloc=system \
--with-tls=nss \
--disable-openssl \
--with-lang=ALL \
@ -1068,7 +1064,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 \
@ -1090,9 +1086,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 \
@ -1515,6 +1511,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

3
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies%2BODFTOOLKIT-460%2BODFTOOLKIT-475.jar
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769
size 23988041

3
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
size 23988874

3
pdfium-3426.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957
size 6348500

3
pdfium-3550.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679
size 6923846