external/gpgmepp/ExternalPackage_gpgmepp.mk | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 9f60a160d19521cc0194e5516ef2d23e9d70af33
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Oct 18 10:17:12 2018 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Dec 29 20:15:17 2018 +0100
Copy gpgme-w32spawn.exe to workdir/LinkTarget/Executable
... to avoid "GpgME not installed correctly" message boxes during
unit tests. See the mail list thread started with
https://lists.freedesktop.org/archives/libreoffice/2018-October/081209.html
Change-Id: Ie57e6b5a7281d8f20ba97912f3413eafaac9cfd4
Reviewed-on: https://gerrit.libreoffice.org/61903
Tested-by: Jenkins
Tested-by: Jan-Marek Glogowski <glo...@fbihome.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 0de0b8c9d80d68619b6f3c0e8d9429d8b08553fb)
Reviewed-on: https://gerrit.libreoffice.org/65093
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk
b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index 67c3dc64ffd3..8253f663e50c 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -27,6 +27,9 @@ else ifeq ($(OS),WNT)
$(eval $(call
gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32spawn.exe,src/gpgme-w32spawn.exe))
+$(call gb_Package_get_target_for_build,gpgmepp):
+ cp $(call gb_UnpackedTarball_get_dir,gpgmepp)/src/gpgme-w32spawn.exe
$(call gb_Executable__get_dir_for_exe,cppunittester)/gpgme-w32spawn.exe
+
endif
# If a tool executed during the build (like svidl) requires these gpgmepp
libraries, it will also
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
