[Libreoffice-commits] core.git: xmlsecurity/CppunitTest_xmlsecurity_signing.mk

[Mike Kaganski (via logerrit)]

 xmlsecurity/CppunitTest_xmlsecurity_signing.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 5b66a038701241e0b9fa3a339acbd74f9ca4cf92
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Apr 1 15:42:18 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Apr 1 15:26:04 2020 +0200

    Add missing dependency
    
    Without this, running `make CppunitTest_xmlsecurity_signing` after
    `make clean` will stop at "GpgME not installed correctly" dialogs,
    because DocumentSignatureManager::init will try to initialize GPG
    security context, which requires gpgme-w32spawn.exe to be present
    in workdir/LinkTarget/Executable.
    
    See also commit 0de0b8c9d80d68619b6f3c0e8d9429d8b08553fb.
    
    Change-Id: I5d98e2e92a091e108f23d31fe0c8c8cf03faadcc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91488
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index 84e7a76c043b..c748c644aecb 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -64,4 +64,11 @@ $(eval $(call gb_CppunitTest_use_custom_headers,xmlsecurity_signing,\
     officecfg/registry \
 ))
 
+ifeq ($(OS),WNT)
+# Initializing DocumentSignatureManager will require gpgme-w32spawn.exe in workdir/LinkTarget/Executable
+$(eval $(call gb_CppunitTest_use_packages,xmlsecurity_signing,\
+    $(call gb_Helper_optional,GPGMEPP,gpgmepp)\
+))
+endif
+
 # vim: set noet sw=4 ts=4: