summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-05-16 02:45:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-18 06:33:36 +0100
commit91264e5e0ab40b796e214edd84c72bc88b363778 (patch)
treebef7eef8a8c93e84d204d6e33dcfc0ea7b320419
parente8ac4332b8d8f5660c80e6832aed62afefbecab4 (diff)
downloadpoky-91264e5e0ab40b796e214edd84c72bc88b363778.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 (From OE-Core rev: cab86a3196ef4fcd2714591597f2503aa8138df0) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.28.2.bb10
-rw-r--r--meta/recipes-support/pinentry/pinentry_1.1.0.bb6
2 files changed, 9 insertions, 7 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
26inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc 26inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
27 27
28ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 28ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
29REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" 29REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)} \
30 ${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)} \
31"
30 32
31CVE_PRODUCT = "webkitgtk webkitgtk\+" 33CVE_PRODUCT = "webkitgtk webkitgtk\+"
32 34
@@ -39,10 +41,10 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \
39 " 41 "
40 42
41PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ 43PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
42 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ 44 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \
43 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ 45 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \
44 enchant \ 46 enchant \
45 libsecret \ 47 ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'libsecret', '', d)} \
46 " 48 "
47 49
48PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" 50PACKAGECONFIG[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 \
19SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" 19SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6"
20SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" 20SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570"
21 21
22inherit autotools pkgconfig 22inherit autotools pkgconfig features_check
23
24REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)}"
23 25
24PACKAGECONFIG ??= "ncurses libcap" 26PACKAGECONFIG ??= "ncurses libcap"
25 27
@@ -27,8 +29,6 @@ PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING
27PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" 29PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap"
28PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" 30PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase"
29PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" 31PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0"
30
31#To use libsecret, add meta-gnome
32PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" 32PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret"
33 33
34EXTRA_OECONF = " \ 34EXTRA_OECONF = " \