CVS commit: pkgsrc/misc/libreoffice

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Jan 31 11:05:49 UTC 2026

Modified Files:
        pkgsrc/misc/libreoffice: Makefile distinfo
        pkgsrc/misc/libreoffice/patches: patch-configure.ac

Log Message:
misc/libreoffice: Fix build with converters/orcus-0.21.0

* And use security/gpgmepp for gpgme c++ support.
* Bump PKGREVISION because of new filename of orcus and dependency change.


To generate a diff of this commit:
cvs rdiff -u -r1.378 -r1.379 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.171 -r1.172 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.28 -r1.29 pkgsrc/misc/libreoffice/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.378 pkgsrc/misc/libreoffice/Makefile:1.379
--- pkgsrc/misc/libreoffice/Makefile:1.378      Thu Jan 29 10:03:11 2026
+++ pkgsrc/misc/libreoffice/Makefile    Sat Jan 31 11:05:48 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.378 2026/01/29 10:03:11 wiz Exp $
+# $NetBSD: Makefile,v 1.379 2026/01/31 11:05:48 ryoon Exp $
 
 VERREL=                25.8.4
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -410,7 +410,7 @@ BUILDLINK_API_DEPENDS.libcmis+=       li
 #.include "../../print/poppler-cpp/buildlink3.mk"
 #.include "../../print/poppler-includes/buildlink3.mk"
 .include "../../security/argon2/buildlink3.mk"
-.include "../../security/gpgme/buildlink3.mk"
+.include "../../security/gpgmepp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/zxcvbn-c/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.171 pkgsrc/misc/libreoffice/distinfo:1.172
--- pkgsrc/misc/libreoffice/distinfo:1.171      Wed Dec 24 15:29:50 2025
+++ pkgsrc/misc/libreoffice/distinfo    Sat Jan 31 11:05:48 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.171 2025/12/24 15:29:50 ryoon Exp $
+$NetBSD: distinfo,v 1.172 2026/01/31 11:05:48 ryoon Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -208,7 +208,7 @@ SHA1 (patch-Makefile.in) = c16214631f0e4
 SHA1 (patch-autogen.sh) = d12528926425d0bce95fc5c1370f054a74385d60
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc
-SHA1 (patch-configure.ac) = c19a8201ddc9a3297ee8ca5a23ac0ba0145686fe
+SHA1 (patch-configure.ac) = 40a61d5955eda744431a5805aa71671ccc723332
 SHA1 (patch-desktop_scripts_soffice.sh) = c0e69ec1c7cdb6697cf5898950a89c5450c57b25
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0947735a0dc09fd534f0399ddef2e3ce1bf859fd
 SHA1 (patch-external_mariadb-connector-c_fix-debug-i386.patch.0) = db3481a64b434371abc472776bd34daa9b30d695

Index: pkgsrc/misc/libreoffice/patches/patch-configure.ac
diff -u pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.28 pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.29
--- pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.28     Sat Aug 24 02:57:35 2024
+++ pkgsrc/misc/libreoffice/patches/patch-configure.ac  Sat Jan 31 11:05:49 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.28 2024/08/24 02:57:35 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.29 2026/01/31 11:05:49 ryoon Exp $
 
 * Add NetBSD/aarch64 support.
 * Disable freetype2 and fontconfig from pkgsrc explicitly.
@@ -7,9 +7,9 @@ $NetBSD: patch-configure.ac,v 1.28 2024/
 * Find devel/apache-ant.
 * Fix broken xinerama detection.
 
---- configure.ac.orig  2024-08-08 20:59:54.000000000 +0000
+--- configure.ac.orig  2025-12-10 20:59:43.000000000 +0000
 +++ configure.ac
-@@ -5503,6 +5503,11 @@ linux-android*)
+@@ -5676,6 +5676,11 @@ linux-android*)
          RTL_ARCH=X86_64
          PLATFORMID=netbsd_x86_64
          ;;
@@ -21,7 +21,7 @@ $NetBSD: patch-configure.ac,v 1.28 2024/
      *)
          AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
          ;;
-@@ -9883,9 +9888,9 @@ dnl When the minimal version is at least
+@@ -10198,9 +10203,9 @@ if test "x$ac_config_site_64bit_host" = xYES; then
  dnl ===================================================================
  FREETYPE_CFLAGS_internal="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
  if test "x$ac_config_site_64bit_host" = xYES; then
@@ -33,7 +33,16 @@ $NetBSD: patch-configure.ac,v 1.28 2024/
  fi
  libo_CHECK_SYSTEM_MODULE([freetype],[FREETYPE],[freetype2 >= 9.9.3],,system,TRUE)
  
-@@ -12893,7 +12898,7 @@ elif test "$enable_mpl_subset" = "yes"; 
+@@ -11456,7 +11461,7 @@ dnl ==================================================
+ dnl ===================================================================
+ dnl Orcus
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.20 >= 0.20.0])
++libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.21 >= 0.21.0])
+ if test "$with_system_orcus" != "yes"; then
+     if test "$SYSTEM_BOOST" = "TRUE"; then
+         dnl Link with Boost.System
+@@ -13323,7 +13328,7 @@ elif test "$enable_fuzzers" = "yes"; then
      AC_MSG_RESULT([no (MPL only)])
  elif test "$enable_fuzzers" = "yes"; then
      AC_MSG_RESULT([no (oss-fuzz)])
@@ -42,7 +51,7 @@ $NetBSD: patch-configure.ac,v 1.28 2024/
      AC_MSG_RESULT([yes])
      dnl ===================================================================
      dnl Check for system gpgme
-@@ -13991,8 +13996,8 @@ if test "$USING_X11" = TRUE; then
+@@ -14462,8 +14467,8 @@ if test "$USING_X11" = TRUE; then
          AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
              [AC_MSG_ERROR(Xinerama header not found.)], [])
          XEXTLIBS=`$PKG_CONFIG --variable=libs xext`
@@ -53,7 +62,7 @@ $NetBSD: patch-configure.ac,v 1.28 2024/
          fi
          XINERAMA_EXTRA_LIBS="$XEXTLIBS"
          if test "$_os" = "FreeBSD"; then
-@@ -14283,8 +14288,8 @@ EOF
+@@ -14772,8 +14777,8 @@ EOF
                      if test -f /usr/share/ant-core/lib/ant.jar; then
                          ANT_LIB=/usr/share/ant-core/lib
                      else