From: andreas.kling@gmail.com
To: openembedded-devel@lists.openembedded.org
Cc: Andy Kling <andreas.kling@peiker-cee.de>
Subject: [meta-gnome][PATCH 3/3] dconf: make gtk+3 dependency optional
Date: Wed, 8 Feb 2017 15:07:55 +0100 [thread overview]
Message-ID: <20170208140755.12812-4-andreas.kling@gmail.com> (raw)
In-Reply-To: <20170208140755.12812-1-andreas.kling@gmail.com>
From: Andy Kling <andreas.kling@peiker-cee.de>
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 gtk+3 to DEPENDS only if editor is present in PACKAGECONFIG
add x11 to REQUIRED_DISTRO_FEATURES only if editor is enabled
Note: editor will be dropped from dconf in version 0.23.1
---
meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
index f7666cc0f..0b5970ec1 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -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 gtk+3 libxml2 intltool-native ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk+3", "", d)}"
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 \
--
2.11.0
next prev parent reply other threads:[~2017-02-08 14:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 14:07 dconf: conditionally depend on gtk+3 andreas.kling
2017-02-08 14:07 ` [meta-gnome][PATCH 1/3] dconf: depends on dbus andreas.kling
2017-02-08 14:07 ` [meta-gnome][PATCH 2/3] dconf: fix bash completion in wrong package andreas.kling
2017-02-08 14:07 ` andreas.kling [this message]
2017-02-08 14:31 ` dconf: conditionally depend on gtk+3 andreas.kling
2017-02-08 14:31 ` [meta-gnome][PATCH v02 1/3] dconf: depends on dbus andreas.kling
2017-02-08 14:31 ` [meta-gnome][PATCH v02 2/3] dconf: fix bash completion in wrong package andreas.kling
2017-02-08 14:31 ` [meta-gnome][PATCH v02 3/3] dconf: make gtk+3 dependency optional andreas.kling
2017-02-08 15:08 ` Andreas Müller
2017-02-10 9:07 ` andreas.kling
2017-02-10 9:07 ` [meta-gnome][PATCH v03 1/3] dconf: depends on dbus andreas.kling
2017-02-10 9:07 ` [meta-gnome][PATCH v03 2/3] dconf: fix bash completion in wrong package andreas.kling
2017-02-10 9:07 ` [meta-gnome][PATCH v03 3/3] dconf: make gtk+3 dependency optional andreas.kling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170208140755.12812-4-andreas.kling@gmail.com \
--to=andreas.kling@gmail.com \
--cc=andreas.kling@peiker-cee.de \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.