From b1175339287395a7ad4fe4639a73f3a1dda74358 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 25 Nov 2015 15:05:40 +0200 Subject: [PATCH] gcr: Require x11 DISTRO_FEATURE This enables a world build without x11. GTK3DISTROFEATURES is not enough because gtk+-x11.pc is still required. Fixes [YOCTO #8611]. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton (cherry picked from commit dbdcd87144cc1cd6c5d50c800c7f266aaf25ca17) Signed-off-by: Saul Wold --- meta/recipes-gnome/gcr/gcr_3.16.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.16.0.bb index 4c9fe2ec89..e50b3a8155 100644 --- a/meta/recipes-gnome/gcr/gcr_3.16.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.16.0.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt vala" -inherit autotools gnomebase gtk-icon-cache gtk-doc +inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check +# depends on gtk+3, but also x11 through gtk+-x11 +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "d5835680be0b6a838e02a528d5378d9c" SRC_URI[archive.sha256sum] = "ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075" -- 2.40.1