diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2020-05-16 02:45:45 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-18 06:31:53 +0100 |
| commit | cab86a3196ef4fcd2714591597f2503aa8138df0 (patch) | |
| tree | 67f775b2d72b29260c1eddb54721413ca10892dd /meta/recipes-sato | |
| parent | 08c86406186828dce19e101adfd118ed5d9e947e (diff) | |
| download | openembedded-core-cab86a3196ef4fcd2714591597f2503aa8138df0.tar.gz | |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.28.2.bb | 10 |
1 files changed, 6 insertions, 4 deletions
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" |