dconf: make gtk+3 dependency optional

dconf requires gtk+3 only for dconf-editor and is useful
  even on systems without gui.

  add PACKAGECONFIG for editor, enable it by default if x11
  is present in DISTRO_FEATURES

  add x11 to REQUIRED_DISTRO_FEATURES only if editor is enabled

  Note: editor will be dropped from dconf in version 0.23.1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andy Kling
2017-02-10 10:07:22 +01:00
committed by Martin Jansa
parent f2b6681cb6
commit f93ea40311

View File

@@ -9,15 +9,20 @@ SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515"
SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955"
GNOME_COMPRESS_TYPE = "xz"
DEPENDS = "dbus glib-2.0 gtk+3 libxml2 intltool-native"
DEPENDS = "dbus glib-2.0 libxml2 intltool-native"
inherit vala gtk-doc distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "editor", "", d)}"
#note: editor will be removed in version 0.23.1
PACKAGECONFIG[editor] = "--enable-editor,--disable-editor,gtk+3"
REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains("PACKAGECONFIG", "editor", "x11", "", d)}"
EXTRA_OECONF += "--disable-man"
PACKAGES =+ "dconf-editor"
PACKAGES =+ "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dconf-editor", "", d)}"
FILES_${PN} += " \
${datadir}/dbus-1 \