Update LibreOffice to 6.3.6 stable release

Reviewed by:	lwhsu
With hat:	office

5 files changed, 25 insertions, 81 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 7032a7ef3d21..3bf3c4928c75 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	8
+PORTREVISION=	0
 
 .include "${.CURDIR}/Makefile.common"
 
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 0f53ff50f6a6..4f5e598b7918 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libreoffice
-PORTVERSION=	6.3.4
+PORTVERSION=	6.3.6
 CATEGORIES+=	editors
 
 MAINTAINER=	office@FreeBSD.org
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index c93f343f5690..3e8cb2b7e302 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1576177564
-SHA256 (libreoffice/libreoffice-6.3.4.2.tar.xz) = cb72559aa9774f2c13e8fa78391d8f30f3c6f02e3fd83b2311bd643a5cdde49c
-SIZE (libreoffice/libreoffice-6.3.4.2.tar.xz) = 225632492
-SHA256 (libreoffice/libreoffice-help-6.3.4.2.tar.xz) = 8eac0f6a846c90ab06490c0fec144d108da7f88082175eea28b81a0e8942af06
-SIZE (libreoffice/libreoffice-help-6.3.4.2.tar.xz) = 13191636
+TIMESTAMP = 1589618868
+SHA256 (libreoffice/libreoffice-6.3.6.2.tar.xz) = c39a4c7bb6e3bea604b0bfb2743492cb908166b464336272dac92c7dcf48af58
+SIZE (libreoffice/libreoffice-6.3.6.2.tar.xz) = 226305208
+SHA256 (libreoffice/libreoffice-help-6.3.6.2.tar.xz) = 391723f757f30ed8c372005d64d0845fe62034f61a116dc7554981d2f7afbfc0
+SIZE (libreoffice/libreoffice-help-6.3.6.2.tar.xz) = 13192272
 SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
 SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291
 SHA256 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
diff --git a/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83 b/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83
deleted file mode 100644
index 2b60fc8ab0cc..000000000000
--- a/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83
+++ /dev/null
@@ -1,74 +0,0 @@
-From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001
-From: Martin Milata <martin@martinmilata.cz>
-Date: Wed, 4 Dec 2019 02:37:40 +0100
-Subject: [PATCH] Fix build with poppler-0.83
-
-Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
-Reviewed-on: https://gerrit.libreoffice.org/84384
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <michael.stahl@cib.de>
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2019-12-05 19:59:23 UTC
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons
-     gfree(pBuf);
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+void PDFOutDev::printPath( const GfxPath* pPath )
-+#else
- void PDFOutDev::printPath( GfxPath* pPath )
-+#endif
- {
-     int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
-     for( int i=0; i<nSubPaths; i++ )
-     {
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+        const
-+#endif
-         GfxSubpath* pSub  = pPath->getSubpath( i );
-         const int nPoints = pSub->getNumPoints();
- 
-@@ -556,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
-     if (!(pAction && pAction->getKind() == actionURI))
- return;
- 
--#if POPPLER_CHECK_VERSION(0, 72, 0)
-+#if POPPLER_CHECK_VERSION(0, 86, 0)
-+    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
-+#elif POPPLER_CHECK_VERSION(0, 72, 0)
-     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
- #else
-     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    | 4 ++++
- 3 files changed, 15 insertions(+)
-
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig	2019-12-05 19:59:23 UTC
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -149,7 +149,11 @@ namespace pdfi
- 
-         int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
-         void writeFontFile( GfxFont* gfxFont ) const;
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+        static void printPath( const GfxPath* pPath );
-+#else
-         static void printPath( GfxPath* pPath );
-+#endif
- 
-     public:
-         explicit PDFOutDev( PDFDoc* pDoc );
---- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig	2019-12-05 19:59:23 UTC
-+++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -68,7 +68,11 @@ int main(int argc, char **argv)
-     }
- 
-     // read config file
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+    globalParams = std::make_unique<GlobalParams>();
-+#else
-     globalParams = new GlobalParams();
-+#endif
-     globalParams->setErrQuiet(true);
- #if defined(_MSC_VER)
-     globalParams->setupBaseFonts(nullptr);
diff --git a/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
new file mode 100644
index 000000000000..5c9586c81662
--- /dev/null
+++ b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
@@ -0,0 +1,18 @@
+From c1adc0a7559340213d754db950fd68bfe9e5a651 Mon Sep 17 00:00:00 2001
+From: Martin Whitaker <foss@martin-whitaker.me.uk>
+Date: Sun, 15 Mar 2020 13:14:34 +0000
+Subject: [PATCH] Fix build with poppler 0.86.0.
+
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2020-03-11 16:18:35 UTC
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+     if (!(pAction && pAction->getKind() == actionURI))
+         return;
+ 
+-#if POPPLER_CHECK_VERSION(0, 72, 0)
++#if POPPLER_CHECK_VERSION(0, 86, 0)
++    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
++#elif POPPLER_CHECK_VERSION(0, 72, 0)
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+ #else
+     const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();