libreoffice: update to 5.0.5.2

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-03-05 00:19:38 +01:00
parent 5db0348824
commit e67243eb4b
3 changed files with 32 additions and 14 deletions

View File

@@ -12,28 +12,46 @@ Upstream-Status: submitted [1]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
vcl/headless/svpgdi.cxx | 4 ++++
1 file changed, 4 insertions(+)
vcl/headless/svpgdi.cxx | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index cc4baab..85f8a35 100644
index 21efd33..d1f4df1 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -657,6 +657,7 @@ bool SvpSalGraphics::drawPolyPolygonBezier( sal_uInt32,
return false;
@@ -645,6 +645,7 @@ void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
dbgOut( m_aDevice );
}
+#if ENABLE_CAIRO_CANVAS
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, bool bClosePath)
{
@@ -719,11 +720,13 @@ static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, b
@@ -707,6 +708,7 @@ static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, b
}
}
#endif
+#endif
bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, double fTransparency)
bool SvpSalGraphics::drawPolyLine(
const ::basegfx::B2DPolygon& rPolyLine,
@@ -717,6 +719,7 @@ bool SvpSalGraphics::drawPolyLine(
{
bool bRet = false;
(void)rPolyLine; (void)fTransparency; (void)rLineWidths; (void)eLineJoin; (void)eLineCap;
+#if ENABLE_CAIRO_CANVAS
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
// short circuit if there is nothing to do
const int nPointCount = rPolyLine.count();
@@ -825,6 +828,7 @@ bool SvpSalGraphics::drawPolyLine(
}
bRet = true;
#endif
+#endif
return bRet;
}
@@ -857,6 +861,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
{
bool bRet = false;
(void)rPolyPoly; (void)fTransparency;
@@ -41,7 +59,7 @@ index cc4baab..85f8a35 100644
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
if (m_bUseLineColor || !m_bUseFillColor)
{
@@ -768,6 +771,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
@@ -901,6 +906,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
}
bRet = true;
#endif

View File

@@ -1,9 +1,9 @@
PV = "5.0.4.2"
DIRV = "5.0.4"
PV = "5.0.5.2"
DIRV = "5.0.5"
SRC_URI += " \
http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
"
SRC_URI[md5sum] = "0c6381581f93ef7142b00837002755dd"
SRC_URI[sha256sum] = "647440b70fc190a43a3373cfe5b06a87558ee07711e3d74cab8fb9d8cbac6dc8"
SRC_URI[md5sum] = "2a04618e59a4d6b0638a3cb2b896e35e"
SRC_URI[sha256sum] = "1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88"

View File

@@ -15,8 +15,8 @@ SRC_URI += " \
file://0009-avoid-downloading-by-git-submodules.patch \
"
SRC_URI[translations.md5sum] = "73711d36f4d16b0e2657367c823e1872"
SRC_URI[translations.sha256sum] = "0adeb2b7ccc4ffb2fb58b036029c161f8971b03610c383cc120be2a712d1b9cd"
SRC_URI[translations.md5sum] = "9698d9d5948988a8f130d909bb0675ce"
SRC_URI[translations.sha256sum] = "67ad8bf35e55f3acb77a4fa9f1e07784a2acde72dcc9126567c833af70748b8d"
DEPENDS += " \
${BPN}-native \