gnupg2: Depend on pinentry and configure patch

diff --git a/packages/gnupg2/build.sh b/packages/gnupg2/build.sh
index 1b6120e39413bf960559c1be4c97bae4fc029a19..62a879534e84b82f354154fb4a0241451889c3d7 100755 (executable)
--- a/packages/gnupg2/build.sh
+++ b/packages/gnupg2/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=2.1.10
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=2.1.10

-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2

 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2

-TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline"
+TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry"

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"
 # Remove non-english help files and man pages shipped with the gnupg (1) package:
 TERMUX_PKG_RM_AFTER_INSTALL="share/gnupg/help.*.txt share/man/man1/gpg-zip.1 share/man/man7/gnupg.7"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"
 # Remove non-english help files and man pages shipped with the gnupg (1) package:
 TERMUX_PKG_RM_AFTER_INSTALL="share/gnupg/help.*.txt share/man/man1/gpg-zip.1 share/man/man7/gnupg.7"

diff --git a/packages/gnupg2/configure.patch b/packages/gnupg2/configure.patch
new file mode 100644 (file)
index 0000000..900eda8
--- /dev/null
+++ b/packages/gnupg2/configure.patch
@@ -0,0 +1,17 @@
+diff -u -r ../gnupg-2.1.10/configure ./configure
+--- ../gnupg-2.1.10/configure  2015-12-04 04:57:06.000000000 -0500
++++ ./configure        2016-01-20 16:52:13.149463376 -0500
+@@ -14612,13 +14612,6 @@
+ done
+ 
+ 
+-if test "$have_android_system" = yes; then
+-   # On Android ttyname is a stub but prints an error message.
+-
+-$as_echo "#define HAVE_BROKEN_TTYNAME 1" >>confdefs.h
+-
+-fi
+-
+ ac_fn_c_check_type "$LINENO" "struct sigaction" "ac_cv_type_struct_sigaction" "#include <signal.h>
+ "
+ if test "x$ac_cv_type_struct_sigaction" = xyes; then :