editors/libreoffice: update to 24.2.0 release (+)

LibreOffice 24.2 Community is here!

The new major release of the complete, free, volunteer-supported office suite,
with the new calendar-based numbering scheme (YY.M), many new useful features,
and a focus on security and accessibility, is available.

* Styles for comments
* Row/column highlighting in Calc
* A search field in the options dialog
...and many other new features

Read more:	https://blog.documentfoundation.org/blog/2024/01/31/libreoffice-24-2/

8 files changed, 80 insertions, 71 deletions

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index a00a0a5e46e5..d6ab748656cb 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	4
+PORTREVISION=	0
 
 .include "${.CURDIR}/Makefile.common"
 
@@ -62,6 +62,7 @@ LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libassuan.so:security/libassuan \
 		libgpgme.so:security/gpgme \
 		libgpgmepp.so:security/gpgme-cpp \
+		libargon2.so:security/libargon2 \
 		libgpg-error.so:security/libgpg-error \
 		libnss3.so:security/nss \
 		libxmlsec1-nss.so:security/xmlsec1 \
@@ -109,7 +110,8 @@ DISTFILES+=	f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-ope
 DISTFILES+=	dtoa-20180411.tgz:src
 DISTFILES+=	dragonbox-1.1.3.tar.gz:src
 DISTFILES+=	frozen-1.1.1.tar.gz:src
-DISTFILES+=	skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz:src
+DISTFILES+=	skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz:src
+DISTFILES+=	zxcvbn-c-2.5.tar.gz:src
 
 NOT_FOR_ARCHS=		armv6 armv7
 NOT_FOR_ARCHS_REASON=	Unsupported host_cpu
@@ -137,9 +139,10 @@ USE_XORG=	ice sm x11 xaw xcb xext xinerama xrandr xrender
 USES+=		elfctl
 ELF_FEATURES=	+wxneeded:instdir/program/soffice.bin
 
-OPTIONS_DEFINE=	COINMP CUPS DOCS GNOME GTK3 GTK4 JAVA KF5 LTO MMEDIA PDFIUM PGSQL MARIADB SDK TEST WEBDAV
-OPTIONS_RADIO=	QT
+OPTIONS_DEFINE=	COINMP CUPS DOCS GNOME GTK3 GTK4 JAVA LTO MMEDIA PDFIUM PGSQL MARIADB SDK TEST WEBDAV
+OPTIONS_RADIO=	QT KDE
 OPTIONS_RADIO_QT=	QT5 QT6
+OPTIONS_RADIO_KDE=	KF5 KF6
 OPTIONS_DEFAULT=	CUPS DOCS JAVA MMEDIA PDFIUM QT5
 #OPTIONS_EXCLUDE=	GTK4
 
@@ -147,11 +150,13 @@ COINMP_DESC=	Enable CoinMP (deprecated) math solver
 GTK4_DESC=	GTK+ 4 GUI toolkit support (experimental, broken)
 JAVA_DESC=	Add Java support (XML filters, macros, DB connections)
 KF5_DESC=	KF5/Qt5 GUI toolkit support (implies QT5)
+KF6_DESC=	KF6/Qt6 GUI toolkit support (implies QT6)
 MMEDIA_DESC=	Enable multimedia backend for Impress
 PDFIUM_DESC=	Enable PDFium secure engine
 PGSQL_DESC=	Build with PostgreSQL-SDBC driver
 MARIADB_DESC=	Build with MariaDB/MySQL-SDBC driver
 QT_DESC=	Select Qt GUI engine version
+KDE_DESC=	Select KDE GUI engine version
 QT5_DESC=	Qt5 GUI toolkit support (default visual style)
 QT6_DESC=	Qt6 GUI toolkit support (experimental visual style)
 SDK_DESC=	Build with SDK
@@ -216,14 +221,24 @@ JAVA_DISTFILES=	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
 		d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \
 		db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \
 		eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \
-		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src
+		f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src \
+		Java-WebSocket-1.5.4.tar.gz:src
 JAVA_USE=	JAVA=yes
