* dconf: conditionally depend on gtk+3
@ 2017-02-08 14:07 andreas.kling
2017-02-08 14:07 ` [meta-gnome][PATCH 1/3] dconf: depends on dbus andreas.kling
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-08 14:07 UTC (permalink / raw)
To: openembedded-devel
dconf only uses gtk for dconf-editor. compiling editor conditionally allows to remove the hard dependency. so dconf can be used on systems without GUI.
while writing this patch I came across some minor bugs that are also fixed with this series.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH 1/3] dconf: depends on dbus
2017-02-08 14:07 dconf: conditionally depend on gtk+3 andreas.kling
@ 2017-02-08 14:07 ` andreas.kling
2017-02-08 14:07 ` [meta-gnome][PATCH 2/3] dconf: fix bash completion in wrong package andreas.kling
` (2 subsequent siblings)
3 siblings, 0 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-08 14:07 UTC (permalink / raw)
To: openembedded-devel; +Cc: Andy Kling
From: Andy Kling <andreas.kling@peiker-cee.de>
configure of dconf requires dbus
| checking for dbus... no
| configure: error: Package requirements (dbus-1) were not met:
|
| No package 'dbus-1' found
---
meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 f38be880f..2830e717b 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -9,7 +9,7 @@ SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515"
SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955"
GNOME_COMPRESS_TYPE = "xz"
-DEPENDS = "glib-2.0 gtk+3 libxml2 intltool-native"
+DEPENDS = "dbus glib-2.0 gtk+3 libxml2 intltool-native"
inherit vala gtk-doc distro_features_check
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH 2/3] dconf: fix bash completion in wrong package
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 ` andreas.kling
2017-02-08 14:07 ` [meta-gnome][PATCH 3/3] dconf: make gtk+3 dependency optional andreas.kling
2017-02-08 14:31 ` dconf: conditionally depend on gtk+3 andreas.kling
3 siblings, 0 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-08 14:07 UTC (permalink / raw)
To: openembedded-devel; +Cc: Andy Kling
From: Andy Kling <andreas.kling@peiker-cee.de>
bash completion is used by dconf itself not by editor.
move file to main package.
---
meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 2830e717b..f7666cc0f 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -22,10 +22,10 @@ PACKAGES =+ "dconf-editor"
FILES_${PN} += " \
${datadir}/dbus-1 \
${libdir}/gio/modules/*.so \
+ ${datadir}/bash-completion \
"
FILES_dconf-editor = " \
${bindir}/dconf-editor \
${datadir}/icons \
- ${datadir}/bash-completion \
"
FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH 3/3] dconf: make gtk+3 dependency optional
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
2017-02-08 14:31 ` dconf: conditionally depend on gtk+3 andreas.kling
3 siblings, 0 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-08 14:07 UTC (permalink / raw)
To: openembedded-devel; +Cc: Andy Kling
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
^ permalink raw reply related [flat|nested] 13+ messages in thread
* dconf: conditionally depend on gtk+3
2017-02-08 14:07 dconf: conditionally depend on gtk+3 andreas.kling
` (2 preceding siblings ...)
2017-02-08 14:07 ` [meta-gnome][PATCH 3/3] dconf: make gtk+3 dependency optional andreas.kling
@ 2017-02-08 14:31 ` andreas.kling
2017-02-08 14:31 ` [meta-gnome][PATCH v02 1/3] dconf: depends on dbus andreas.kling
` (2 more replies)
3 siblings, 3 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-08 14:31 UTC (permalink / raw)
To: openembedded-devel
v02 fix typo introduced during rebase
sorry for the noise :/
^ permalink raw reply [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH v02 1/3] dconf: depends on dbus
2017-02-08 14:31 ` dconf: conditionally depend on gtk+3 andreas.kling
@ 2017-02-08 14:31 ` 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
2 siblings, 0 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-08 14:31 UTC (permalink / raw)
To: openembedded-devel; +Cc: Andy Kling
From: Andy Kling <andreas.kling@peiker-cee.de>
configure of dconf requires dbus
| checking for dbus... no
| configure: error: Package requirements (dbus-1) were not met:
|
| No package 'dbus-1' found
---
meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 f38be880f..2830e717b 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -9,7 +9,7 @@ SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515"
SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955"
GNOME_COMPRESS_TYPE = "xz"
-DEPENDS = "glib-2.0 gtk+3 libxml2 intltool-native"
+DEPENDS = "dbus glib-2.0 gtk+3 libxml2 intltool-native"
inherit vala gtk-doc distro_features_check
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH v02 2/3] dconf: fix bash completion in wrong package
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 ` andreas.kling
2017-02-08 14:31 ` [meta-gnome][PATCH v02 3/3] dconf: make gtk+3 dependency optional andreas.kling
2 siblings, 0 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-08 14:31 UTC (permalink / raw)
To: openembedded-devel; +Cc: Andy Kling
From: Andy Kling <andreas.kling@peiker-cee.de>
bash completion is used by dconf itself not by editor.
move file to main package.
---
meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 2830e717b..f7666cc0f 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -22,10 +22,10 @@ PACKAGES =+ "dconf-editor"
FILES_${PN} += " \
${datadir}/dbus-1 \
${libdir}/gio/modules/*.so \
+ ${datadir}/bash-completion \
"
FILES_dconf-editor = " \
${bindir}/dconf-editor \
${datadir}/icons \
- ${datadir}/bash-completion \
"
FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH v02 3/3] dconf: make gtk+3 dependency optional
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 ` andreas.kling
2017-02-08 15:08 ` Andreas Müller
2 siblings, 1 reply; 13+ messages in thread
From: andreas.kling @ 2017-02-08 14:31 UTC (permalink / raw)
To: openembedded-devel; +Cc: Andy Kling
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..8c66958a6 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 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
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [meta-gnome][PATCH v02 3/3] dconf: make gtk+3 dependency optional
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
0 siblings, 1 reply; 13+ messages in thread
From: Andreas Müller @ 2017-02-08 15:08 UTC (permalink / raw)
To: openembedded-devel; +Cc: Andy Kling
On Wed, Feb 8, 2017 at 3:31 PM, <andreas.kling@gmail.com> wrote:
> 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..8c66958a6 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 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"
You add gtk+3 twice: in DEPENDS above and here. Just keep it in PACKAGECONFIG
Andreas
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-gnome][PATCH v02 3/3] dconf: make gtk+3 dependency optional
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
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-10 9:07 UTC (permalink / raw)
To: openembedded-devel
many thanks for your review.
no idea how I only recognized rdepends in base class.
v03
remove duplicated depends to gtk+3
rebase from master to master-next
v02
fix typo
[oe] [meta-gnome][PATCH v03 1/3] dconf: depends on dbus
[oe] [meta-gnome][PATCH v03 2/3] dconf: fix bash completion in wrong
[oe] [meta-gnome][PATCH v03 3/3] dconf: make gtk+3 dependency
^ permalink raw reply [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH v03 1/3] dconf: depends on dbus
2017-02-10 9:07 ` andreas.kling
@ 2017-02-10 9:07 ` 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
2 siblings, 0 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-10 9:07 UTC (permalink / raw)
To: openembedded-devel
From: Andy Kling <andreas.kling@peiker-cee.de>
configure of dconf requires dbus
| checking for dbus... no
| configure: error: Package requirements (dbus-1) were not met:
|
| No package 'dbus-1' found
---
meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 f38be880f..2830e717b 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -9,7 +9,7 @@ SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515"
SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955"
GNOME_COMPRESS_TYPE = "xz"
-DEPENDS = "glib-2.0 gtk+3 libxml2 intltool-native"
+DEPENDS = "dbus glib-2.0 gtk+3 libxml2 intltool-native"
inherit vala gtk-doc distro_features_check
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH v03 2/3] dconf: fix bash completion in wrong package
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 ` andreas.kling
2017-02-10 9:07 ` [meta-gnome][PATCH v03 3/3] dconf: make gtk+3 dependency optional andreas.kling
2 siblings, 0 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-10 9:07 UTC (permalink / raw)
To: openembedded-devel
From: Andy Kling <andreas.kling@peiker-cee.de>
bash completion is used by dconf itself not by editor.
move file to main package.
---
meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 2830e717b..f7666cc0f 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -22,10 +22,10 @@ PACKAGES =+ "dconf-editor"
FILES_${PN} += " \
${datadir}/dbus-1 \
${libdir}/gio/modules/*.so \
+ ${datadir}/bash-completion \
"
FILES_dconf-editor = " \
${bindir}/dconf-editor \
${datadir}/icons \
- ${datadir}/bash-completion \
"
FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-gnome][PATCH v03 3/3] dconf: make gtk+3 dependency optional
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 ` andreas.kling
2 siblings, 0 replies; 13+ messages in thread
From: andreas.kling @ 2017-02-10 9:07 UTC (permalink / raw)
To: openembedded-devel
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 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..e24bde449 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 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 \
--
2.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-02-10 9:07 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [meta-gnome][PATCH 3/3] dconf: make gtk+3 dependency optional andreas.kling
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
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.