Update LibreOffice suite to 6.4.6 maintenance release

Relnotes:	https://wiki.documentfoundation.org/ReleaseNotes/6.4

4 files changed, 6 insertions, 121 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 23987a705609..819f6179aa36 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,5 +1,4 @@
 # $FreeBSD$
-PORTREVISION=	1
 
 .include "${.CURDIR}/Makefile.common"
 
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 4fa98e5823cd..ce82c7fe0427 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libreoffice
-PORTVERSION=	6.4.5
+PORTVERSION=	6.4.6
 CATEGORIES+=	editors
 
 MAINTAINER=	office@FreeBSD.org
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index a864333c427b..fbcb75848eb3 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1593246155
-SHA256 (libreoffice/libreoffice-6.4.5.2.tar.xz) = 6a4cc6b9ca838ca997b83181d8d163b1981de2d4d1268387741d342453a491ec
-SIZE (libreoffice/libreoffice-6.4.5.2.tar.xz) = 236255044
-SHA256 (libreoffice/libreoffice-help-6.4.5.2.tar.xz) = 66675ccb023a8ed88cdad6e877cfef55ea139630cdf8df17516835c7456e2fa2
-SIZE (libreoffice/libreoffice-help-6.4.5.2.tar.xz) = 88376816
+TIMESTAMP = 1597379137
+SHA256 (libreoffice/libreoffice-6.4.6.2.tar.xz) = ab8281c5290e23eb46c4d4aee4abb16d2dcc5ff6daf46991c0370bee6ec0aa4c
+SIZE (libreoffice/libreoffice-6.4.6.2.tar.xz) = 232180876
+SHA256 (libreoffice/libreoffice-help-6.4.6.2.tar.xz) = 4af036e3f2a033b620b31acff24c0ce7b239ddd40a3782fb77640c0b386e04c8
+SIZE (libreoffice/libreoffice-help-6.4.6.2.tar.xz) = 88297908
 SHA256 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
 SIZE (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 207544
 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
diff --git a/editors/libreoffice/files/patch-python382 b/editors/libreoffice/files/patch-python382
deleted file mode 100644
index 097431c21465..000000000000
--- a/editors/libreoffice/files/patch-python382
+++ /dev/null
@@ -1,114 +0,0 @@
-From 50ccb7e82b7053306721cbe220323be072306a29 Mon Sep 17 00:00:00 2001
-From: Justin Luth <justin_luth@sil.org>
-Date: Sat, 22 Feb 2020 07:30:15 +0300
-Subject: python 3.8.2 compile: add tp_print to PyTypeObject
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I couldn't find this documented on the Internet though,
-as the 3.9 and 3.8.2rc documentation didn't mention it
-as an added item...
-
-I'm using Ubuntu 20.04 alpha with python3 --version
-Python 3.8.2rc1
-
-This fixes pyuno/source/module/pyuno.cxx:1689:1: error:
-missing initializer for member ‘_typeobject::tp_print’
-[-Werror=missing-field-initializers]
-
-Change-Id: Idec5720050572b34628267cd94557dabf7edbf3c
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89247
-Tested-by: Jenkins
-Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
----
- pyuno/source/module/pyuno.cxx          | 3 +++
- pyuno/source/module/pyuno_callable.cxx | 3 +++
- pyuno/source/module/pyuno_iterator.cxx | 6 ++++++
- pyuno/source/module/pyuno_runtime.cxx  | 3 +++
- pyuno/source/module/pyuno_struct.cxx   | 3 +++
- 5 files changed, 18 insertions(+)
-
-diff --git pyuno/source/module/pyuno.cxx pyuno/source/module/pyuno.cxx
-index a6a875addc46..bf6e5c667b7c 100644
---- pyuno/source/module/pyuno.cxx
-+++ pyuno/source/module/pyuno.cxx
-@@ -1684,6 +1684,9 @@ static PyTypeObject PyUNOType =
-     , nullptr
- #if PY_VERSION_HEX >= 0x03080000
-     , nullptr // vectorcallfunc tp_vectorcall
-+#if PY_VERSION_HEX >= 0x03080200
-+    , 0 //Py_ssize_t tp_print
-+#endif
- #endif
- #endif
- };
-diff --git pyuno/source/module/pyuno_callable.cxx pyuno/source/module/pyuno_callable.cxx
-index 9be3e1f1aef8..4803a30f814d 100644
---- pyuno/source/module/pyuno_callable.cxx
-+++ pyuno/source/module/pyuno_callable.cxx
-@@ -235,6 +235,9 @@ static PyTypeObject PyUNO_callable_Type =
-     , nullptr
- #if PY_VERSION_HEX >= 0x03080000
-     , nullptr // vectorcallfunc tp_vectorcall
-+#if PY_VERSION_HEX >= 0x03080200
-+    , 0 //Py_ssize_t tp_print
-+#endif
- #endif
- #endif
- };
-diff --git pyuno/source/module/pyuno_iterator.cxx pyuno/source/module/pyuno_iterator.cxx
-index a7862857d719..6ba7f96a9632 100644
---- pyuno/source/module/pyuno_iterator.cxx
-+++ pyuno/source/module/pyuno_iterator.cxx
-@@ -168,6 +168,9 @@ static PyTypeObject PyUNO_iterator_Type =
-     , nullptr
- #if PY_VERSION_HEX >= 0x03080000
-     , nullptr // vectorcallfunc tp_vectorcall
-+#if PY_VERSION_HEX >= 0x03080200
-+    , 0 //Py_ssize_t tp_print
-+#endif
- #endif
- #endif
- };
-@@ -305,6 +308,9 @@ static PyTypeObject PyUNO_list_iterator_Type =
-     , nullptr
- #if PY_VERSION_HEX >= 0x03080000
-     , nullptr // vectorcallfunc tp_vectorcall
-+#if PY_VERSION_HEX >= 0x03080200
-+    , 0 //Py_ssize_t tp_print
-+#endif
- #endif
- #endif
- };
-diff --git pyuno/source/module/pyuno_runtime.cxx pyuno/source/module/pyuno_runtime.cxx
-index 823355a900da..5182f57ab201 100644
---- pyuno/source/module/pyuno_runtime.cxx
-+++ pyuno/source/module/pyuno_runtime.cxx
-@@ -126,6 +126,9 @@ static PyTypeObject RuntimeImpl_Type =
-     , nullptr
- #if PY_VERSION_HEX >= 0x03080000
-     , nullptr // vectorcallfunc tp_vectorcall
-+#if PY_VERSION_HEX >= 0x03080200
-+    , 0 //Py_ssize_t tp_print
-+#endif
- #endif
- #endif
- };
-diff --git pyuno/source/module/pyuno_struct.cxx pyuno/source/module/pyuno_struct.cxx
-index 50b74126bee9..56b71cdf5cc4 100644
---- pyuno/source/module/pyuno_struct.cxx
-+++ pyuno/source/module/pyuno_struct.cxx
-@@ -347,6 +347,9 @@ static PyTypeObject PyUNOStructType =
-     , nullptr
- #if PY_VERSION_HEX >= 0x03080000
-     , nullptr // vectorcallfunc tp_vectorcall
-+#if PY_VERSION_HEX >= 0x03080200
-+    , 0 //Py_ssize_t tp_print
-+#endif
- #endif
- #endif
- };
--- 
-cgit v1.2.1
-