CVS commit: pkgsrc/misc/libreoffice

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Nov 24 14:33:22 UTC 2020

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
        pkgsrc/misc/libreoffice/patches: patch-configure.ac
            patch-xmlsecurity_source_gpg_CertificateImpl.hxx
            patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx

Log Message:
libreoffice: Fix comments about security/gpgme


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/misc/libreoffice/patches/patch-configure.ac
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx \
    pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx

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/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.106 pkgsrc/misc/libreoffice/distinfo:1.107
--- pkgsrc/misc/libreoffice/distinfo:1.106      Thu Nov  5 09:23:43 2020
+++ pkgsrc/misc/libreoffice/distinfo    Tue Nov 24 14:33:22 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.106 2020/11/05 09:23:43 ryoon Exp $
+$NetBSD: distinfo,v 1.107 2020/11/24 14:33:22 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -228,7 +228,7 @@ SHA1 (patch-Makefile.in) = c16214631f0e4
 SHA1 (patch-autogen.sh) = 3466af4282a674872d0c5d885b5c70aa9afec1f5
 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) = d5368440d1119654b503884816f653149f1d1b10
+SHA1 (patch-configure.ac) = 5ca29369545d6a793ea9a7f2da134488790dd2a1
 SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
 SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5
 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 1c6e8355c473ddb16d25cb4b0ccd367326b1e9eb
@@ -252,5 +252,5 @@ SHA1 (patch-solenv_gbuild_platform_NETBS
 SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
 SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 6ccabb5db4ba01d6d95355a034a912fe29595dbc
 SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
-SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = a4220a027da6b56692862c9c9cc51e12d68e4a41
-SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 18101906d7de1d4d7cc2e8cef5d3bc0a3af6edf0
+SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86
+SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 151ccef192a8491bca5d39f2a02d938b3e4fad67

Index: pkgsrc/misc/libreoffice/patches/patch-configure.ac
diff -u pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.17 pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.18
--- pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.17     Tue Aug 11 16:07:39 2020
+++ pkgsrc/misc/libreoffice/patches/patch-configure.ac  Tue Nov 24 14:33:22 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure.ac,v 1.17 2020/08/11 16:07:39 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.18 2020/11/24 14:33:22 ryoon 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 gpgme correctly.
-* Find pkgsrc/devel/apache-ant.
+* Include header files from security/gpgme correctly.
+* Find devel/apache-ant.
 
 --- configure.ac.orig  2020-07-29 19:29:17.000000000 +0000
 +++ configure.ac

Index: pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx
diff -u pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx:1.3 pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx:1.4
--- pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx:1.3        Sat Aug 18 00:11:32 2018
+++ pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_CertificateImpl.hxx    Tue Nov 24 14:33:22 2020
@@ -1,6 +1,6 @@
-$NetBSD: patch-xmlsecurity_source_gpg_CertificateImpl.hxx,v 1.3 2018/08/18 00:11:32 ryoon Exp $
+$NetBSD: patch-xmlsecurity_source_gpg_CertificateImpl.hxx,v 1.4 2020/11/24 14:33:22 ryoon Exp $
 
-* Do not confuse with key.h from gpgmepp and nss
+* Do not confuse with key.h from security/gpgme and devel/nss
 
 --- xmlsecurity/source/gpg/CertificateImpl.hxx.orig    2018-08-02 19:54:54.000000000 +0000
 +++ xmlsecurity/source/gpg/CertificateImpl.hxx
Index: pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx
diff -u pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx:1.3 pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx:1.4
--- pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx:1.3  Sat Aug 18 00:11:32 2018
+++ pkgsrc/misc/libreoffice/patches/patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx      Tue Nov 24 14:33:22 2020
@@ -1,6 +1,6 @@
-$NetBSD: patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx,v 1.3 2018/08/18 00:11:32 ryoon Exp $
+$NetBSD: patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx,v 1.4 2020/11/24 14:33:22 ryoon Exp $
 
-* Do not confuse with key.h from gpgmepp and nss
+* Do not confuse with key.h from security/gpgme and devel/nss
 
 --- xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx.orig       2018-08-02 19:54:54.000000000 +0000
 +++ xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx