editors/libreoffice: Please welcome LibreOffice suite 7.2.0 release!

LibreOffice 7.2 launches with many new features, compatibility improvements
and performance boosts. Learn all about it in blog announce post:
https://blog.documentfoundation.org/blog/2021/08/19/libreoffice-7-2-community/

9 files changed, 36 insertions, 47 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 024887f16e46..c8e24f2670b4 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	0
 
 .include "${.CURDIR}/Makefile.common"
 
@@ -77,6 +77,7 @@ LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libmythes-1.2.so:textproc/mythes \
 		libraptor2.so:textproc/raptor2 \
 		librdf.so:textproc/redland \
+		libZXing.so:textproc/zxing-cpp \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libserf-1.so:www/serf
@@ -91,7 +92,7 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 
 DISTFILES+=	f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:ext
 DISTFILES+=	dtoa-20180411.tgz:src
-DISTFILES+=	skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz:src
+DISTFILES+=	skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz:src
 
 NOT_FOR_ARCHS=		armv6 armv7
 NOT_FOR_ARCHS_REASON=	Unsupported host_cpu
@@ -260,6 +261,7 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-system-libxml \
 		--with-system-ucpp \
 		--with-system-zlib \
+		--with-system-zxing \
 		--with-vendor="FreeBSD ports" \
 		--without-fonts \
 		--without-myspell-dicts
@@ -272,8 +274,11 @@ CONFIGURE_ENV=	DMAKE=${LOCALBASE}/bin/dmake \
 		ICU_LIBS="`icu-config --ldflags`" \
 		PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
 		PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \
+		ZXING_CFLAGS=-I/usr/local/include/ZXing \
 		ac_cv_path_SED=${LOCALBASE}/bin/gsed
 
+CONFIGURE_SHELL=	${LOCALBASE}/bin/bash
+
 MAKE_ARGS+=	TMPDIR=${WRKDIR}
 MAKE_ENV+=	CXXFLAGS_WARN="${CXXFLAGS_WARN}"
 MAKE_ENV+=	GNUSED=${LOCALBASE}/bin/gsed
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 7dfcc4c436a2..b2e3b01bb9b9 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -7,5 +7,5 @@ LICENSE=	LGPL3+ MPL20
 LICENSE_COMB=	dual
 
 DISTVERSION=	${LOVERSION}.${RCVER}
