libreoffice: Update to 7.4.0.3

Changelog:
Most Significant New Features

GENERAL
    * Support for WebP images and EMZ/WMZ files
    * Help pages for the ScriptForge scripting library
    * Search field for the Extension Manager
    * Performance and compatibility improvements

WRITER
    * Better change tracking in the footnote area
    * Edited lists show original numbers in change tracking
    * New typographic settings for hyphenation

CALC
    * Support for 16,384 columns in spreadsheets
    * Extra functions in drop-down AutoSum widget
    * New menu item to search for sheet names

IMPRESS
    * New support for document themes

6 files changed, 79 insertions, 79 deletions

diff --git a/misc/libreoffice/patches/patch-configure.ac b/misc/libreoffice/patches/patch-configure.ac
index f013584e01c..0442bde63be 100644
--- a/misc/libreoffice/patches/patch-configure.ac
+++ b/misc/libreoffice/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.21 2022/08/22 13:58:32 ryoon Exp $
 
 * Add NetBSD/aarch64 support.
 * Disable freetype2 and fontconfig from pkgsrc explicitly.
@@ -7,9 +7,9 @@ $NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
 * Include header files from security/gpgme correctly.
 * Find devel/apache-ant.
 
---- configure.ac.orig	2022-01-26 14:35:29.000000000 +0000
+--- configure.ac.orig	2022-08-10 14:14:32.000000000 +0000
 +++ configure.ac
-@@ -5174,6 +5174,11 @@ linux-android*)
+@@ -5305,6 +5305,11 @@ linux-android*)
          RTL_ARCH=X86_64
          PLATFORMID=netbsd_x86_64
          ;;
@@ -21,33 +21,34 @@ $NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
      *)
          AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
          ;;
-@@ -9451,9 +9456,9 @@ elif test "$using_freetype_fontconfig" =
-     AC_MSG_RESULT([internal])
-     FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
-     if test "x$ac_config_site_64bit_host" = xYES; then
--        FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64 -lfreetype"
-+        FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/instdir/lib64/libfreetype.a"
-     else
--        FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype"
-+        FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/instdir/lib/libfreetype.a"
-     fi
-     BUILD_TYPE="$BUILD_TYPE FREETYPE"
+@@ -9663,9 +9668,9 @@ dnl When the minimal version is at least
+ dnl ===================================================================
+ FREETYPE_CFLAGS_internal="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
+ if test "x$ac_config_site_64bit_host" = xYES; then
+-    FREETYPE_LIBS_internal="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64 -lfreetype"
++    FREETYPE_LIBS_internal="${WORKDIR}/UnpackedTarball/freetype/instdir/lib64/libfreetype.a"
+ else
+-    FREETYPE_LIBS_internal="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype"
++    FREETYPE_LIBS_internal="${WORKDIR}/UnpackedTarball/freetype/instdir/lib/libfreetype.a"
  fi
-@@ -10730,11 +10735,11 @@ dnl HarfBuzz
+ libo_CHECK_SYSTEM_MODULE([freetype],[FREETYPE],[freetype2 >= 9.9.3],,system,TRUE)
+ 
+@@ -10890,11 +10895,12 @@ dnl HarfBuzz
  dnl ===================================================================
- libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3],
-                          ["-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"],
--                         ["-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"])
-+                         ["${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"])
  
- libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42],
-                          ["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],
--                         ["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"])
-+                         ["${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"])
+ GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"
+-GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
++GRAPHITE_LIBS_internal="${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"
++
+ libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
+ 
+ HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
+-HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"
++HARFBUZZ_LIBS_internal="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"
+ libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42])
  
  if test "$COM" = "MSC"; then # override the above
