diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-24 17:45:20 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-27 17:06:34 +0100 |
commit | 12aa79f5bf16bd6d3fa3ef7a13650289e7f15da4 (patch) | |
tree | eebb23bb7639c80f57e81ffa84260796466c2982 | |
parent | 613224104ae0c8fea8d124dc2a0e47a3f9971a76 (diff) | |
download | poky-12aa79f5bf16bd6d3fa3ef7a13650289e7f15da4.tar.gz |
pinentry: Switch pinentry-qt from Qt4 to Qt5
(From OE-Core rev: d0c252e5847bd5f5806beecd8f351c72454d677a)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/pinentry/pinentry_1.1.0.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-support/pinentry/pinentry_1.1.0.bb b/meta/recipes-support/pinentry/pinentry_1.1.0.bb index 4116efc76f..fb529d25d6 100644 --- a/meta/recipes-support/pinentry/pinentry_1.1.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.1.0.bb | |||
@@ -25,7 +25,7 @@ PACKAGECONFIG ??= "ncurses libcap" | |||
25 | 25 | ||
26 | PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" | 26 | PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" |
27 | PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" | 27 | PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" |
28 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qt4-x11" | 28 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" |
29 | PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" | 29 | PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" |
30 | 30 | ||
31 | #To use libsecret, add meta-gnome | 31 | #To use libsecret, add meta-gnome |
@@ -33,7 +33,6 @@ PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" | |||
33 | 33 | ||
34 | EXTRA_OECONF = " \ | 34 | EXTRA_OECONF = " \ |
35 | --disable-rpath \ | 35 | --disable-rpath \ |
36 | --disable-pinentry-qt5 \ | ||
37 | " | 36 | " |
38 | 37 | ||
39 | BBCLASSEXTEND = "native" | 38 | BBCLASSEXTEND = "native" |