diff --git a/srcpkgs/libreoffice-i18n-ab b/srcpkgs/libreoffice-i18n-ab
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ab
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-hy b/srcpkgs/libreoffice-i18n-hy
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-hy
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-sat-Olck b/srcpkgs/libreoffice-i18n-sat-Olck
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-sat-Olck
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-tl b/srcpkgs/libreoffice-i18n-tl
new file mode 120000
index 00000000000..d5e3a56f350
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-tl
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice/patches/001-build-option-java.patch b/srcpkgs/libreoffice/patches/001-build-option-java.patch
index 2a50f46c821..96e302a0bfa 100644
--- a/srcpkgs/libreoffice/patches/001-build-option-java.patch
+++ b/srcpkgs/libreoffice/patches/001-build-option-java.patch
@@ -1,6 +1,6 @@
 --- a/cui/source/options/optjava.cxx
 +++ b/cui/source/options/optjava.cxx
-@@ -974,6 +974,7 @@ OUString SvxJavaClassPathDlg::GetClassPa
+@@ -980,6 +980,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();
-@@ -999,6 +1000,7 @@ void SvxJavaClassPathDlg::SetClassPath(
+@@ -1005,6 +1006,7 @@ void SvxJavaClassPathDlg::SetClassPath(
          m_xPathList->select(0);
      }
      SelectHdl_Impl(*m_xPathList);
diff --git a/srcpkgs/libreoffice/patches/003-musl-java.patch b/srcpkgs/libreoffice/patches/003-musl-java.patch
index 0a145859e5e..f646011e1aa 100644
--- a/srcpkgs/libreoffice/patches/003-musl-java.patch
+++ b/srcpkgs/libreoffice/patches/003-musl-java.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -9421,7 +9421,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
+@@ -9408,7 +9408,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"
-@@ -15751,7 +15751,7 @@ else
+@@ -15872,7 +15872,7 @@ else
  
      case "$host_os" in
  
@@ -20,7 +20,7 @@
          fi
 --- a/configure
 +++ b/configure
-@@ -23873,7 +23873,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
+@@ -23856,7 +23856,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"
-@@ -49566,7 +49566,7 @@ else
+@@ -51122,7 +51122,7 @@ else
  
      case "$host_os" in
  
diff --git a/srcpkgs/libreoffice/patches/006-cross-flag.patch b/srcpkgs/libreoffice/patches/006-cross-flag.patch
index c8805bd0d2a..8f1182ce99f 100644
--- a/srcpkgs/libreoffice/patches/006-cross-flag.patch
+++ b/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
-@@ -6051,11 +6051,13 @@
+@@ -6120,11 +6120,13 @@ if test "$cross_compiling" = "yes"; then
      cp configure CONF-FOR-BUILD
      test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
      (
@@ -20,7 +20,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"
-@@ -6065,6 +6067,12 @@
+@@ -6134,6 +6136,12 @@ if test "$cross_compiling" = "yes"; then
          export CXX="$CXX_FOR_BUILD"
          CXX_BASE=`first_arg_basename "$CXX"`
      fi
diff --git a/srcpkgs/libreoffice/patches/007-cross-python.patch b/srcpkgs/libreoffice/patches/007-cross-python.patch
index f026b76af86..c4e05a9a806 100644
--- a/srcpkgs/libreoffice/patches/007-cross-python.patch
+++ b/srcpkgs/libreoffice/patches/007-cross-python.patch
@@ -2,10 +2,10 @@ Upstream: no
 Description: In VoidLinux, we always have same version of python in build and host
 --- a/configure.ac
 +++ b/configure.ac
-@@ -10316,8 +10316,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],, [:])
+@@ -10355,8 +10355,6 @@ if test "$build_os" != "cygwin" -a "$ena
+             # harfbuzz is built using meson, and current meson requires at least python 3.7
+             AM_PATH_PYTHON([3.7],, [:])
+         fi
 -        # Clean PYTHON_VERSION checked below if cross-compiling
 -        PYTHON_VERSION=""
          if test "$PYTHON" != ":"; then
