From da15d7cf3e6f31c92232f8dd7272ea9ee41656db Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Fri, 14 May 2021 11:38:00 +0100 Subject: [PATCH] libnotify: Make gtk+3 dependency optional libnotify only requires gtk+3 for its tests. Let's disable them by default and only enable them if "tests" is in PACKAGECONFIG. If gtk+3 is not available then we need to declare the dependency on gdk-pixbuf explicitly. It looks like the tests genuinely do need some sort of desktop environment to run, so let's maintain the ANY_OF_DISTRO_FEATURES check added back in 3edf08b38b0af93cef0933b061349264dc86d54c. Signed-off-by: Mike Crowe Cc: Khem Raj Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-gnome/libnotify/libnotify_0.7.9.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb index bbbd72193e..d2be715ce5 100644 --- a/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb +++ b/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb @@ -9,15 +9,18 @@ SECTION = "libs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" -DEPENDS = "dbus gtk+3 glib-2.0" +DEPENDS = "dbus glib-2.0 gdk-pixbuf" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gtk+3" GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" inherit gnomebase gtk-doc features_check gobject-introspection -# depends on gtk+3 -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +# depends on gtk+3 if tests are enabled +ANY_OF_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'tests', '${GTK3DISTROFEATURES}', '', d)}" SRC_URI[archive.md5sum] = "ccd9c53364174cc8d13e18a1988faa76" SRC_URI[archive.sha256sum] = "66c0517ed16df7af258e83208faaf5069727dfd66995c4bbc51c16954d674761" -- 2.40.1