libreoffice: update to 24.8.0.3.

srcpkgs/libreoffice/patches/001-build-option-java.patch

@@ -1,6 +1,6 @@
 --- a/cui/source/options/optjava.cxx
 +++ b/cui/source/options/optjava.cxx
-@@ -976,6 +976,7 @@ OUString SvxJavaClassPathDlg::GetClassPa
+@@ -974,6 +974,7 @@ OUString SvxJavaClassPathDlg::GetClassPa
  #if HAVE_FEATURE_JAVA
  void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
  {
@@ -8,7 +8,7 @@
      if ( m_sOldPath.isEmpty() )
          m_sOldPath = _rPath;
      m_xPathList->clear();
-@@ -1001,6 +1002,7 @@ void SvxJavaClassPathDlg::SetClassPath(
+@@ -999,6 +1000,7 @@ void SvxJavaClassPathDlg::SetClassPath(
          m_xPathList->select(0);
      }
      SelectHdl_Impl(*m_xPathList);

srcpkgs/libreoffice/patches/003-musl-java.patch

@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -8998,7 +8998,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
+@@ -9139,7 +9139,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
          ;;
  
@@ -9,7 +9,7 @@
          JAVAINC="-I$JAVA_HOME/include"
          JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -15074,7 +15074,7 @@ else
+@@ -15386,7 +15386,7 @@ else
  
      case "$host_os" in
  
@@ -20,7 +20,7 @@
          fi
 --- a/configure
 +++ b/configure
-@@ -23020,7 +23020,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
+@@ -23269,7 +23269,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
          ;;
  
@@ -29,7 +29,7 @@
          JAVAINC="-I$JAVA_HOME/include"
          JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -48162,7 +48162,7 @@ else
+@@ -48847,7 +48847,7 @@ else
  
      case "$host_os" in
  

srcpkgs/libreoffice/patches/004-no-fsword_t.patch

@@ -1,38 +0,0 @@
-From 434065478d35fe8e144aec916ac06438c0150270 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <stephan.bergmann@allotropia.de>
-Date: Fri, 8 Mar 2024 12:47:23 +0100
-Subject: [PATCH] Avoid mentioning Glibc-internal type __fsword_t
-
-...and clean up the use of macros here
-
-Change-Id: Iede9ff705992d5e229b44b48cd88f5b495f6cee4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164571
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
----
- sal/osl/unx/file.cxx | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/sal/osl/unx/file.cxx
-+++ b/sal/osl/unx/file.cxx
-@@ -39,6 +39,7 @@
- #include <fcntl.h>
- #include <limits>
- #include <limits.h>
-+#include <utility>
- 
- #include <string.h>
- #include <pthread.h>
-@@ -67,9 +68,9 @@
- #ifdef LINUX
- #include <sys/vfs.h>
- // As documented by the kernel
--#define SMB_SUPER_MAGIC  static_cast<__fsword_t>(0x517B)
--#define CIFS_SUPER_MAGIC static_cast<__fsword_t>(0xFF534D42)
--#define SMB2_SUPER_MAGIC static_cast<__fsword_t>(0xFE534D42)
-+constexpr decltype(std::declval<struct statfs>().f_type) SMB_SUPER_MAGIC = 0x517B;
-+constexpr decltype(std::declval<struct statfs>().f_type) CIFS_SUPER_MAGIC = 0xFF534D42;
-+constexpr decltype(std::declval<struct statfs>().f_type) SMB2_SUPER_MAGIC = 0xFE534D42;
- #endif
- 
- namespace {

srcpkgs/libreoffice/patches/005-no-slowcheck.patch

@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -7,7 +7,7 @@
+@@ -7,13 +7,13 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  #
  
@@ -9,3 +9,10 @@
  
  .PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo coverage internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
  
+ MAKECMDGOALS?=build
+ build_goal:=$(if $(filter build uicheck,$(MAKECMDGOALS)),build)\
+- $(if $(filter check,$(MAKECMDGOALS)),unitcheck slowcheck subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\
++ $(if $(filter check,$(MAKECMDGOALS)),unitcheck subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\
+  $(filter build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS))
+ 
+ SRCDIR := @SRC_ROOT@

srcpkgs/libreoffice/patches/006-cross-flag.patch

@@ -5,7 +5,7 @@ Description: Perhaps cleanup a bit and submit to upstream
  environment during build.
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5753,10 +5753,11 @@ if test "$cross_compiling" = "yes"; then
+@@ -5836,10 +5836,11 @@ if test "$cross_compiling" = "yes"; then
      test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
      (
      unset COM USING_X11 OS CPUNAME
@@ -18,7 +18,7 @@ Description: Perhaps cleanup a bit and submit to upstream
      unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
      if test -n "$CC_FOR_BUILD"; then
          export CC="$CC_FOR_BUILD"
-@@ -5766,6 +5767,12 @@ if test "$cross_compiling" = "yes"; then
+@@ -5849,6 +5850,12 @@ if test "$cross_compiling" = "yes"; then
          export CXX="$CXX_FOR_BUILD"
          CXX_BASE=`first_arg_basename "$CXX"`
      fi

srcpkgs/libreoffice/patches/007-cross-python.patch

@@ -2,7 +2,7 @@ Upstream: no
 Description: In VoidLinux, we always have same version of python in build and host
 --- a/configure.ac
 +++ b/configure.ac
-@@ -9879,8 +9879,6 @@ if test "$build_os" != "cygwin" -a "$ena
+@@ -10034,8 +10034,6 @@ if test "$build_os" != "cygwin" -a "$ena
      else
          # This allows a lack of system python with no error, we use internal one in that case.
          AM_PATH_PYTHON([3.3],, [:])

srcpkgs/libreoffice/patches/008-zxing.patch

@@ -5,7 +5,7 @@ Description: we should always check for full path
  Perhap we should changes the file hierarchy of zxing-cpp project instead?
 --- a/configure.ac
 +++ b/configure.ac
-@@ -11292,35 +11292,16 @@ else
+@@ -11483,35 +11483,16 @@ else
          SYSTEM_ZXING=TRUE
          ZXING_CFLAGS=
          AC_LANG_PUSH([C++])
@@ -46,7 +46,7 @@ Description: we should always check for full path
          FilterLibs "${ZXING_LIBS}"
          ZXING_LIBS="${filteredlibs}"
      else
-@@ -11337,8 +11318,8 @@ else
+@@ -11528,8 +11509,8 @@ else
      save_CXXFLAGS=$CXXFLAGS
      CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 $ZXING_CFLAGS"
      AC_COMPILE_IFELSE([AC_LANG_SOURCE([
@@ -59,7 +59,16 @@ Description: we should always check for full path
                  matrix.set(0, 0, true);
 --- a/cui/source/dialogs/QrCodeGenDialog.cxx
 +++ b/cui/source/dialogs/QrCodeGenDialog.cxx
-@@ -26,22 +26,22 @@
+@@ -19,7 +19,7 @@
+ #include <vcl/svapp.hxx>
+ 
+ #if ENABLE_ZXING
+-#include <ZXVersion.h>
++#include <ZXing/ZXVersion.h>
+ #include <rtl/strbuf.hxx>
+ 
+ #ifdef __GNUC__
+@@ -27,20 +27,20 @@
  #pragma GCC diagnostic ignored "-Wshadow"
  #endif
  
@@ -79,11 +88,7 @@ Description: we should always check for full path
 +#include <ZXing/BitMatrixIO.h>
  #endif
  
--#if __has_include(<Utf.h>)
+ #if ZXING_VERSION_MAJOR < 2
--#include <Utf.h>
-+#if __has_include(<ZXing/Utf.h>)
-+#include <ZXing/Utf.h>
- #else
 -#include <TextUtfEncoding.h>
 +#include <ZXing/TextUtfEncoding.h>
  #endif

srcpkgs/libreoffice/patches/009-kde.patch

@@ -2,7 +2,7 @@ Upstream: maybe
 Description: Moving some runtime check to compile time check
 --- a/configure.ac
 +++ b/configure.ac
-@@ -13410,12 +13410,13 @@ then
+@@ -13598,12 +13598,13 @@ then
      save_CXXFLAGS=$CXXFLAGS
      CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
      AC_MSG_CHECKING([whether KDE is >= 5.0])
@@ -19,7 +19,7 @@ Description: Moving some runtime check to compile time check
  }
         ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
      CXXFLAGS=$save_CXXFLAGS
-@@ -13486,12 +13487,13 @@ then
+@@ -13674,12 +13675,13 @@ then
      CXXFLAGS="$CXXFLAGS $KF6_CFLAGS"
      dnl KF6 development version as of 2023-06 uses version number 5.240
      AC_MSG_CHECKING([whether KDE is >= 5.240])

srcpkgs/libreoffice/patches/010-gpgmepp.patch

@@ -20,7 +20,7 @@ Description: we should always use full path
  using ::com::sun::star::uno::Sequence;
 --- a/comphelper/source/misc/storagehelper.cxx
 +++ b/comphelper/source/misc/storagehelper.cxx
-@@ -62,10 +62,10 @@
+@@ -59,10 +59,10 @@
  #include <o3tl/string_view.hxx>
  
  #if HAVE_FEATURE_GPGME
@@ -37,7 +37,7 @@ Description: we should always use full path
  using namespace ::com::sun::star;
 --- a/configure.ac
 +++ b/configure.ac
-@@ -12707,7 +12707,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
+@@ -12890,7 +12890,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
          SYSTEM_GPGMEPP=TRUE
  
          # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
@@ -48,7 +48,7 @@ Description: we should always use full path
              [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
 --- a/xmlsecurity/source/gpg/CertificateImpl.cxx
 +++ b/xmlsecurity/source/gpg/CertificateImpl.cxx
-@@ -19,8 +19,8 @@
+@@ -16,8 +16,8 @@
  #include <officecfg/Office/Common.hxx>
  #include <svl/sigstruct.hxx>
  
@@ -72,7 +72,7 @@ Description: we should always use full path
  {
 --- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
 +++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
-@@ -25,8 +25,8 @@
+@@ -24,8 +24,8 @@
  #include <tools/urlobj.hxx>
  #endif
  
@@ -80,10 +80,10 @@ Description: we should always use full path
 -#include <keylistresult.h>
 +#include <gpgme++/key.h>
 +#include <gpgme++/keylistresult.h>
- #include <xmlsec-wrapper.h>
+ #include <libxml/xmlstring.h>
- 
+ #include <xmlsec/base64.h>
- #if defined _MSC_VER && defined __clang__
+ #include <xmlsec/xmlsec.h>
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@
  #if defined _MSC_VER && defined __clang__
  #pragma clang diagnostic pop
  #endif
@@ -105,17 +105,15 @@ Description: we should always use full path
  #endif
 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
 +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
-@@ -32,11 +32,11 @@
+@@ -31,10 +31,10 @@
  #if defined _MSC_VER && defined __clang__
  #pragma clang diagnostic pop
  #endif
 -#include <context.h>
--#include <key.h>
 -#include <data.h>
 -#include <signingresult.h>
 -#include <importresult.h>
 +#include <gpgme++/context.h>
-+#include <gpgme++/key.h>
 +#include <gpgme++/data.h>
 +#include <gpgme++/signingresult.h>
 +#include <gpgme++/importresult.h>

srcpkgs/libreoffice/template

@@ -1,6 +1,6 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=24.2.5.1
+version=24.8.0.3
 revision=1
 build_style=meta
 build_helper="gir"
@@ -18,16 +18,20 @@ _xdeps="zlib-devel libjpeg-turbo-devel clucene-devel expat-devel xmlsec1-devel
  zxcvbn-c-devel zxing-cpp-devel box2d-devel hyphen-devel mythes-devel
  CoinMP-devel lpsolve-devel libexttextcat-devel libnumbertext-devel
  libepoxy-devel cairo-devel liblangtag-devel libpng-devel tiff-devel
- libwebp-devel fontconfig-devel gobject-introspection libgirepository-devel"
+ libwebp-devel fontconfig-devel libcmis-devel
+ gobject-introspection libgirepository-devel"
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
  tar perl-Archive-Zip pkg-config sane unzip zip python3-setuptools
- fontforge python3-lxml qt6-base gnupg"
+ fontforge python3-lxml qt6-base gnupg
+ $(vopt_if java 'openjdk17 apache-ant beanshell rhino hsqldb1.8.0')"
 makedepends="$_xdeps openssl-devel libXrender-devel libbluetooth-devel
  gpgmepp-devel libXinerama-devel libXt-devel libX11-devel libICE-devel
  libSM-devel libopenjpeg2-devel abseil-cpp-devel poppler-cpp-devel
  gtk+3-devel gtk4-devel gst-plugins-base1-devel
- qt6-base-devel kf6-kio-devel kf6-frameworkintegration-devel
+ qt6-base-devel qt6-multimedia-devel
- libmariadbclient-devel postgresql-libs-devel"
+ kf6-kio-devel kf6-frameworkintegration-devel
+ libmariadbclient-devel postgresql-libs-devel
+ $(vopt_if firebird 'libfbclient3-devel libatomic_ops-devel')"
 # Add the previously installed default languages as well
 depends="libreoffice-common>=${version}_${revision}
  libreoffice-base>=${version}_${revision}
@@ -67,19 +71,15 @@ distfiles="
  ${_baseurl}/${pkgname}-${version}.tar.xz
  ${_baseurl}/${pkgname}-help-${version}.tar.xz
  ${_baseurl}/${pkgname}-translations-${version}.tar.xz
- ${_addurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
  ${_addurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
  ${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
  ${_addurl}/language-subtag-registry-2022-08-08.tar.bz2
- ${_addurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${_addurl}/libcmis-0.6.1.tar.xz
+ ${_addurl}/pdfium-6425.tar.bz2
- ${_addurl}/pdfium-6179.tar.bz2
  ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
  ${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
  ${_addurl}/dtoa-20180411.tgz
- ${_addurl}/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
  ${_addurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
  ${_addurl}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
  ${_addurl}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
@@ -93,25 +93,21 @@ distfiles="
  ${_addurl}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
  ${_addurl}/frozen-1.1.1.tar.gz
  ${_addurl}/dragonbox-1.1.3.tar.gz
- ${_addurl}/Java-WebSocket-1.5.4.tar.gz
+ ${_addurl}/Java-WebSocket-1.5.6.tar.gz
  ${_addurl}/zxcvbn-c-2.5.tar.gz
 "
-checksum="8c73a987d538cec82556ca2f654cdcaefed28f8d623a337e0671fd3550f1f3f5
+checksum="5b11468cd1b68c05c33b151fcd7d044eea0c7e1dbf4bda028b490e18df7d78c1
- 815e039d3bf26e8a9d172758ae3a7259668a0755571d7196edd34e1dc3043e20
+ 7653e34fa2139fa6818d644208a0fc9e4e43be18d669c020f38c8dab161671ed
- b9c9422b46fbbccc6fb2de6ab0b7422ec0d9b8feb7657e8532007ba9d1838be7
+ 5e2706a6b0339b3424a3fb75c83b73817603722baf8fa11a9b84dc9a65ece55c
- 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
  e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
- d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
- d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074
+ fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c
- 4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c
  f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
  d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
  0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
- 9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96
  64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
  1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
  75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
@@ -125,22 +121,18 @@ checksum="8c73a987d538cec82556ca2f654cdcaefed28f8d623a337e0671fd3550f1f3f5
  2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01
  f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45
  09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384
- a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720
+ 167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f
  77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd"
 skip_extraction="
- 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
  ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
  language-subtag-registry-2022-08-08.tar.bz2
- 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- libcmis-0.6.1.tar.xz
+ pdfium-6425.tar.bz2
- pdfium-6179.tar.bz2
  8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
  odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
  dtoa-20180411.tgz
- beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
  35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
  b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
  eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
@@ -154,7 +146,7 @@ skip_extraction="
  skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
  frozen-1.1.1.tar.gz
  dragonbox-1.1.3.tar.gz
- Java-WebSocket-1.5.4.tar.gz
+ Java-WebSocket-1.5.6.tar.gz
  zxcvbn-c-2.5.tar.gz
 "
 replaces="libreoffice-firebird<6.2.4.2_1"
@@ -179,14 +171,6 @@ else
 	hostmakedepends+=" $_xdeps"
 fi
 
-if [ "$build_option_java" ]; then
-	makedepends+=" openjdk17 apache-ant"
-fi
-
-if [ "$build_option_firebird" ]; then
-	makedepends+=" libfbclient3-devel libatomic_ops-devel"
-fi
-
 # Move files listed in a <name>_list.txt into $PKGDESTDIR
 _split() {
 	local list file dir destdir
@@ -368,7 +352,7 @@ post_extract() {
 	local pkg f dir fname
 	local srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} pkg
 	mkdir -p ${wrksrc}/external/tarballs
-	for pkg in ${skip_extraction} libreoffice-{dictionaries,help,translations}-${version}.tar.xz ; do
+	for pkg in ${skip_extraction} libreoffice-{help,translations}-${version}.tar.xz ; do
 		if [ "${pkg%.dll}" != "${pkg}" ]; then
 			# The dll needs to be copied instead of symlinked
 			cp -v ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
@@ -486,22 +470,20 @@ do_configure() {
 	fi
 
 	opts+=" --with-tls=nss"
+	opts+=" --with-system-hsqldb"
+	opts+=" --with-hsqldb-jar=/usr/share/java/hsqldb-1.8.0.jar"
 	# https://github.com/tdf/libcmis/pull/43 changes ABI
-	opts+=" --without-system-libcmis"
+	# opts+=" --without-system-libcmis"
-	bopts+=" --without-system-libcmis"
+	# bopts+=" --without-system-libcmis"
 	opts+=" --without-system-libtommath"
 	bopts+=" --without-system-libtommath"
 	opts+=" --without-system-jfreereport"
 	bopts+=" --without-system-jfreereport"
-	opts+=" --without-system-beanshell"
-	bopts+=" --without-system-beanshell"
 	opts+=" --without-system-dragonbox"
 	bopts+=" --without-system-dragonbox"
 	opts+=" --without-system-libfixmath"
 	bopts+=" --without-system-libfixmath"
 	opts+=" --without-myspell-dicts"
-	# use system utilities
-	opts+=" --enable-build-opensymbol"
 	# finish configuring build
 	opts+=" --with-external-dict-dir=/usr/share/hunspell"
 	opts+=" --with-external-hyph-dir=/usr/share/hyphen"
@@ -532,7 +514,7 @@ do_build() {
 }
 
 do_check() {
-	: "TODO test can not find hsqldb.jar" \
+	: "need firebird running" \
 	LO_JAVA_DIR="${wrksrc}/instdir/program/classes" \
 	LD_LIBRARY_PATH=/usr/lib/jvm/openjdk17/lib/server \
 	make ${makejobs} check
@@ -547,7 +529,8 @@ do_install() {
 
 libreoffice-common_package() {
 	short_desc+=" - Common files"
-	depends="libreoffice-i18n-en-US>=${version}_${revision}"
+	depends="libreoffice-i18n-en-US>=${version}_${revision}
+	 $(vopt_if java 'rhino hsqldb1.8.0')"
 	skiprdeps=/usr/lib/libreoffice/program/libofficebean.so
 	replaces="libreoffice-epub>=0"
 	pkg_install() {
@@ -685,7 +668,8 @@ libreoffice-writer_package() {
 # Use a name which makes this catch-all subpackage the last one
 libreoffice-xtensions_package() {
 	short_desc+=" - Extensions"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-common>=${version}_${revision}
+	 $(vopt_if java beanshell)"
 	pkg_install() {
 		# Remove empty files
 		find ${DESTDIR}/all -size 0 -delete