-     GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
-@@ -12442,7 +12447,7 @@ elif test "$_os" = "Linux" -o "$_os" = "
+@@ -12559,7 +12565,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
@@ -56,7 +57,7 @@ $NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
              [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
          # progress_callback is the only func with plain C linkage
          # checking for it also filters out older, KDE-dependent libgpgmepp versions
-@@ -13611,8 +13616,8 @@ EOF
+@@ -13764,8 +13770,8 @@ EOF
                      if test -f /usr/share/ant-core/lib/ant.jar; then
                          ANT_LIB=/usr/share/ant-core/lib
                      else
diff --git a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
index ee11391244c..4a337363f93 100644
--- a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
+++ b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
@@ -1,15 +1,14 @@
-$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.8 2022/02/05 04:53:43 ryoon Exp $
+$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.9 2022/08/22 13:58:32 ryoon Exp $
 
 * Support NetBSD
 * Add pkgsrc font path
 
---- external/pdfium/pkgsrc.patch.1.orig	2022-02-03 05:03:32.276772721 +0000
+--- external/pdfium/pkgsrc.patch.1.orig	2022-08-19 00:52:46.342273839 +0000
 +++ external/pdfium/pkgsrc.patch.1
-@@ -0,0 +1,44 @@
-+diff -ur pdfium.orig/core/fpdfapi/page/cpdf_psengine.cpp pdfium/core/fpdfapi/page/cpdf_psengine.cpp
-+--- pdfium.orig/core/fpdfapi/page/cpdf_psengine.cpp	2021-11-10 05:48:16.000000000 +0900
-++++ pdfium/core/fpdfapi/page/cpdf_psengine.cpp	2022-02-03 14:01:56.227611267 +0900
-+@@ -74,7 +74,7 @@
+@@ -0,0 +1,41 @@
++--- pdfium/core/fpdfapi/page/cpdf_psengine.cpp.orig	2022-05-11 00:10:54.000000000 +0000
+++++ pdfium/core/fpdfapi/page/cpdf_psengine.cpp
++@@ -74,7 +74,7 @@ constexpr PDF_PSOpName kPsOpNames[] = {
 + // Round half up is a nearest integer round with half-way numbers always rounded
 + // up. Example: -5.5 rounds to -5.
 + float RoundHalfUp(float f) {
@@ -18,31 +17,29 @@ $NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.8 2022/02/05 04:53:43 ryoon Ex
 +     return 0;
 +   if (f > std::numeric_limits<float>::max() - 0.5f)
 +     return std::numeric_limits<float>::max();
-+diff -ur pdfium.orig/core/fxcrt/cfx_datetime.cpp pdfium/core/fxcrt/cfx_datetime.cpp
-+--- pdfium.orig/core/fxcrt/cfx_datetime.cpp	2021-11-10 05:48:16.000000000 +0900
-++++ pdfium/core/fxcrt/cfx_datetime.cpp	2022-02-03 13:15:19.222355164 +0900
++--- pdfium/core/fxcrt/cfx_datetime.cpp.orig	2022-05-11 00:10:54.000000000 +0000
+++++ pdfium/core/fxcrt/cfx_datetime.cpp
 +@@ -11,7 +11,7 @@
 + #include "third_party/base/check.h"
 + 
-+ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-+-    defined(OS_APPLE) || defined(OS_ASMJS)
-++    defined(OS_APPLE) || defined(OS_ASMJS) || defined(OS_NETBSD)
++ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
++-    BUILDFLAG(IS_APPLE) || defined(OS_ASMJS)
+++    BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) || defined(OS_NETBSD)
 + #include <sys/time.h>
 + #include <time.h>
 + #endif
-+diff -ur pdfium.orig/core/fxge/linux/fx_linux_impl.cpp pdfium/core/fxge/linux/fx_linux_impl.cpp
-+--- pdfium.orig/core/fxge/linux/fx_linux_impl.cpp	2021-11-10 05:48:16.000000000 +0900
-++++ pdfium/core/fxge/linux/fx_linux_impl.cpp	2022-02-03 13:16:30.636408478 +0900
-+@@ -17,7 +17,7 @@
++--- pdfium/core/fxge/linux/fx_linux_impl.cpp.orig	2022-05-11 00:10:54.000000000 +0000
+++++ pdfium/core/fxge/linux/fx_linux_impl.cpp
++@@ -18,7 +18,7 @@
 + #include "third_party/base/check.h"
-+ #include "third_party/base/cxx17_backports.h"
 + 
-+-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS)
-++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) && !defined(OS_NETBSD)
++ #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \
++-    !defined(OS_ASMJS)
+++    !defined(OS_ASMJS) && !defined(OS_NETBSD)
 + #error "Included on the wrong platform"
 + #endif
 + 