-JAVA_VARS=	JAVA_BUILD=yes JAVA_RUN=yes JAVA_VERSION=11+
+JAVA_VARS=	JAVA_BUILD=yes JAVA_RUN=yes JAVA_VERSION=17+
 
 KF5_CONFIGURE_ENABLE=	kf5
 KF5_USE=	kde=config,coreaddons,i18n,kio,windowsystem
 KF5_USES=	kde:5
 KF5_IMPLIES=	QT5
+KF5_PREVENTS=	KF6
+KF5_PREVENTS_MSG=	KF5 cannot coexist with KF6
+
+KF6_CONFIGURE_ENABLE=	kf6
+KF6_USE=	kde=config,coreaddons,i18n,kio,windowsystem
+KF6_USES=	kde:6
+KF6_IMPLIES=	QT6
+KF6_PREVENTS=	KF5
+KF6_PREVENTS_MSG=	KF6 cannot coexist with KF5
 
 LTO_CONFIGURE_ENABLE=	lto
 
@@ -231,7 +246,7 @@ MMEDIA_USES=		gstreamer
 MMEDIA_CONFIGURE_ENABLE=	gstreamer-1-0
 
 PDFIUM_CONFIGURE_ENABLE=	pdfium
-PDFIUM_DISTFILES=	pdfium-5778.tar.bz2:src
+PDFIUM_DISTFILES=	pdfium-6179.tar.bz2:src
 PDFIUM_LIB_DEPENDS=	libabsl_strings.so:devel/abseil \
 			libopenjp2.so:graphics/openjpeg
 
@@ -243,6 +258,8 @@ MARIADB_CONFIGURE_ENABLE=	mariadb-sdbc
 MARIADB_USES=	mysql:client
 
 QT5_CONFIGURE_ENABLE=	qt5
+QT5_PREVENTS=	KF6
+QT5_PREVENTS_MSG=	KF6 support require Qt6 engine
 QT5_USE=	qt=buildtools:build,core,gui,network,qmake:build,widgets,x11extras
 QT5_USES=	qt:5
 
@@ -289,6 +306,7 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-os-version=${OSVERSION} \
 		--with-parallelism=${MAKE_JOBS_NUMBER} \
 		--with-system-abseil \
+		--with-system-argon2 \
 		--with-system-cppunit \
 		--with-system-cuckoo \
 		--with-system-curl \
@@ -306,6 +324,7 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-system-orcus \
 		--with-system-ucpp \
 		--with-system-zlib \
+		--with-system-zxcvbn=no \
 		--with-system-zxing \
 		--with-tls=nss \
 		--with-vendor="FreeBSD ports" \
@@ -390,8 +409,8 @@ post-install:
 	${FIND} -s lib/libreoffice -type d -empty \
 	    -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX} && \
-	${FIND} -s bin lib -not -type d >> ${TMPPLIST}
-.for subdir in applications bash-completion icons man metainfo mime
+	${FIND} -s bin lib man -not -type d >> ${TMPPLIST}
+.for subdir in applications bash-completion icons metainfo mime
 	@cd ${STAGEDIR}${PREFIX} && \
 	${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST}
 .endfor
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 784199f14508..c12e8e14b9d2 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -7,8 +7,8 @@ LICENSE=	LGPL3+ MPL20
 LICENSE_COMB=	dual
 
 DISTVERSION=	${LOVERSION}.${RCVER}
