CVS commit: pkgsrc/misc/libreoffice

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar  5 18:22:42 UTC 2023

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

Log Message:
libreoffice: fix gpgme++ detection

Don't pass unsubstituted @PREFIX@ to GCC.
Fix gpgme++ include dir similar to dragonbox headers.


To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.137 -r1.138 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.23 -r1.24 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.299 pkgsrc/misc/libreoffice/Makefile:1.300
--- pkgsrc/misc/libreoffice/Makefile:1.299      Mon Feb 13 14:59:36 2023
+++ pkgsrc/misc/libreoffice/Makefile    Sun Mar  5 18:22:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.299 2023/02/13 14:59:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.300 2023/03/05 18:22:41 tnn Exp $
 
 VERREL=                7.5.0
 VERRC=         3
@@ -29,18 +29,14 @@ SUBST_MESSAGE.use-bash=             Using bash for 
 SUBST_FILES.use-bash+=         autogen.sh
 SUBST_VARS.use-bash+=          BASH
 
-#SUBST_CLASSES+=                       zxing
-#SUBST_STAGE.zxing=            pre-configure
-#SUBST_MESSAGE.zxing=          Include zxing header files
-#SUBST_FILES.zxing+=           configure.ac
+SUBST_CLASSES+=                        configure-paths
+SUBST_STAGE.configure-paths=   pre-configure
+SUBST_MESSAGE.configure-paths= Fixing paths in configure.ac
+SUBST_FILES.configure-paths+=  configure.ac
+SUBST_SED.configure-paths+=    -e 's,-I/usr/include/dragonbox-1.0.0,-I${BUILDLINK_PREFIX.dragonbox}/include/dragonbox-1.1.3,'
+SUBST_SED.configure-paths+=    -e 's,-I/usr/include/gpgme++,-I${BUILDLINK_PREFIX.gpgme}/include/gpgme++,'
 #SUBST_SED.zxing+=             -e 's,ZXING_CFLAGS=-I/usr/include/ZXing,ZXING_CFLAGS=-I${BUILDLINK_PREFIX.zxing-cpp}/include/ZXing,'
 
-SUBST_CLASSES+=                        dragonbox
-SUBST_STAGE.dragonbox=         pre-configure
-SUBST_MESSAGE.dragonbox=       Include dragonbox header files
-SUBST_FILES.dragonbox+=                configure.ac
-SUBST_SED.dragonbox+=          -e 's,/usr/include/dragonbox-1.0.0,${BUILDLINK_PREFIX.dragonbox}/include/dragonbox-1.1.3,'
-
 SUBST_CLASSES+=                        font-path
 SUBST_STAGE.font-path=         pre-configure
 SUBST_MESSAGE.font-path=       Use pkgsrc fonts for PDF import

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.137 pkgsrc/misc/libreoffice/distinfo:1.138
--- pkgsrc/misc/libreoffice/distinfo:1.137      Mon Feb 13 14:59:36 2023
+++ pkgsrc/misc/libreoffice/distinfo    Sun Mar  5 18:22:41 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.137 2023/02/13 14:59:36 ryoon Exp $
+$NetBSD: distinfo,v 1.138 2023/03/05 18:22:41 tnn Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -172,7 +172,7 @@ SHA1 (patch-Makefile.in) = c16214631f0e4
 SHA1 (patch-autogen.sh) = 0fed5f88342112bed0f573d426cc2c3d05ed45c7
 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) = ded88546cb06f30af57add9e714965b38a1d2148
+SHA1 (patch-configure.ac) = af6b9a07b3bc309e4e8d7ce7da13614bc59ee833
 SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82

Index: pkgsrc/misc/libreoffice/patches/patch-configure.ac
diff -u pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.23 pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.24
--- pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.23     Mon Feb 13 14:59:36 2023
+++ pkgsrc/misc/libreoffice/patches/patch-configure.ac  Sun Mar  5 18:22:41 2023
@@ -1,10 +1,9 @@
-$NetBSD: patch-configure.ac,v 1.23 2023/02/13 14:59:36 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.24 2023/03/05 18:22:41 tnn Exp $
 
 * Add NetBSD/aarch64 support.
 * Disable freetype2 and fontconfig from pkgsrc explicitly.
   to fix X11_TYPE=native build and internal pdfium's internal freetype build.
 * Fix some static links.
-* Include header files from security/gpgme correctly.
 * Find devel/apache-ant.
 
 --- configure.ac.orig  2023-01-25 14:26:33.000000000 +0000
@@ -47,15 +46,6 @@ $NetBSD: patch-configure.ac,v 1.23 2023/
  libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
  
  if test "$COM" = "MSC"; then # override the above
-@@ -12530,7 +12535,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
--        AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
-+        AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I@PREFIX@/include/gpgme++ ],
-             [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
-         AC_CHECK_HEADER(gpgme.h, [],
-             [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
 @@ -13734,8 +13739,8 @@ EOF
                      if test -f /usr/share/ant-core/lib/ant.jar; then
                          ANT_LIB=/usr/share/ant-core/lib