diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-27 22:15:59 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-10-29 16:23:26 +0100 |
| commit | 6196af94fef1e25bf68f6888706eed7693cc24a8 (patch) | |
| tree | de2df90e852cd3828e23544337abdced2d698052 /meta/recipes-support/pinentry | |
| parent | 0006e2752f5c738e46d3268e4d0a0ae923b1378d (diff) | |
| download | openembedded-core-6196af94fef1e25bf68f6888706eed7693cc24a8.tar.gz | |
pinentry: update 1.2.0 -> 1.2.1
libcap support dropped upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-support/pinentry')
| -rw-r--r-- | meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch (renamed from meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch) | 13 | ||||
| -rw-r--r-- | meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch (renamed from meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-support/pinentry/pinentry_1.2.1.bb (renamed from meta/recipes-support/pinentry/pinentry_1.2.0.bb) | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch index 507c0c3917..bb7e43b1e7 100644 --- a/meta/recipes-support/pinentry/pinentry-1.2.0/gpg-error_pkconf.patch +++ b/meta/recipes-support/pinentry/pinentry-1.2.1/gpg-error_pkconf.patch @@ -1,4 +1,4 @@ -From 54a4c9d3e5f1897ed4b978d5cdee646ca7a4f637 Mon Sep 17 00:00:00 2001 +From 785777dc0bc6b69ff68c91547ec6b6634049662f 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 | 159 ++---------------------------------------------- - 1 file changed, 4 insertions(+), 155 deletions(-) + m4/gpg-error.m4 | 160 ++---------------------------------------------- + 1 file changed, 4 insertions(+), 156 deletions(-) diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 -index 56a5d07..c0bec1f 100644 +index 4b5cd40..7dfbb83 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 -@@ -26,159 +26,12 @@ dnl config script does not match the host specification the script +@@ -26,160 +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], @@ -135,6 +135,7 @@ index 56a5d07..c0bec1f 100644 - fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` +- unset GPGRT_CONFIG - fi - if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \ @@ -182,7 +183,7 @@ index 56a5d07..c0bec1f 100644 if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -193,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], fi fi else diff --git a/meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch index f4aec2d1c3..f4aec2d1c3 100644 --- a/meta/recipes-support/pinentry/pinentry-1.2.0/libassuan_pkgconf.patch +++ b/meta/recipes-support/pinentry/pinentry-1.2.1/libassuan_pkgconf.patch diff --git a/meta/recipes-support/pinentry/pinentry_1.2.0.bb b/meta/recipes-support/pinentry/pinentry_1.2.1.bb index e6cc71a547..7daf80f36e 100644 --- a/meta/recipes-support/pinentry/pinentry_1.2.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.2.1.bb @@ -16,14 +16,13 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://gpg-error_pkconf.patch \ " -SRC_URI[sha256sum] = "10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470" +SRC_URI[sha256sum] = "457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067" inherit autotools pkgconfig -PACKAGECONFIG ??= "ncurses libcap" +PACKAGECONFIG ??= "ncurses" PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" -PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" |