From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Wed, 25 Nov 2015 13:05:40 +0000 (+0200)
Subject: gcr: Require x11 DISTRO_FEATURE
X-Git-Tag: 2016-4~2072
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=dbdcd87144cc1cd6c5d50c800c7f266aaf25ca17;p=openembedded-core.git

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 <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.16.0.bb
index 057c815654..e50b3a8155 100644
--- a/meta/recipes-gnome/gcr/gcr_3.16.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.16.0.bb
@@ -8,8 +8,8 @@ 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 distro_features_check
-# depends on gtk+3
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+# depends on gtk+3, but also x11 through gtk+-x11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI[archive.md5sum] = "d5835680be0b6a838e02a528d5378d9c"
 SRC_URI[archive.sha256sum] = "ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075"