LibreOffice 7.0.4 is here, with over 110 bugfixes and compatibility improvements!

It's the latest release in the 7.0 branch

Release Notes: https://wiki.documentfoundation.org/ReleaseNotes/7.0
MFH:		2020Q4

7 files changed, 19 insertions, 58 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index e942368de6a0..8300e392cc90 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-PORTREVISION=	3
+PORTREVISION=	0
 
 .include "${.CURDIR}/Makefile.common"
 
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 05d08f8badff..f9066a012582 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -9,5 +9,5 @@ LICENSE=	LGPL3+ MPL20
 LICENSE_COMB=	dual
 
 DISTVERSION=	${LOVERSION}.${RCVER}
-LOVERSION=	7.0.3
-RCVER=		1
+LOVERSION=	7.0.4
+RCVER=		2
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index edd90299a87e..a01f3650cc72 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1603759599
-SHA256 (libreoffice/libreoffice-7.0.3.1.tar.xz) = 6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d
-SIZE (libreoffice/libreoffice-7.0.3.1.tar.xz) = 240706432
-SHA256 (libreoffice/libreoffice-help-7.0.3.1.tar.xz) = eb1ce39cb90b7c04f69af6f47c75cb65526634315d12230e638e3a561b9b9293
-SIZE (libreoffice/libreoffice-help-7.0.3.1.tar.xz) = 110855688
+TIMESTAMP = 1608278347
+SHA256 (libreoffice/libreoffice-7.0.4.2.tar.xz) = 9fa9d2cc8d02f12b1f302b93056d5c0ff986090a6f309bafa506ba53779f2abd
+SIZE (libreoffice/libreoffice-7.0.4.2.tar.xz) = 236477520
+SHA256 (libreoffice/libreoffice-help-7.0.4.2.tar.xz) = 0b6353221594937c482eaad078c67139455776bce6ab42df9b22709ed271e9da
+SIZE (libreoffice/libreoffice-help-7.0.4.2.tar.xz) = 110758084
 SHA256 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
 SIZE (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 207544
 SHA256 (libreoffice/dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_cpp2uno.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_cpp2uno.cxx
deleted file mode 100644
index e51fe9edf04c..000000000000
--- a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_cpp2uno.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx.orig	2020-03-11 17:18:35 UTC
-+++ bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
-@@ -321,9 +321,16 @@ extern "C" void vtableSlotCall(
-     double fpr2, double fpr3, double fpr4, double fpr5, double fpr6,
-     double fpr7, ...)
- {
--    register void * volatile indirectRet asm ("x8");
--    register sal_Int32 volatile functionIndex asm ("x9");
--    register sal_Int32 volatile vtableOffset asm ("x10");
-+    void * volatile indirectRet;
-+    sal_Int32 volatile functionIndex, vtableOffset;
-+
-+    asm volatile(
-+        "mov %0, x8\n\t"
-+        "mov %0, x9\n\t"
-+        "mov %0, x10\n\t"
-+        : "=r" (indirectRet), "=r" (functionIndex), "=r" (vtableOffset)
-+        ::);
-+
-     va_list ap;
-     va_start(ap, fpr7);
-     assert(sizeof (va_list) == sizeof (aarch64_va_list));
diff --git a/editors/libreoffice/files/patch-external_skia_Library__skia.mk b/editors/libreoffice/files/patch-external_skia_Library__skia.mk
new file mode 100644
index 000000000000..fb476fdaecf7
--- /dev/null
+++ b/editors/libreoffice/files/patch-external_skia_Library__skia.mk
@@ -0,0 +1,11 @@
+--- external/skia/Library_skia.mk.orig	2020-11-22 14:05:28 UTC
++++ external/skia/Library_skia.mk
+@@ -71,7 +71,7 @@ $(eval $(call gb_Library_use_externals,skia,\
+     libpng \
+ ))
+ 
+-ifeq ($(OS),LINUX)
++ifneq (,$(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)))
+ $(eval $(call gb_Library_add_libs,skia,\
+     -lm \
+     -ldl \
diff --git a/editors/libreoffice/files/patch-icu68 b/editors/libreoffice/files/patch-icu68
deleted file mode 100644
index e1e068c1eb9a..000000000000
--- a/editors/libreoffice/files/patch-icu68
+++ /dev/null
@@ -1,17 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: use of undeclared identifier 'TRUE'
-    body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
-                                       ^
-
---- i18npool/source/calendar/calendar_gregorian.cxx.orig	2020-09-30 15:54:35 UTC
-+++ i18npool/source/calendar/calendar_gregorian.cxx
-@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDa
-             "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR);
-     int32_t nZoneOffset, nDSTOffset;
-     UErrorCode status = U_ZERO_ERROR;
--    body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
-+    body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
-     if ( !U_SUCCESS(status) ) throw ERROR;
-     status = U_ZERO_ERROR;
-     body->setTime( fR - (nZoneOffset + nDSTOffset), status );
diff --git a/editors/libreoffice/files/patch-vcl_source_filter_ipdf_pdfread.cxx b/editors/libreoffice/files/patch-vcl_source_filter_ipdf_pdfread.cxx
deleted file mode 100644
index 13f08b491d94..000000000000
--- a/editors/libreoffice/files/patch-vcl_source_filter_ipdf_pdfread.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- vcl/source/filter/ipdf/pdfread.cxx.orig	2020-10-21 20:09:11 UTC
-+++ vcl/source/filter/ipdf/pdfread.cxx
-@@ -218,7 +218,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize
-     (void)rBitmaps;
-     (void)nFirstPage;
-     (void)nPages;
--    (void)fResolutionDPI;
-+    (void)pSizeHint;
-     return 0;
- #endif // HAVE_FEATURE_PDFIUM
- }