[meta-oe][PATCH 01/10] dbus-broker: include only if systemd is DISTO_FEATURE

[meta-oe][PATCH 01/10] dbus-broker: include only if systemd is DISTO_FEATURE

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-core/dbus/dbus-broker_git.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-core/dbus/dbus-broker_git.bb b/meta-oe/recipes-core/dbus/dbus-broker_git.bb
index 51dfe8c..b62bccf 100644
--- a/meta-oe/recipes-core/dbus/dbus-broker_git.bb
+++ b/meta-oe/recipes-core/dbus/dbus-broker_git.bb
@@ -6,7 +6,7 @@ SECTION = "base"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8"
 
-DEPENDS = "dbus glib-2.0 expat systemd"
+DEPENDS = "dbus glib-2.0 expat"
 
 PV = "9+git${SRCPV}"
 SRCREV = "ccd06b284892182af569e69046262331150e3536"
@@ -17,13 +17,16 @@ SRC_URI += "file://0002-Correct-including-directory-for-conf.patch"
 
 S = "${WORKDIR}/git"
 
-inherit meson pkgconfig systemd
+inherit meson pkgconfig systemd distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "systemd"
 
 SYSTEMD_SERVICE_${PN} = "${BPN}.service"
 
 FILES_${PN} += "${systemd_system_unitdir}"
 FILES_${PN} += "${systemd_user_unitdir}"
 
-RDEPENDS_${PN} = "dbus systemd"
+RDEPENDS_${PN} = "dbus"
 
 BBCLASSEXTEND = "native"
+
-- 
2.7.4

[meta-oe][PATCH 02/10] imsettings: only include when x11 in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb
index c00b193..8f622bf 100644
--- a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb
+++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb
@@ -7,7 +7,9 @@ This package contains the core DBus services and some utilities."
 HOMEPAGE = "http://code.google.com/p/imsettings/"
 SECTION = "Applications/System"
 
-inherit autotools gtk-doc gobject-introspection
+inherit autotools gtk-doc gobject-introspection distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \
            "
-- 
2.7.4

[meta-oe][PATCH 03/10] xfce4-vala: only include when x11 in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
index a25e2e6..28f9cde 100644
--- a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
+++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
@@ -3,7 +3,9 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
 DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-tools-native"
 
-inherit xfce pkgconfig
+inherit xfce pkgconfig distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71"
-- 
2.7.4

[meta-oe][PATCH 04/10] libreport: add PACKCONFIG for gtk

[Armin Kuster]

needed when no X11 in DISTRO_FEATURES

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/libreport/libreport_2.9.2.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb b/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
index 525437b..e963014 100644
--- a/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
+++ b/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://abrt.readthedocs.org/"
 LICENSE = "GPLv2+"
 DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \
         json-c libtar libnewt libproxy rpm \
-        augeas satyr systemd gtk+3 \
+        augeas satyr systemd \
 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
@@ -26,6 +26,9 @@ REQUIRED_DISTRO_FEATURES = "systemd"
 
 inherit gettext autotools python3native pkgconfig
 
+PACKAGECONFIGS ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}"
+PACKAGECONFIG[gtk] = "--with-gtk, --without-gtk, gtk+3,"
+
 RDEPENDS_python3-libreport += "${PN}"
 
 do_patch[prefuncs] += "do_gen_version"
-- 
2.7.4

[meta-oe][PATCH 05/10] xarchiver: only include when x11 in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
index e275af0..a27c8f5 100644
--- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
+++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
@@ -12,7 +12,9 @@ SRCREV = "5a26dd8ceab0af71b30c83286d7c7398a858c814"
 PV = "0.5.3"
 S = "${WORKDIR}/git"
 
-inherit xfce-git gettext pkgconfig autotools gtk-icon-cache
+inherit xfce-git gettext pkgconfig autotools gtk-icon-cache distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
 
 # install tap files for thunar-archive-plugin in ${libdir}/thunar-archive-plugin
 EXTRA_OECONF += "--libexecdir=${libdir}"
-- 
2.7.4

[meta-oe][PATCH 06/10] gnome-system-monitor: only include when x11 in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb
index 61af92b..9b6ce17 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb
@@ -12,7 +12,9 @@ DEPENDS = " \
     libwnck3 \
 "
 
-inherit gnomebase
+inherit gnomebase distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI[archive.md5sum] = "fcd59867c07f8c4853b1e28d60cbc037"
 SRC_URI[archive.sha256sum] = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"
