diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2015-07-18 07:29:19 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2015-07-18 07:29:19 +0000 |
| commit | 8d6dda84241f85b993b85e49681f421375bb91d8 (patch) | |
| tree | 2591ca904d23da2b804b78e338ea9e53cf4fc4be /app-crypt | |
| parent | Cleanup. (diff) | |
| download | gentoo-2-8d6dda84241f85b993b85e49681f421375bb91d8.tar.gz gentoo-2-8d6dda84241f85b993b85e49681f421375bb91d8.tar.bz2 gentoo-2-8d6dda84241f85b993b85e49681f421375bb91d8.zip | |
Add pkg-config detection instead of initialization as pinentry does not use it correctly, bug#554686
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/pinentry/ChangeLog | 7 | ||||
| -rw-r--r-- | app-crypt/pinentry/files/pinentry-0.9.5-build.patch | 31 |
2 files changed, 25 insertions, 13 deletions
diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog index 3f19b5865140..754c47113455 100644 --- a/app-crypt/pinentry/ChangeLog +++ b/app-crypt/pinentry/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/pinentry # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.179 2015/07/18 07:21:06 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.180 2015/07/18 07:29:19 alonbl Exp $ + + 18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org> + files/pinentry-0.9.5-build.patch: + Add pkg-config detection instead of initialization as pinentry does not use it + correctly, bug#554686 18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org> +files/pinentry-0.9.5-build.patch, pinentry-0.9.5.ebuild: diff --git a/app-crypt/pinentry/files/pinentry-0.9.5-build.patch b/app-crypt/pinentry/files/pinentry-0.9.5-build.patch index 871cf15c0ed9..ca8fd56fe41e 100644 --- a/app-crypt/pinentry/files/pinentry-0.9.5-build.patch +++ b/app-crypt/pinentry/files/pinentry-0.9.5-build.patch @@ -1,25 +1,32 @@ -From f1818d9fe0984d81e6e74abc4f0539296d1efc4c Mon Sep 17 00:00:00 2001 +From 4d60122ebe50182976088086844e11e8119ea906 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev <alon.barlev@gmail.com> Date: Sat, 18 Jul 2015 10:14:49 +0300 Subject: [PATCH] build: add pkg-config detection Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> --- - configure.ac | 1 + - 1 file changed, 1 insertion(+) + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/configure.ac b/configure.ac -index b71cb17..44ff395 100644 +index b71cb17..7b9243a 100644 --- a/configure.ac +++ b/configure.ac -@@ -85,6 +85,7 @@ AC_PROG_RANLIB - # for Qt and autoconf does does not allow that. - AC_PROG_CXX - AC_PROG_LN_S -+PKG_PROG_PKG_CONFIG - AC_CHECK_TOOL(WINDRES, windres, :) - AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog, - [build-aux/gitlog-to-changelog]) +@@ -542,6 +542,14 @@ AC_ARG_ENABLE(pinentry-qt4, + pinentry_qt4=$enableval, pinentry_qt4=maybe) + + ++dnl check for pkg-config ++if test "$pinentry_qt4" != "no"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ if test x"${PKG_CONFIG}" = xno ; then ++ pinentry_qt4=no ++ fi ++fi ++ + dnl + dnl Checks for Qt4 libraries. Deal correctly with $pinentry_qt4 = maybe. + dnl -- 2.3.6 |