diff options
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.28.2.bb | 6 | ||||
-rw-r--r-- | meta/recipes-support/pinentry/pinentry_1.1.0.bb | 5 |
2 files changed, 4 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 51596077b4..e9941c7a2c 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb | |||
@@ -26,9 +26,7 @@ SRC_URI[sha256sum] = "b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc6 | |||
26 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc | 26 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc |
27 | 27 | ||
28 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 28 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
29 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)} \ | 29 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" |
30 | ${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)} \ | ||
31 | " | ||
32 | 30 | ||
33 | CVE_PRODUCT = "webkitgtk webkitgtk\+" | 31 | CVE_PRODUCT = "webkitgtk webkitgtk\+" |
34 | 32 | ||
@@ -44,7 +42,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ | |||
44 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ |
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ | 43 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ |
46 | enchant \ | 44 | enchant \ |
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'libsecret', '', d)} \ | 45 | libsecret \ |
48 | " | 46 | " |
49 | 47 | ||
50 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" | 48 | 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 dc9069b9d5..d9ca0732f7 100644 --- a/meta/recipes-support/pinentry/pinentry_1.1.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.1.0.bb | |||
@@ -19,9 +19,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | |||
19 | SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" | 19 | SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" |
20 | SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" | 20 | SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" |
21 | 21 | ||
22 | inherit autotools pkgconfig features_check | 22 | inherit autotools pkgconfig |
23 | |||
24 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)}" | ||
25 | 23 | ||
26 | PACKAGECONFIG ??= "ncurses libcap" | 24 | PACKAGECONFIG ??= "ncurses libcap" |
27 | 25 | ||
@@ -29,6 +27,7 @@ PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING | |||
29 | PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" | 27 | PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" |
30 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" | 28 | PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" |
31 | 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 | |||
32 | PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" | 31 | PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" |
33 | 32 | ||
34 | EXTRA_OECONF = " \ | 33 | EXTRA_OECONF = " \ |