-LOVERSION=	7.6.4
-RCVER=		1
+LOVERSION=	24.2.0
+RCVER=		3
 
 #PRERELEASE=	yes
 #DEVRELEASE=	yes
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index d54c65bb916b..c47f828a57c4 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1702065925
-SHA256 (libreoffice/libreoffice-7.6.4.1.tar.xz) = 13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e
-SIZE (libreoffice/libreoffice-7.6.4.1.tar.xz) = 281547116
-SHA256 (libreoffice/libreoffice-help-7.6.4.1.tar.xz) = ed784c014096e0e7ff86294eba624bd92ecbe5be881b01950eecd69aed7d8678
-SIZE (libreoffice/libreoffice-help-7.6.4.1.tar.xz) = 166959028
+TIMESTAMP = 1706730182
+SHA256 (libreoffice/libreoffice-24.2.0.3.tar.xz) = 18f456917aa207f3bf4f4c013c392261a7d374075fb2fe246a2cfe58b3483568
+SIZE (libreoffice/libreoffice-24.2.0.3.tar.xz) = 280356652
+SHA256 (libreoffice/libreoffice-help-24.2.0.3.tar.xz) = 5c3542d8fa67eabebee758b608742838ced3182cf1851cfa4d636add8a8e428e
+SIZE (libreoffice/libreoffice-help-24.2.0.3.tar.xz) = 167071080
 SHA256 (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
 SIZE (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 207992
 SHA256 (libreoffice/dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
@@ -11,8 +11,10 @@ SHA256 (libreoffice/dragonbox-1.1.3.tar.gz) = 09d63b05e9c594ec423778ab59b7a5aa1d
 SIZE (libreoffice/dragonbox-1.1.3.tar.gz) = 4337233
 SHA256 (libreoffice/frozen-1.1.1.tar.gz) = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45
 SIZE (libreoffice/frozen-1.1.1.tar.gz) = 186589
-SHA256 (libreoffice/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz) = 0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9
-SIZE (libreoffice/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz) = 10693272
+SHA256 (libreoffice/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz) = 2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01
+SIZE (libreoffice/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz) = 10868024
+SHA256 (libreoffice/zxcvbn-c-2.5.tar.gz) = 77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd
+SIZE (libreoffice/zxcvbn-c-2.5.tar.gz) = 1404434
 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
@@ -47,7 +49,9 @@ SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c803
 SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800
 SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919
-SHA256 (libreoffice/pdfium-5778.tar.bz2) = b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06
-SIZE (libreoffice/pdfium-5778.tar.bz2) = 9532052
+SHA256 (libreoffice/Java-WebSocket-1.5.4.tar.gz) = a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720
+SIZE (libreoffice/Java-WebSocket-1.5.4.tar.gz) = 189725
+SHA256 (libreoffice/pdfium-6179.tar.bz2) = 4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c
+SIZE (libreoffice/pdfium-6179.tar.bz2) = 9907097
 SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
 SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288
diff --git a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk
index f11a670090c6..9d20510df932 100644
--- a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk
+++ b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk
@@ -1,10 +1,9 @@
---- external/skia/UnpackedTarball_skia.mk.orig	2023-11-30 13:04:41 UTC
+--- external/skia/UnpackedTarball_skia.mk.orig	2023-12-08 15:11:48 UTC
 +++ external/skia/UnpackedTarball_skia.mk
-@@ -40,6 +40,8 @@ skia_patches := \
-     redefinition-of-op.patch.0 \
-     0001-Added-missing-include-cstdio.patch \
+@@ -41,6 +41,7 @@ skia_patches := \
+     ubsan-missing-typeinfo.patch.1 \
+     incomplete-type-SkImageGenerator.patch.1 \
      0001-AvoidCombiningExtrememelyLargeMeshes.patch.1 \
-+    gfx-skia-skia-src-core-SkCpu.cpp.patch.0 \
 +    powerpc64le-skia.patch.0 \
  
  $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/editors/libreoffice/files/patch-external_skia_gfx-skia-skia-src-core-SkCpu.cpp.patch.0 b/editors/libreoffice/files/patch-external_skia_gfx-skia-skia-src-core-SkCpu.cpp.patch.0
deleted file mode 100644
index b4e1e6df11e6..000000000000
--- a/editors/libreoffice/files/patch-external_skia_gfx-skia-skia-src-core-SkCpu.cpp.patch.0
+++ /dev/null
@@ -1,35 +0,0 @@
---- external/skia/gfx-skia-skia-src-core-SkCpu.cpp.patch.0.orig	2020-11-11 11:31:37 UTC
-+++ external/skia/gfx-skia-skia-src-core-SkCpu.cpp.patch.0
-@@ -0,0 +1,32 @@
-+Regressed by https://svnweb.freebsd.org/changeset/base/324815
-+
-+gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'getauxval'
-+        uint32_t hwcaps = getauxval(AT_HWCAP);
-+                          ^
-+
-+--- src/core/SkCpu.cpp.orig	2020-02-07 22:13:22 UTC
-++++ src/core/SkCpu.cpp
-+@@ -72,6 +72,23 @@
-+         return features;
-+     }
-+ 
-++#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)
-++    #include <machine/armreg.h>
-++    #ifndef ID_AA64ISAR0_CRC32_VAL
-++    #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
-++    #endif
-++
-++    static uint32_t read_cpu_features() {
-++        uint32_t features = 0;
-++        uint64_t id_aa64isar0;
-++
-++        id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
-++        if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) {
-++            features |= SkCpu::CRC32;
-++        }
-++        return features;
-++    }
-++
-+ #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
-+     #include <sys/auxv.h>
-+ 
diff --git a/editors/libreoffice/files/patch-sal_osl_unx_process.cxx b/editors/libreoffice/files/patch-sal_osl_unx_process.cxx
new file mode 100644
index 000000000000..e1be1e6a6c72
--- /dev/null
+++ b/editors/libreoffice/files/patch-sal_osl_unx_process.cxx
@@ -0,0 +1,11 @@
+--- sal/osl/unx/process.cxx.orig	2023-11-23 12:14:48 UTC
++++ sal/osl/unx/process.cxx
+@@ -45,7 +45,7 @@
+ #include <machine/param.h>
+ #endif
+ 
+-#ifdef IOS
++#if defined (IOS) || defined(FREEBSD)
+ #include <signal.h>
+ #endif
+ 
diff --git a/editors/libreoffice/files/patch-sal_osl_unx_socket.cxx b/editors/libreoffice/files/patch-sal_osl_unx_socket.cxx
new file mode 100644
index 000000000000..0f1d58e2f490
--- /dev/null
+++ b/editors/libreoffice/files/patch-sal_osl_unx_socket.cxx
@@ -0,0 +1,10 @@
+--- sal/osl/unx/socket.cxx.orig	2023-11-23 12:14:48 UTC
++++ sal/osl/unx/socket.cxx
+@@ -39,6 +39,7 @@
+ #include <arpa/inet.h>
+ #include <fcntl.h>
+ #include <netdb.h>
++#include <netinet/in.h>
+ #include <netinet/tcp.h>
+ #include <poll.h>
+ #include <unistd.h>
diff --git a/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx b/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx
index 9440b937df52..9f614f084a62 100644
--- a/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx
+++ b/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx
@@ -1,6 +1,16 @@
---- vcl/qt5/QtInstance.cxx.orig	2023-07-28 18:13:49 UTC
+--- vcl/qt5/QtInstance.cxx.orig	2023-11-23 12:14:48 UTC
 +++ vcl/qt5/QtInstance.cxx
-@@ -492,7 +492,7 @@ QtInstance::createPicker(css::uno::Reference<css::uno:
+@@ -220,7 +220,8 @@ QtInstance::QtInstance(std::unique_ptr<QApplication>& 
+ 
+ QtInstance::QtInstance(std::unique_ptr<QApplication>& pQApp)
+     : SalGenericInstance(std::make_unique<QtYieldMutex>())
+-    , m_bUseCairo(nullptr == getenv("SAL_VCL_QT_USE_QFONT"))
++//    , m_bUseCairo(nullptr == getenv("SAL_VCL_QT_USE_QFONT"))
++    , m_bUseCairo(true) // (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO"));
+     , m_pTimer(nullptr)
+     , m_bSleeping(false)
+     , m_pQApplication(std::move(pQApp))
+@@ -492,7 +493,7 @@ QtInstance::createPicker(css::uno::Reference<css::uno:
      {
          SolarMutexGuard g;
          rtl::Reference<QtFilePicker> pPicker;
@@ -9,12 +19,3 @@
          assert(pPicker);
          return pPicker;
      }
-@@ -751,7 +751,7 @@ VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance()
- extern "C" {
- VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance()
- {
--    static const bool bUseCairo = (nullptr == getenv("SAL_VCL_QT_USE_QFONT"));
-+    static const bool bUseCairo = true; // (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO"));
- 
-     std::unique_ptr<char* []> pFakeArgv;
-     std::unique_ptr<int> pFakeArgc;