-- 
2.7.4

[meta-oe][PATCH 07/10] packagegroup-xfce-extended: only include when x11 in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index cc231b4..b73c9ee 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 PR = "r10"
 
-inherit packagegroup
+inherit packagegroup distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
 
 # mandatory
 RDEPENDS_${PN} = " \
-- 
2.7.4

[meta-oe][PATCH 08/10] menulibre: only include when x11 in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb
index cc7b291..d1f3471 100644
--- a/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb
+++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb
@@ -9,7 +9,9 @@ DEPENDS = " \
     intltool-native \
 "
 
-inherit distutils3 gtk-icon-cache
+inherit distutils3 gtk-icon-cache distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "https://launchpad.net/menulibre/2.1/${PV}/+download/${PN}-${PV}.tar.gz"
 SRC_URI[md5sum] = "efc7edb49bb0e5fea49e158b40573334"
-- 
2.7.4

[meta-oe][PATCH 09/10] python-blivet: only include when x11 in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb
index ac507ca..28c2565 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \
 "
 
 inherit distro_features_check
-REQUIRED_DISTRO_FEATURES = "systemd"
+REQUIRED_DISTRO_FEATURES = "x11 systemd"
 
 inherit setuptools3 python3native
 
-- 
2.7.4

[meta-oe][PATCH 10/10] usermode: also only include when x11 in DISTRO_FEATURES

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-gnome/recipes-support/usermode/usermode_1.111.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-support/usermode/usermode_1.111.bb b/meta-gnome/recipes-support/usermode/usermode_1.111.bb
index 0f88040..3aea2e6 100644
--- a/meta-gnome/recipes-support/usermode/usermode_1.111.bb
+++ b/meta-gnome/recipes-support/usermode/usermode_1.111.bb
@@ -27,4 +27,4 @@ inherit distro_features_check autotools gettext pkgconfig
 
 EXTRA_OEMAKE += "INSTALL='install -p'"
 
-REQUIRED_DISTRO_FEATURES = "pam"
+REQUIRED_DISTRO_FEATURES = "x11 pam"
-- 
2.7.4

Re: [meta-oe][PATCH 04/10] libreport: add PACKCONFIG for gtk

[Anuj Mittal]

On 04/10/2018 08:22 AM, Armin Kuster wrote:
> needed when no X11 in DISTRO_FEATURES
> 
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
>  meta-oe/recipes-extended/libreport/libreport_2.9.2.bb | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb b/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
> index 525437b..e963014 100644
> --- a/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
> +++ b/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
> @@ -5,7 +5,7 @@ HOMEPAGE = "https://abrt.readthedocs.org/"
>  LICENSE = "GPLv2+"
>  DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \
>          json-c libtar libnewt libproxy rpm \
> -        augeas satyr systemd gtk+3 \
> +        augeas satyr systemd \
>  "
>  
>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> @@ -26,6 +26,9 @@ REQUIRED_DISTRO_FEATURES = "systemd"
>  
>  inherit gettext autotools python3native pkgconfig
>  
> +PACKAGECONFIGS ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}"

Typo? Should be PACKAGECONFIG.

Re: [meta-oe][PATCH 04/10] libreport: add PACKCONFIG for gtk

[akuster808]

On 04/09/2018 05:29 PM, Anuj Mittal wrote:
> On 04/10/2018 08:22 AM, Armin Kuster wrote:
>> needed when no X11 in DISTRO_FEATURES
>>
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>>  meta-oe/recipes-extended/libreport/libreport_2.9.2.bb | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb b/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
>> index 525437b..e963014 100644
>> --- a/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
>> +++ b/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
>> @@ -5,7 +5,7 @@ HOMEPAGE = "https://abrt.readthedocs.org/"
>>  LICENSE = "GPLv2+"
>>  DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \
>>          json-c libtar libnewt libproxy rpm \
>> -        augeas satyr systemd gtk+3 \
>> +        augeas satyr systemd \
>>  "
>>  
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>> @@ -26,6 +26,9 @@ REQUIRED_DISTRO_FEATURES = "systemd"
>>  
>>  inherit gettext autotools python3native pkgconfig
>>  
>> +PACKAGECONFIGS ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}"
> Typo? Should be PACKAGECONFIG.
I would not be surprised. V2 shortly.

thanks for the feedback and review.
Armin