-LOVERSION=	7.1.5
-RCVER=		2
+LOVERSION=	7.2.0
+RCVER=		4
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index ce9cadcf9f18..15b7d07ac074 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1626963117
-SHA256 (libreoffice/libreoffice-7.1.5.2.tar.xz) = aeaf30367665bdfdcf780d2b28e304352255de778db41d32d12cd77d5b2385ce
-SIZE (libreoffice/libreoffice-7.1.5.2.tar.xz) = 244350068
-SHA256 (libreoffice/libreoffice-help-7.1.5.2.tar.xz) = ca042962047e11ea5634ebdcb0254083f2095aa83e9fa32fbbd6ab99e1ea30d4
-SIZE (libreoffice/libreoffice-help-7.1.5.2.tar.xz) = 111785852
+TIMESTAMP = 1629371034
+SHA256 (libreoffice/libreoffice-7.2.0.4.tar.xz) = 28aac16d3b33ed8196be5ff0b5108dec36b73f85a68b857e221850d15b715576
+SIZE (libreoffice/libreoffice-7.2.0.4.tar.xz) = 251846252
+SHA256 (libreoffice/libreoffice-help-7.2.0.4.tar.xz) = 0bbd849745fc7f820efb5c30fbde85c37f591e1a67f010bdb0c3f5c717c4e295
+SIZE (libreoffice/libreoffice-help-7.2.0.4.tar.xz) = 111990760
 SHA256 (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
 SIZE (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 207992
 SHA256 (libreoffice/dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
 SIZE (libreoffice/dtoa-20180411.tgz) = 48893
-SHA256 (libreoffice/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz) = f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301
-SIZE (libreoffice/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz) = 10420480
+SHA256 (libreoffice/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz) = abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d
+SIZE (libreoffice/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz) = 10630696
 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
 SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
diff --git a/editors/libreoffice/files/patch-configure b/editors/libreoffice/files/patch-configure
index beb920769ea3..d43ded0ba73e 100644
--- a/editors/libreoffice/files/patch-configure
+++ b/editors/libreoffice/files/patch-configure
@@ -62,3 +62,12 @@
  
  $MDDS_PKG_ERRORS
  
+@@ -36014,7 +36019,7 @@ else $as_nop
+   as_fn_error $? "zxing headers not found." "$LINENO" 5
+ fi
+ 
+-        ZXING_CFLAGS=-I/usr/include/ZXing
++        ZXING_CFLAGS=-I/usr/local/include/ZXing
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lZXing" >&5
+ printf %s "checking for main in -lZXing... " >&6; }
+ if test ${ac_cv_lib_ZXing_main+y}
diff --git a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk
index e81723fe63d2..a7214fab3033 100644
--- a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk
+++ b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk
@@ -1,12 +1,9 @@
 --- external/skia/UnpackedTarball_skia.mk.orig	2021-02-05 14:00:19 UTC
 +++ external/skia/UnpackedTarball_skia.mk
-@@ -36,7 +36,8 @@ skia_patches := \
-     c++20.patch.0 \
-     constexpr-debug-std-max.patch.1 \
-     swap-buffers-rect.patch.1 \
--    ubsan.patch.0
-+    ubsan.patch.0 \
-+    gfx-skia-skia-src-core-SkCpu.cpp.patch.0
+@@ -39,6 +39,7 @@ skia_patches := \
+     fast-png-write.patch.1 \
+     skia_sk_cpu_sse_level_0_by_default.patch.1 \
+     fix-warnings.patch.1 \
++    gfx-skia-skia-src-core-SkCpu.cpp.patch.0 \
  
  $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
- 
diff --git a/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog.cxx b/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog.cxx
index 00e8786b8aec..a04ca1acf4e4 100644
--- a/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog.cxx
+++ b/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-lok-dialog.cxx
@@ -1,13 +1,13 @@
 --- libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx.orig	2020-05-06 18:00:34 UTC
 +++ libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
-@@ -10,7 +10,12 @@
+@@ -10,8 +10,12 @@
  #include <gtk/gtk.h>
  #include <gdk/gdkkeysyms.h>
  
 +#include <cmath>
  #include <iostream>
+ #include <sstream>
 +#include <strstream>
-+#include <sstream>
 +#include <string>
 +#include <vector>
  
diff --git a/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx b/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx
deleted file mode 100644
index 2fc2ac6e24fd..000000000000
--- a/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- shell/source/unix/exec/shellexec.cxx.orig	2020-11-22 14:05:28 UTC
-+++ shell/source/unix/exec/shellexec.cxx
-@@ -168,7 +168,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom
-         aBuffer.append(" --");
- #else
-         // Just use xdg-open on non-Mac
--        aBuffer.append("/usr/bin/xdg-open");
-+        aBuffer.append("/usr/local/bin/xdg-open");
- #endif
-         aBuffer.append(" ");
-         escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));
diff --git a/editors/libreoffice/files/patch-vcl_qt5_Qt5Frame.cxx b/editors/libreoffice/files/patch-vcl_qt5_Qt5Frame.cxx
deleted file mode 100644
index e6b1e7e5cf59..000000000000
--- a/editors/libreoffice/files/patch-vcl_qt5_Qt5Frame.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- vcl/qt5/Qt5Frame.cxx.orig	2020-05-13 11:19:20 UTC
-+++ vcl/qt5/Qt5Frame.cxx
-@@ -308,7 +308,7 @@ SalGraphics* Qt5Frame::AcquireGraphics()
- 
-     if (m_bUseCairo)
-     {
--        if (!m_pOurSvpGraphics || m_bGraphicsInvalid)
-+        if (!m_pOurSvpGraphics)
-         {
-             m_pOurSvpGraphics.reset(new Qt5SvpGraphics(this));
-             InitQt5SvpGraphics(m_pOurSvpGraphics.get());
diff --git a/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx b/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx
index aad13b769fb4..f7a46f48d282 100644
--- a/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx
+++ b/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx
@@ -1,6 +1,6 @@
 --- vcl/qt5/Qt5Instance.cxx.orig	2020-05-13 11:19:20 UTC
 +++ vcl/qt5/Qt5Instance.cxx
-@@ -261,7 +261,13 @@ SalFrame* Qt5Instance::CreateChildFrame(SystemParentDa
+@@ -287,7 +287,13 @@ SalFrame* Qt5Instance::CreateChildFrame(SystemParentDa
  SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
  {
      assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
@@ -15,16 +15,16 @@
  }
  
  void Qt5Instance::DestroyFrame(SalFrame* pFrame)
-@@ -420,7 +426,7 @@ Qt5Instance::createPicker(css::uno::Reference<css::uno
+@@ -458,7 +464,7 @@ Qt5Instance::createPicker(css::uno::Reference<css::uno
      {
          SolarMutexGuard g;
-         Qt5FilePicker* pPicker;
+         rtl::Reference<Qt5FilePicker> pPicker;
 -        RunInMainThread([&, this]() { pPicker = createPicker(context, eMode); });
 +        RunInMainThread([&pPicker, this, context, eMode]() { pPicker = createPicker(context, eMode); });
          assert(pPicker);
          return pPicker;
      }
-@@ -624,7 +630,7 @@ std::unique_ptr<QApplication> Qt5Instance::CreateQAppl
+@@ -663,7 +669,7 @@ std::unique_ptr<QApplication> Qt5Instance::CreateQAppl
  extern "C" {
  VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance()
  {