diff options
| author | Mike Crowe <mac@mcrowe.com> | 2021-05-14 11:38:00 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-16 08:29:59 +0100 |
| commit | 7fedc98498055225a459cc1e4d87a025f59eb3b8 (patch) | |
| tree | 7f5c3f6c4a3aa0191d07564606832cbd199598c1 | |
| parent | 11222ce6df1186f3b1695a88cbb6ed85b5fb8391 (diff) | |
| download | poky-7fedc98498055225a459cc1e4d87a025f59eb3b8.tar.gz | |
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.
(From OE-Core rev: da15d7cf3e6f31c92232f8dd7272ea9ee41656db)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Cc: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-gnome/libnotify/libnotify_0.7.9.bb | 9 |
1 files 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" | |||
| 9 | LICENSE = "LGPLv2.1" | 9 | LICENSE = "LGPLv2.1" |
| 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" |
| 11 | 11 | ||
| 12 | DEPENDS = "dbus gtk+3 glib-2.0" | 12 | DEPENDS = "dbus glib-2.0 gdk-pixbuf" |
| 13 | |||
| 14 | PACKAGECONFIG ?= "" | ||
| 15 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gtk+3" | ||
| 13 | 16 | ||
| 14 | GNOMEBASEBUILDCLASS = "meson" | 17 | GNOMEBASEBUILDCLASS = "meson" |
| 15 | GTKDOC_MESON_OPTION = "gtk_doc" | 18 | GTKDOC_MESON_OPTION = "gtk_doc" |
| 16 | GIR_MESON_ENABLE_FLAG = "enabled" | 19 | GIR_MESON_ENABLE_FLAG = "enabled" |
| 17 | GIR_MESON_DISABLE_FLAG = "disabled" | 20 | GIR_MESON_DISABLE_FLAG = "disabled" |
| 18 | inherit gnomebase gtk-doc features_check gobject-introspection | 21 | inherit gnomebase gtk-doc features_check gobject-introspection |
| 19 | # depends on gtk+3 | 22 | # depends on gtk+3 if tests are enabled |
| 20 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'tests', '${GTK3DISTROFEATURES}', '', d)}" |
| 21 | 24 | ||
| 22 | SRC_URI[archive.md5sum] = "ccd9c53364174cc8d13e18a1988faa76" | 25 | SRC_URI[archive.md5sum] = "ccd9c53364174cc8d13e18a1988faa76" |
| 23 | SRC_URI[archive.sha256sum] = "66c0517ed16df7af258e83208faaf5069727dfd66995c4bbc51c16954d674761" | 26 | SRC_URI[archive.sha256sum] = "66c0517ed16df7af258e83208faaf5069727dfd66995c4bbc51c16954d674761" |