-+@@ -169,6 +169,7 @@
++@@ -170,6 +170,7 @@ class CLinuxPlatform : public CFX_GEModu
 +       pInfo->AddPath("/usr/share/X11/fonts/Type1");
 +       pInfo->AddPath("/usr/share/X11/fonts/TTF");
 +       pInfo->AddPath("/usr/local/share/fonts");
diff --git a/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk b/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk
index f04c275efc7..28cf2e4a723 100644
--- a/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk
+++ b/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk
@@ -1,12 +1,12 @@
-$NetBSD: patch-external_skia_UnpackedTarball__skia.mk,v 1.6 2022/02/05 04:53:43 ryoon Exp $
+$NetBSD: patch-external_skia_UnpackedTarball__skia.mk,v 1.7 2022/08/22 13:58:32 ryoon Exp $
 
---- external/skia/UnpackedTarball_skia.mk.orig	2022-01-26 14:35:29.000000000 +0000
+--- external/skia/UnpackedTarball_skia.mk.orig	2022-08-10 14:14:32.000000000 +0000
 +++ external/skia/UnpackedTarball_skia.mk
-@@ -37,6 +37,7 @@ skia_patches := \
-     disable-freetype-colrv1.1 \
-     windows-libraries-system32.patch.1 \
-     fix-graphite-ifdef.patch.1 \
-+    netbsd.patch.0
+@@ -38,6 +38,7 @@ skia_patches := \
+     allow-no-es2restrictions.patch.1 \
+     vk_mem_alloc.patch.1 \
+     tdf148624.patch.1 \
++    netbsd.patch.0 \
  
  $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
  
diff --git a/misc/libreoffice/patches/patch-external_skia_netbsd.patch.0 b/misc/libreoffice/patches/patch-external_skia_netbsd.patch.0
index 2a07ba8564f..76a61e86935 100644
--- a/misc/libreoffice/patches/patch-external_skia_netbsd.patch.0
+++ b/misc/libreoffice/patches/patch-external_skia_netbsd.patch.0
@@ -1,15 +1,18 @@
-$NetBSD: patch-external_skia_netbsd.patch.0,v 1.3 2022/02/05 04:53:43 ryoon Exp $
+$NetBSD: patch-external_skia_netbsd.patch.0,v 1.4 2022/08/22 13:58:32 ryoon Exp $
 
 * Support NetBSD. It has no uselocale(3).
 * Fix build failure (isnan etc. are not defined) under NetBSD/amd64 9.99.88
   (GCC 10.3.0) at least.
 
---- external/skia/netbsd.patch.0.orig	2022-02-03 04:24:23.011640283 +0000
+--- external/skia/netbsd.patch.0.orig	2022-08-19 00:29:47.661827273 +0000
 +++ external/skia/netbsd.patch.0
-@@ -0,0 +1,29 @@
-+diff -ur skia.orig/src/gpu/GrAutoLocaleSetter.h skia/src/gpu/GrAutoLocaleSetter.h
-+--- src/gpu/GrAutoLocaleSetter.h	2019-09-19 18:38:01.127185317 +0900
-++++ src/gpu/GrAutoLocaleSetter.h	2022-02-03 13:25:31.192362952 +0900
+@@ -0,0 +1,31 @@
++* Support NetBSD. It has no uselocale(3).
++* Fix build failure (isnan etc. are not defined) under NetBSD/amd64 9.99.88
++  (GCC 10.3.0) at least.
++
++--- src/gpu/ganesh/GrAutoLocaleSetter.h.orig	2022-08-19 00:39:34.308186035 +0000
+++++ src/gpu/ganesh/GrAutoLocaleSetter.h
 +@@ -27,7 +27,7 @@
 + #define HAVE_XLOCALE 0
 + #endif
@@ -19,12 +22,11 @@ $NetBSD: patch-external_skia_netbsd.patch.0,v 1.3 2022/02/05 04:53:43 ryoon Exp
 + #define HAVE_LOCALE_T 0
 + #else
 + #define HAVE_LOCALE_T 1
