[PATCH] libdazzle: add check for GTK3DISTROFEATURES

[PATCH] libdazzle: add check for GTK3DISTROFEATURES

[mingli.yu]

From: Mingli Yu <Mingli.Yu@windriver.com>

When do world buid, there comes below error:
| ERROR: Nothing PROVIDES 'gtk+3' (but /build/layers/oe-core/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb DEPENDS on or otherwise requires it)
| gtk+3 was skipped: one of 'x11 wayland' needs to be in DISTRO_FEATURES

Add the check for GTK3DISTROFEATURES to make
the world build work even without GTK3DISTROFEATURES.

Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
---
 meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
index 5441c10..3779b15 100644
--- a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
+++ b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
 
 GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase upstream-version-is-even vala gobject-introspection
+inherit gnomebase upstream-version-is-even vala distro_features_check gobject-introspection
 
 DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
 
@@ -14,5 +14,7 @@ SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf7293311
 GI_ENABLE_FLAG = "-Dwith_introspection=true"
 GI_DISABLE_FLAG = "-Dwith_introspection=false"
 
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
 EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
                                                                                        '${GI_DISABLE_FLAG}', d)} "
-- 
2.7.4

Re: [PATCH] libdazzle: add check for GTK3DISTROFEATURES

[Yu, Mingli]

Ping.

Thanks,

On 2019年02月26日 10:50, mingli.yu@windriver.com wrote:
> From: Mingli Yu <Mingli.Yu@windriver.com>
>
> When do world buid, there comes below error:
> | ERROR: Nothing PROVIDES 'gtk+3' (but /build/layers/oe-core/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb DEPENDS on or otherwise requires it)
> | gtk+3 was skipped: one of 'x11 wayland' needs to be in DISTRO_FEATURES
>
> Add the check for GTK3DISTROFEATURES to make
> the world build work even without GTK3DISTROFEATURES.
>
> Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
> ---
>   meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
> index 5441c10..3779b15 100644
> --- a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
> +++ b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
> @@ -3,7 +3,7 @@ LICENSE = "GPLv3+"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
>
>   GNOMEBASEBUILDCLASS = "meson"
> -inherit gnomebase upstream-version-is-even vala gobject-introspection
> +inherit gnomebase upstream-version-is-even vala distro_features_check gobject-introspection
>
>   DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
>
> @@ -14,5 +14,7 @@ SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf7293311
>   GI_ENABLE_FLAG = "-Dwith_introspection=true"
>   GI_DISABLE_FLAG = "-Dwith_introspection=false"
>
> +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> +
>   EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
>                                                                                          '${GI_DISABLE_FLAG}', d)} "
>

Re: [PATCH] libdazzle: add check for GTK3DISTROFEATURES

[Richard Purdie]

On Thu, 2019-02-28 at 09:59 +0800, Yu, Mingli wrote:
> Ping.

You sent this less than 48 hours after sending the original patch.
Please have a little more patience!

Cheers,

Richard