diff --git a/srcpkgs/libreoffice/patches/008-zxing.patch b/srcpkgs/libreoffice/patches/008-zxing.patch
index b1e99dc0e34..0f762991d40 100644
--- a/srcpkgs/libreoffice/patches/008-zxing.patch
+++ b/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
-@@ -11777,35 +11777,16 @@ else
+@@ -11865,35 +11865,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
-@@ -11822,8 +11803,8 @@ else
+@@ -11910,8 +11891,8 @@ else
      save_CXXFLAGS=$CXXFLAGS
      CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 $ZXING_CFLAGS"
      AC_COMPILE_IFELSE([AC_LANG_SOURCE([
@@ -59,16 +59,21 @@ 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
-@@ -19,7 +19,7 @@
+@@ -19,10 +19,10 @@
  #include <vcl/svapp.hxx>
  
  #if ENABLE_ZXING
+-#if __has_include(<Version.h>)
+-#include <Version.h>
++#if __has_include(<ZXing/Version.h>)
++#include <ZXing/Version.h>
+ #else
 -#include <ZXVersion.h>
 +#include <ZXing/ZXVersion.h>
+ #endif
  #include <rtl/strbuf.hxx>
  
- #ifdef __GNUC__
-@@ -27,20 +27,20 @@
+@@ -31,20 +31,20 @@
  #pragma GCC diagnostic ignored "-Wshadow"
  #endif
  
diff --git a/srcpkgs/libreoffice/patches/010-gpgmepp.patch b/srcpkgs/libreoffice/patches/010-gpgmepp.patch
index 2660a3b9645..de778138cfc 100644
--- a/srcpkgs/libreoffice/patches/010-gpgmepp.patch
+++ b/srcpkgs/libreoffice/patches/010-gpgmepp.patch
@@ -37,7 +37,7 @@ Description: we should always use full path
  using namespace ::com::sun::star;
 --- a/configure.ac
 +++ b/configure.ac
-@@ -13184,7 +13184,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
+@@ -13301,7 +13301,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
diff --git a/srcpkgs/libreoffice/patches/no-tar.patch b/srcpkgs/libreoffice/patches/no-tar.patch
new file mode 100644
index 00000000000..888ae4019c9
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/no-tar.patch
@@ -0,0 +1,13 @@
+--- a/bin/unpack-sources
++++ b/bin/unpack-sources
+@@ -78,8 +78,8 @@ for tarball in $tarballs ; do
+     if ! mkdir -p "$lo_src_dir/$tarname" ; then
+         echo "Error: could not create directory $lo_src_dir/$tarname"
+     fi
+-    echo tar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1
+-    if ! tar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1; then
++    echo bsdtar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1
++    if ! bsdtar -xf "$tarball" -C "$lo_src_dir/$tarname" --strip-components=1; then
+         echo "Error: could not unpack $tarname"
+         exit 1
+     fi
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index faa58df0b4e..dc8f3c27d67 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=25.2.5.2
-revision=2
+version=25.8.0.4
+revision=1
 build_helper="gir"
 build_style=configure # hack, avoid sourcing common/.../gnu-configure-args.sh
 metapackage=yes
@@ -14,7 +14,7 @@ _xdeps="zlib-devel libjpeg-turbo-devel clucene-devel expat-devel xmlsec1-devel
  libe-book-devel libabw-devel libpagemaker-devel libqxp-devel libzmf-devel
  libstaroffice-devel lcms2-devel libcppunit-devel freetype-devel libxslt-devel
  libgcrypt-devel libxml2-devel python3-devel libcurl-devel boost-devel-minimal
- libboost_locale
+ libboost_locale libeot-devel
  mdds frozen glm unixodbc-devel libldap-devel sane-devel icu-devel liborcus-devel
  graphite-devel harfbuzz-devel libargon2-devel redland-devel hunspell-devel
  zxcvbn-c-devel zxing-cpp-devel box2d-devel hyphen-devel mythes-devel
@@ -22,8 +22,8 @@ _xdeps="zlib-devel libjpeg-turbo-devel clucene-devel expat-devel xmlsec1-devel
  libepoxy-devel cairo-devel liblangtag-devel libpng-devel tiff-devel
  libwebp-devel fontconfig-devel libcmis-devel
  gobject-introspection libgirepository-devel libglib-devel"
-hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
- tar perl-Archive-Zip pkg-config sane unzip zip python3-setuptools
+hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext
+ perl-Archive-Zip pkg-config sane unzip zip python3-setuptools
  fontforge python3-lxml qt6-base gnupg glib-devel
  $(vopt_if java 'openjdk17 apache-ant beanshell rhino hsqldb1.8.0')"
 makedepends="$_xdeps openssl-devel libXrender-devel libbluetooth-devel
@@ -61,6 +61,7 @@ homepage="https://www.libreoffice.org/"
 
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
+_baseurl="https://downloadarchive.documentfoundation.org/libreoffice/old/${version}/src/"
 # Please don't remove this mirror, it's faster for me
 # _baseurl="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}"
 # _baseurl="https://mirrors.nju.edu.cn/tdf/libreoffice/src/${version%.*}"
@@ -76,15 +77,13 @@ distfiles="
  ${_baseurl}/${pkgname}-translations-${version}.tar.xz
  ${_addurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
  ${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${_addurl}/language-subtag-registry-2022-08-08.tar.bz2
+ ${_addurl}/language-subtag-registry-2025-07-15.tar.bz2
  ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${_addurl}/pdfium-6764.tar.bz2
+ ${_addurl}/pdfium-7012.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}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- ${_addurl}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
  ${_addurl}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
  ${_addurl}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
  ${_addurl}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
@@ -93,26 +92,24 @@ distfiles="
  ${_addurl}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
  ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
  ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- ${_addurl}/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz
+ ${_addurl}/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz
  ${_addurl}/frozen-1.2.0.tar.gz
  ${_addurl}/dragonbox-1.1.3.tar.gz
  ${_addurl}/Java-WebSocket-1.6.0.tar.gz
  ${_addurl}/zxcvbn-c-2.5.tar.gz
 "
-checksum="8c9fb209649f49a2adceca5b29b8a251c0285eb06c691beb3cad60e168b2b339
- 5b83ad86b8dfb8e41aaa4037e64faca69f83ce7f80c1c19f1da8379113c7dc19
- 6304151c2dcc5f54f8ecdfdd856d71d56eb1e6f0d6fd5fa7de3d3ce3b5f5dd9b
+checksum="353bd6f2dab04f47dfdb94ec063e1f45746ee0548d6478ee7288a6b411e3cb12
+ bb481127c368afa3e87972f71db87923b043ae81c69782565dc354e131bc9a52
+ 74d0e0d6fbbbb627e8ecabc66e6918131684a8ddaec640631ede2fe802222d23
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
- e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
+ 2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
- 59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49
+ e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd
  f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
  d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
  0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
- 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
- 1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
  75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
  e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
  5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
@@ -121,7 +118,7 @@ checksum="8c9fb209649f49a2adceca5b29b8a251c0285eb06c691beb3cad60e168b2b339
  abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
  05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
  085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
- 53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d
+ 2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25
  ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823
  09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384
  f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728
@@ -129,15 +126,13 @@ checksum="8c9fb209649f49a2adceca5b29b8a251c0285eb06c691beb3cad60e168b2b339
 skip_extraction="
  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
  ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- language-subtag-registry-2022-08-08.tar.bz2
+ language-subtag-registry-2025-07-15.tar.bz2
  d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- pdfium-6764.tar.bz2
+ pdfium-7012.tar.bz2
  8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
  odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
  dtoa-20180411.tgz
- 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
  eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
  3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
  3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
@@ -146,7 +141,7 @@ skip_extraction="
  8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
  f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
  39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz
+ skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz
  frozen-1.2.0.tar.gz
  dragonbox-1.1.3.tar.gz
  Java-WebSocket-1.6.0.tar.gz
@@ -201,20 +196,20 @@ unset _languages
 _add_lang() {
 	local pkglang tmp
 	local deps=
-	local pkg=$1
+	local lang=$1
 	local name=$2
-	pkglang=$pkg
+	pkglang="${lang//-/_}"
 	shift 2
 	while case "$1" in
-		-h*)	tmp=${1#-h}; deps="$deps hunspell-${tmp:-$pkg}" ;;
-		-H*)	tmp=${1#-H}; deps="$deps hyphen-${tmp:-$pkg}" ;;
-		-m*)	tmp=${1#-m}; deps="$deps mythes-${tmp:-$pkg}" ;;
+		-h*)	tmp=${1#-h}; deps="$deps hunspell-${tmp:-$pkglang}" ;;
+		-H*)	tmp=${1#-H}; deps="$deps hyphen-${tmp:-$pkglang}" ;;
+		-m*)	tmp=${1#-m}; deps="$deps mythes-${tmp:-$pkglang}" ;;
 		-l*)	pkglang=${1#-l} ;;
 		-vh=*)	deps="$deps virtual?hunspell-${1#-vh=}" ;;
 		*)	false ;;
 	esac; do shift; done
 	_languages="$_languages ${pkglang//_/-}"
-	eval "libreoffice-i18n-${pkg}_package() {
+	eval "libreoffice-i18n-${lang}_package() {
 		short_desc+=\" - ${name} language pack\"
 		depends='$deps'
 		pkg_install() {
@@ -223,24 +218,24 @@ _add_lang() {
 	}"
 }
 
-# _add_lang ab		"Abkhazian"
+_add_lang ab		"Abkhazian"
 _add_lang af		"Afrikaans" -h -H
 _add_lang am		"Amharic"
 # _add_lang an		"Aragonese"
 _add_lang ar		"Arabic" -h -m
-_add_lang as		"Assamese"
+_add_lang as		"Assamese" -h -H
 _add_lang ast		"Asturian"
 # _add_lang az		"Azerbaijani"
 _add_lang be		"Belarusian" -h -H
 _add_lang bg		"Bulgarian" -h -H -m
 _add_lang bn		"Bengali" -h
-_add_lang bn-IN		"Bengali (India)" -lbn_IN -hbn
+_add_lang bn-IN		"Bengali (India)" -hbn
 _add_lang bo		"Tibetan" -h
 _add_lang br		"Breton" -h
 _add_lang brx		"Bodo"
 _add_lang bs		"Bosnian" -h
 _add_lang ca		"Catalan" -hca_ES -H -m
-_add_lang ca-valencia	"Catalan (Valencian)" -lca_valencia -hca_ES -Hca -mca
+_add_lang ca-valencia	"Catalan (Valencian)" -hca_ES -Hca -mca
 _add_lang ckb		"Central Kurdish" -h
 _add_lang cs		"Czech" -h -H -m
 _add_lang cy		"Welsh (Cymraeg)"
@@ -250,15 +245,15 @@ _add_lang dgo		"Dogri proper"
 _add_lang dsb		"Lower Sorbian"
 _add_lang dz		"Dzongkha"
 _add_lang el		"Greek" -hel_GR -H
-_add_lang en-GB		"English (UK)" -len_GB -hen -vh=en_GB -Hen -men
-_add_lang en-US		"English (US)" -len_US -hen -Hen -men
-_add_lang en-ZA		"English (South Africa)" -len_ZA -hen -vh=en_GB -Hen -men
+_add_lang en-GB		"English (UK)" -hen -vh=en_GB -Hen -men
+_add_lang en-US		"English (US)" -hen -Hen -men
+_add_lang en-ZA		"English (South Africa)" -hen -vh=en_GB -Hen -men
 _add_lang eo		"Esperanto" -h -H -m
 _add_lang es		"Spanish" -h -H -m
 _add_lang et		"Estonian" -h -H
 _add_lang eu		"Basque"
 _add_lang fa		"Persian (Farsi)" -h
-_add_lang fi		"Finnish"
+_add_lang 'fi'		"Finnish"
 _add_lang fr		"French" -hfr_FR -H -m
 _add_lang fur		"Friulian"
 _add_lang fy		"Frisian"
@@ -272,6 +267,7 @@ _add_lang hi		"Hindi" -h
 _add_lang hr		"Croatian" -h -H
 _add_lang hsb		"Upper Sorbian"
 _add_lang hu		"Hungarian" -h -H -m
+_add_lang hy		"Armenian"
 _add_lang id		"Indonesian" -h -H -m
 _add_lang is		"Icelandic" -h -H -m
 _add_lang it		"Italian" -hit_IT -Hit_IT -mit_IT
@@ -282,8 +278,8 @@ _add_lang kab		"Kabyle"
 _add_lang kk		"Kazakh"
 # _add_lang kl		"Aklanon"
 _add_lang km		"Khmer"
-_add_lang kmr-Latn	"Kurmanji Kurdish (Latin)" -lkmr_Latn -hkmr
-_add_lang kn		"Kannada"
+_add_lang kmr-Latn	"Kurmanji - Northern Kurdish (Latin)" -hkmr
+_add_lang kn		"Kannada" -h -H
 _add_lang ko		"Korean" -h
 _add_lang kok		"Konkani"
 _add_lang ks		"Kashmiri"
@@ -297,7 +293,7 @@ _add_lang mk		"Macedonian"
 _add_lang ml		"Malayalam"
 _add_lang mn		"Mongolian" -h -H
 _add_lang mni		"Meithei (Manipuri)"
-_add_lang mr		"Marathi"
+_add_lang mr		"Marathi" -h -H -m
 _add_lang my		"Burmese"
 _add_lang nb		"Norwegian (Bokmal)" -hno -Hno -mno
 _add_lang ne		"Nepali" -h -m
@@ -307,17 +303,18 @@ _add_lang nr		"Ndebele (South)"
 _add_lang nso		"Northern Sotho"
 _add_lang oc		"Occitan" -h
 _add_lang om		"Oromo"
-_add_lang or		"Oriya"
-_add_lang pa-IN		"Punjabi (India)" -lpa_IN
+_add_lang or		"Oriya" -h -H
+_add_lang pa-IN		"Punjabi (India)" -hpa -Hpa
 _add_lang pl		"Polish" -h -H -m
 _add_lang pt		"Portuguese" -hpt_PT -Hpt_PT -mpt_PT
-_add_lang pt-BR		"Portuguese (Brazil)" -lpt_BR -hpt_BR -Hpt_BR -mpt_BR
+_add_lang pt-BR		"Portuguese (Brazil)" -h -H -m
 _add_lang ro		"Romanian" -hro_RO -H -m
 _add_lang ru		"Russian" -hru_RU -H -m
 _add_lang rw		"Kinyarwanda"
-_add_lang sa-IN		"Sanskrit (India)" -lsa_IN
+_add_lang sa-IN		"Sanskrit (India)" -hsa -Hsa
 # _add_lang sah		"Yakut"
 _add_lang sat		"Santali"
+_add_lang sat-Olck	"Santali (Ol Chiki)"
 _add_lang sd		"Sindhi"
 _add_lang si		"Sinhala" -h
 _add_lang sid		"Sidamo"
@@ -325,17 +322,18 @@ _add_lang sk		"Slovak" -h -H -m
 _add_lang sl		"Slovenian" -h -H -m
 _add_lang sq		"Albanian" -h -H
 _add_lang sr		"Serbian" -h -H
-_add_lang sr-Latn	"Serbian (Latin)" -lsr_Latn -hsr -Hsr
+_add_lang sr-Latn	"Serbian (Latin)" -hsr -Hsr
 _add_lang ss		"Swati"
 _add_lang st		"Southern Sotho"
 _add_lang sv		"Swedish" -h -H -m
-_add_lang sw-TZ		"Swahili (Tanzania)" -lsw_TZ
+_add_lang sw-TZ		"Swahili (Tanzania)"
 _add_lang szl		"Silesian"
-_add_lang ta		"Tamil"
+_add_lang ta		"Tamil" -h
 _add_lang te		"Telugu" -h -H
 _add_lang tg		"Tajik"
-_add_lang th		"Thai" -h -H
+_add_lang th		"Thai" -h -H -m
 # _add_lang ti		"Tigrinya/Tigrigna"
+_add_lang tl		"Tagalog"
 _add_lang tn		"Tswana"
 _add_lang tr		"Turkish" -h
 _add_lang ts		"Tsonga"
@@ -348,8 +346,8 @@ _add_lang ve		"Venda"
 _add_lang vec		"Venetian"
 _add_lang vi		"Vietnamese" -h
 _add_lang xh		"Xhosa"
-_add_lang zh-CN		"Simplified Chinese (People's Republic of China)" -lzh_CN
-_add_lang zh-TW		"Traditional Chinese (Taiwan)" -lzh_TW
+_add_lang zh-CN		"Simplified Chinese (People's Republic of China)"
+_add_lang zh-TW		"Traditional Chinese (Taiwan)"
 _add_lang zu		"Zulu" -H
 
 post_extract() {
@@ -357,13 +355,16 @@ post_extract() {
 	local srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} pkg
 	mkdir -p ${wrksrc}/external/tarballs
 	for pkg in ${skip_extraction} libreoffice-{help,translations}-${version}.tar.xz ; do
-		if [ "${pkg%.dll}" != "${pkg}" ]; then
+		case "$pkg" in
+		*.dll)
 			# The dll needs to be copied instead of symlinked
 			cp -v ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
-		else
+			;;
+		*)
 			# ... the other files can be symlinked
 			ln -svf ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
-		fi
+			;;
+		esac
 	done
 	for f in ${FILESDIR}/*.patch; do
 		fname=${f##*/}
@@ -434,7 +435,6 @@ do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 	x86_64)	# opts+=" --enable-ext-mariadb-connector"
 		# opts+=" --enable-ext-ct2n"
-		opts+=" --enable-ext-numbertext"
 		opts+=" --enable-ext-nlpsolver"
 		# opts+=" --enable-ext-languagetool"
 		;;