-+diff -ur skia.orig/src/sksl/dsl/DSLExpression.cpp skia/src/sksl/dsl/DSLExpression.cpp
-+--- src/sksl/dsl/DSLExpression.cpp	2021-11-26 00:00:28.260475275 +0900
-++++ src/sksl/dsl/DSLExpression.cpp	2022-02-03 13:26:31.790025246 +0900
-+@@ -45,10 +45,10 @@
++--- src/sksl/dsl/DSLExpression.cpp.orig	2022-08-19 00:40:37.794860287 +0000
+++++ src/sksl/dsl/DSLExpression.cpp
++@@ -63,10 +63,10 @@ DSLExpression::DSLExpression(float value
 +     : fExpression(SkSL::Literal::MakeFloat(ThreadContext::Context(),
-+                                            pos.line(),
++                                            pos,
 +                                            value)) {
 +-    if (!isfinite(value)) {
 +-        if (isinf(value)) {
diff --git a/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx b/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
index 59f8430c9e7..c2d73fd1264 100644
--- a/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
+++ b/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
@@ -1,12 +1,12 @@
-$NetBSD: patch-i18nutil_source_utility_unicode.cxx,v 1.5 2020/02/05 14:10:35 ryoon Exp $
+$NetBSD: patch-i18nutil_source_utility_unicode.cxx,v 1.6 2022/08/22 13:58:32 ryoon Exp $
 
---- i18nutil/source/utility/unicode.cxx.orig	2019-01-23 19:35:25.000000000 +0000
+--- i18nutil/source/utility/unicode.cxx.orig	2022-08-10 14:14:32.000000000 +0000
 +++ i18nutil/source/utility/unicode.cxx
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
  #include <i18nutil/unicode.hxx>
  #include <sal/log.hxx>
  #include <unicode/numfmt.h>
 +#include <unicode/regex.h>
  #include "unicode_data.h"
  #include <rtl/character.hxx>
- #include <memory>
+ #include <o3tl/string_view.hxx>
diff --git a/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx b/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx
index 0595bb27406..c6bddb3f977 100644
--- a/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx
+++ b/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-vcl_unx_generic_app_geninst.cxx,v 1.2 2021/07/26 12:42:24 ryoon Exp $
+$NetBSD: patch-vcl_unx_generic_app_geninst.cxx,v 1.3 2022/08/22 13:58:32 ryoon Exp $
 
 Set "OS Environment" on NetBSD,same as FreeBSD.
 
@@ -8,7 +8,7 @@ Help -> About LibreOffice
 
 Tweaked by Yasushi Oshima, PR pkg/56048.
 
---- vcl/unx/generic/app/geninst.cxx.orig	2021-07-16 21:17:42.000000000 +0000
+--- vcl/unx/generic/app/geninst.cxx.orig	2022-08-10 14:14:32.000000000 +0000
 +++ vcl/unx/generic/app/geninst.cxx
 @@ -22,7 +22,7 @@
  #if defined(LINUX)
@@ -19,10 +19,10 @@ Tweaked by Yasushi Oshima, PR pkg/56048.
  #  include <sys/utsname.h>
  #endif
  
-@@ -73,14 +73,18 @@ OUString SalGenericInstance::getOSVersio
+@@ -72,14 +72,18 @@ OUString SalGenericInstance::getOSVersio
+         }
          fclose( pVersion );
      }
-     return aKernelVer;
 -#elif defined(__FreeBSD__)
 +#elif defined(__FreeBSD__) || defined(__NetBSD__)
      struct utsname stName;
@@ -40,11 +40,11 @@ Tweaked by Yasushi Oshima, PR pkg/56048.
      while ( nIndex++ < aKernelVer.getLength() )
      {
          const char c = stName.release[ nIndex ];
-@@ -89,6 +93,7 @@ OUString SalGenericInstance::getOSVersio
+@@ -87,6 +91,7 @@ OUString SalGenericInstance::getOSVersio
+             break;
      }
-     return OUString::createFromAscii( stName.sysname ) + " " +
-         aKernelVer.copy( 0, nIndex );
+     aKernelVer = OUString::createFromAscii(stName.sysname) + " " + aKernelVer.copy(0, nIndex);
 +#endif
- #else
-     return aKernelVer;
- #endif
+ #elif defined(EMSCRIPTEN)
+ #define str(s) #s
+ #define xstr(s) str(s)