Fix pinentry dependency
authorAndre Heinecke <aheinecke@gnupg.org>
Mon, 4 Mar 2019 09:12:57 +0000 (10:12 +0100)
committerAndre Heinecke <aheinecke@gnupg.org>
Mon, 4 Mar 2019 09:12:57 +0000 (10:12 +0100)
* src/inst-sections.nsi (sec_pinentry): Explicitly select
libgpg-error and libassuan for pinentry.

--
Pinentry needs both but in a minimal install they were
not installed because they were pulled in by GPGME.

It mostly worked because GnuPG itself places them in the
PATH.

GnuPG-Bug-Id: T4347

src/inst-sections.nsi

index 46cb5c7..cfe8726 100644 (file)
@@ -863,6 +863,8 @@ skip_gpgme_browser:
                ${SF_SELECTED} have_pinentry skip_pinentry
   have_pinentry:
   !insertmacro SelectSection ${SEC_libiconv}
+  !insertmacro SelectSection ${SEC_libgpg_error}
+  !insertmacro SelectSection ${SEC_libassuan}
 !ifdef HAVE_PKG_QTBASE
   !insertmacro SelectSection ${SEC_qtbase}
 !endif