From 91264e5e0ab40b796e214edd84c72bc88b363778 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 May 2020 02:45:45 +0200 Subject: webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled * gobject-introspection is mandatory since libsecret upgrade to 0.20.3 * enable libsecret in webkitgtk only when gobject-introspection-data is in DISTRO_FEATURES * drop comment about libsecret being in meta-gnome from pinentry (From OE-Core rev: cab86a3196ef4fcd2714591597f2503aa8138df0) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.28.2.bb | 10 ++++++---- meta/recipes-support/pinentry/pinentry_1.1.0.bb | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'meta') diff --git a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb index 288c715cc3..51596077b4 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb @@ -26,7 +26,9 @@ SRC_URI[sha256sum] = "b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc6 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)} \ +" CVE_PRODUCT = "webkitgtk webkitgtk\+" @@ -39,10 +41,10 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ enchant \ - libsecret \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'libsecret', '', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" diff --git a/meta/recipes-support/pinentry/pinentry_1.1.0.bb b/meta/recipes-support/pinentry/pinentry_1.1.0.bb index 8c500dcadc..dc9069b9d5 100644 --- a/meta/recipes-support/pinentry/pinentry_1.1.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.1.0.bb @@ -19,7 +19,9 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" -inherit autotools pkgconfig +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)}" PACKAGECONFIG ??= "ncurses libcap" @@ -27,8 +29,6 @@ PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING 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" - -#To use libsecret, add meta-gnome PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" EXTRA_OECONF = " \ -- cgit v1.2.3-54-g00ecf