mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 03:32:12 +02:00
pinentry: update 1.1.1 -> 1.2.0
Rebase patches. (From OE-Core rev: dbb0e50375a5720d38c966fc4c5810eea1ec0203) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
623a73cefd
commit
c9690cc3c4
@@ -167,7 +167,7 @@ class OEListPackageconfigTests(OEScriptTests):
|
||||
def test_packageconfig_flags_option_all(self):
|
||||
results = runCmd('%s/contrib/list-packageconfig-flags.py -a' % self.scripts_dir)
|
||||
expected_endlines = []
|
||||
expected_endlines.append("pinentry-1.1.1")
|
||||
expected_endlines.append("pinentry-1.2.0")
|
||||
expected_endlines.append("PACKAGECONFIG ncurses libcap")
|
||||
expected_endlines.append("PACKAGECONFIG[qt] --enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase")
|
||||
expected_endlines.append("PACKAGECONFIG[gtk2] --enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0")
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7b60f1563ecdb7020c145de8a96cae1c0a66c595 Mon Sep 17 00:00:00 2001
|
||||
From 54a4c9d3e5f1897ed4b978d5cdee646ca7a4f637 Mon Sep 17 00:00:00 2001
|
||||
From: Armin Kuster <akuster@mvista.com>
|
||||
Date: Fri, 2 Sep 2005 11:50:01 +0000
|
||||
Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and
|
||||
@@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific]
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
|
||||
---
|
||||
m4/gpg-error.m4 | 141 ++----------------------------------------------
|
||||
1 file changed, 4 insertions(+), 137 deletions(-)
|
||||
m4/gpg-error.m4 | 159 ++----------------------------------------------
|
||||
1 file changed, 4 insertions(+), 155 deletions(-)
|
||||
|
||||
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
|
||||
index c9b235f..a4fd41c 100644
|
||||
index 56a5d07..c0bec1f 100644
|
||||
--- a/m4/gpg-error.m4
|
||||
+++ b/m4/gpg-error.m4
|
||||
@@ -25,141 +25,12 @@ dnl config script does not match the host specification the script
|
||||
@@ -26,159 +26,12 @@ dnl config script does not match the host specification the script
|
||||
dnl is added to the gpg_config_script_warn variable.
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||
@@ -61,45 +61,79 @@ index c9b235f..a4fd41c 100644
|
||||
- min_gpg_error_version=ifelse([$1], ,1.33,$1)
|
||||
- ok=no
|
||||
-
|
||||
- if test "$prefix" = NONE ; then
|
||||
- prefix_option_expanded=/usr/local
|
||||
- else
|
||||
- prefix_option_expanded="$prefix"
|
||||
- fi
|
||||
- if test "$exec_prefix" = NONE ; then
|
||||
- exec_prefix_option_expanded=$prefix_option_expanded
|
||||
- else
|
||||
- exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix)
|
||||
- fi
|
||||
- libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir)
|
||||
-
|
||||
- if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=$libdir_option_expanded
|
||||
- else
|
||||
- if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then
|
||||
- if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then
|
||||
- if test -f $possible_libdir/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=$possible_libdir
|
||||
- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
|
||||
- if test "$GPGRT_CONFIG" != "no"; then
|
||||
- # Determine gpgrt_libdir
|
||||
- #
|
||||
- # Get the prefix of gpgrt-config assuming it's something like:
|
||||
- # <PREFIX>/bin/gpgrt-config
|
||||
- gpgrt_prefix=${GPGRT_CONFIG%/*/*}
|
||||
- possible_libdir1=${gpgrt_prefix}/lib
|
||||
- # Determine by using system libdir-format with CC, it's like:
|
||||
- # Normal style: /usr/lib
|
||||
- # GNU cross style: /usr/<triplet>/lib
|
||||
- # Debian style: /usr/lib/<multiarch-name>
|
||||
- # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
|
||||
- # It is assumed that CC is specified to the one of host on cross build.
|
||||
- if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
|
||||
- sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
|
||||
-/g;p;}"); then
|
||||
- # From the output of -print-search-dirs, select valid pkgconfig dirs.
|
||||
- libdir_candidates=$(for dir in $libdir_candidates; do
|
||||
- if p=$(cd $dir 2>/dev/null && pwd); then
|
||||
- test -d "$p/pkgconfig" && echo $p;
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- done)
|
||||
-
|
||||
- if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then
|
||||
- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
||||
- if test "$GPGRT_CONFIG" = "no"; then
|
||||
- unset GPGRT_CONFIG
|
||||
- for possible_libdir0 in $libdir_candidates; do
|
||||
- # possible_libdir0:
|
||||
- # Fallback candidate, the one of system-installed (by $CC)
|
||||
- # (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
|
||||
- # possible_libdir1:
|
||||
- # Another candidate, user-locally-installed
|
||||
- # (<gpgrt_prefix>/lib)
|
||||
- # possible_libdir2
|
||||
- # Most preferred
|
||||
- # (<gpgrt_prefix>/<triplet>/lib,
|
||||
- # <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32)
|
||||
- if test "${possible_libdir0##*/}" = "lib"; then
|
||||
- possible_prefix0=${possible_libdir0%/lib}
|
||||
- possible_prefix0_triplet=${possible_prefix0##*/}
|
||||
- if test -z "$possible_prefix0_triplet"; then
|
||||
- continue
|
||||
- fi
|
||||
- possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib
|
||||
- else
|
||||
- possible_prefix0=${possible_libdir0%%/lib*}
|
||||
- possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0}
|
||||
- fi
|
||||
- if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=${possible_libdir2}
|
||||
- elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=${possible_libdir1}
|
||||
- elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=${possible_libdir0}
|
||||
- fi
|
||||
- if test -n "$gpgrt_libdir"; then break; fi
|
||||
- done
|
||||
- else
|
||||
- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||
- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||
- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||
- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
|
||||
- else
|
||||
- unset GPGRT_CONFIG
|
||||
- fi
|
||||
- # When we cannot determine system libdir-format, use this:
|
||||
- gpgrt_libdir=${possible_libdir1}
|
||||
- fi
|
||||
- else
|
||||
- unset GPGRT_CONFIG
|
||||
- fi
|
||||
-
|
||||
- if test -n "$gpgrt_libdir"; then
|
||||
- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||
- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||
- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||
- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
|
||||
- else
|
||||
- unset GPGRT_CONFIG
|
||||
- fi
|
||||
- elif test "$GPG_ERROR_CONFIG" != "no"; then
|
||||
- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
|
||||
- fi
|
||||
- if test "$GPG_ERROR_CONFIG" != "no"; then
|
||||
@@ -120,22 +154,6 @@ index c9b235f..a4fd41c 100644
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then
|
||||
- if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
|
||||
- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
||||
- if test "$GPGRT_CONFIG" = "no"; then
|
||||
- unset GPGRT_CONFIG
|
||||
- else
|
||||
- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||
- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||
- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||
- else
|
||||
- unset GPGRT_CONFIG
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
|
||||
+[
|
||||
@@ -164,7 +182,7 @@ index c9b235f..a4fd41c 100644
|
||||
if test x"$gpg_error_config_host" != xnone ; then
|
||||
if test x"$gpg_error_config_host" != x"$host" ; then
|
||||
AC_MSG_WARN([[
|
||||
@@ -174,10 +45,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||
@@ -193,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||
fi
|
||||
fi
|
||||
else
|
||||
@@ -16,7 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
||||
file://gpg-error_pkconf.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f"
|
||||
SRC_URI[sha256sum] = "10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
Reference in New Issue
Block a user