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:28:35 +0100 |
commit | 2730a120bd5c77c8d744b0b4678b77bb8245a379 (patch) | |
tree | e039c03a024f6d3564eb1e0a7f4423de5d66f28b /meta/recipes-support | |
parent | 17e5b9c79b740ce8bf79707884bbc3edd5521b85 (diff) | |
download | poky-2730a120bd5c77c8d744b0b4678b77bb8245a379.tar.gz |
pinentry: update 1.2.0 -> 1.2.1
libcap support dropped upstream.
(From OE-Core rev: 6196af94fef1e25bf68f6888706eed7693cc24a8)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-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 @@ | |||
1 | From 54a4c9d3e5f1897ed4b978d5cdee646ca7a4f637 Mon Sep 17 00:00:00 2001 | 1 | From 785777dc0bc6b69ff68c91547ec6b6634049662f Mon Sep 17 00:00:00 2001 |
2 | From: Armin Kuster <akuster@mvista.com> | 2 | From: Armin Kuster <akuster@mvista.com> |
3 | Date: Fri, 2 Sep 2005 11:50:01 +0000 | 3 | Date: Fri, 2 Sep 2005 11:50:01 +0000 |
4 | Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and | 4 | Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and |
@@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific] | |||
11 | Signed-off-by: Armin Kuster <akuster@mvista.com> | 11 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
12 | 12 | ||
13 | --- | 13 | --- |
14 | m4/gpg-error.m4 | 159 ++---------------------------------------------- | 14 | m4/gpg-error.m4 | 160 ++---------------------------------------------- |
15 | 1 file changed, 4 insertions(+), 155 deletions(-) | 15 | 1 file changed, 4 insertions(+), 156 deletions(-) |
16 | 16 | ||
17 | diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 | 17 | diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 |
18 | index 56a5d07..c0bec1f 100644 | 18 | index 4b5cd40..7dfbb83 100644 |
19 | --- a/m4/gpg-error.m4 | 19 | --- a/m4/gpg-error.m4 |
20 | +++ b/m4/gpg-error.m4 | 20 | +++ b/m4/gpg-error.m4 |
21 | @@ -26,159 +26,12 @@ dnl config script does not match the host specification the script | 21 | @@ -26,160 +26,12 @@ dnl config script does not match the host specification the script |
22 | dnl is added to the gpg_config_script_warn variable. | 22 | dnl is added to the gpg_config_script_warn variable. |
23 | dnl | 23 | dnl |
24 | AC_DEFUN([AM_PATH_GPG_ERROR], | 24 | AC_DEFUN([AM_PATH_GPG_ERROR], |
@@ -135,6 +135,7 @@ index 56a5d07..c0bec1f 100644 | |||
135 | - fi | 135 | - fi |
136 | - elif test "$GPG_ERROR_CONFIG" != "no"; then | 136 | - elif test "$GPG_ERROR_CONFIG" != "no"; then |
137 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` | 137 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` |
138 | - unset GPGRT_CONFIG | ||
138 | - fi | 139 | - fi |
139 | - if test "$GPG_ERROR_CONFIG" != "no"; then | 140 | - if test "$GPG_ERROR_CONFIG" != "no"; then |
140 | - req_major=`echo $min_gpg_error_version | \ | 141 | - req_major=`echo $min_gpg_error_version | \ |
@@ -182,7 +183,7 @@ index 56a5d07..c0bec1f 100644 | |||
182 | if test x"$gpg_error_config_host" != xnone ; then | 183 | if test x"$gpg_error_config_host" != xnone ; then |
183 | if test x"$gpg_error_config_host" != x"$host" ; then | 184 | if test x"$gpg_error_config_host" != x"$host" ; then |
184 | AC_MSG_WARN([[ | 185 | AC_MSG_WARN([[ |
185 | @@ -193,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], | 186 | @@ -194,10 +46,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], |
186 | fi | 187 | fi |
187 | fi | 188 | fi |
188 | else | 189 | 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 \ | |||
16 | file://gpg-error_pkconf.patch \ | 16 | file://gpg-error_pkconf.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470" | 19 | SRC_URI[sha256sum] = "457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067" |
20 | 20 | ||
21 | inherit autotools pkgconfig | 21 | inherit autotools pkgconfig |
22 | 22 | ||
23 | PACKAGECONFIG ??= "ncurses libcap" | 23 | PACKAGECONFIG ??= "ncurses" |
24 | 24 | ||
25 | PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" | 25 | PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" |
26 | PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" | ||
27 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" | 26 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" |
28 | PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" | 27 | PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" |
29 | 28 | ||