On Wed, Mar 27, 2019 at 8:37 AM Andreas Müller <[email protected]> wrote: > > Be aware that it needs 'polkit' in DISTRO_FEATURES >
Fails on systemd-less based distros https://errors.yoctoproject.org/Errors/Details/234765/ > Signed-off-by: Andreas Müller <[email protected]> > --- > ...-build-help-we-do-not-have-yelp-yet.patch} | 32 ++++++++++--------- > ...26.0.bb => gnome-system-monitor_3.32.0.bb} | 24 +++++++------- > 2 files changed, 28 insertions(+), 28 deletions(-) > rename > meta-gnome/recipes-gnome/gnome-system-monitor/{files/0001-help-remove-YELP-macro.patch > => > gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch} > (38%) > rename > meta-gnome/recipes-gnome/gnome-system-monitor/{gnome-system-monitor_3.26.0.bb > => gnome-system-monitor_3.32.0.bb} (43%) > > diff --git > a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch > > b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch > similarity index 38% > rename from > meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch > rename to > meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch > index 57b60a0d5..f2e720e9e 100644 > --- > a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch > +++ > b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch > @@ -1,7 +1,7 @@ > -From 4a3ee8b46d25b3d310448bfa4446e15a686fc685 Mon Sep 17 00:00:00 2001 > +From c6649fdcfb2f44807089741557f8e527ab9751e4 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> > -Date: Fri, 23 Mar 2018 13:50:18 +0100 > -Subject: [PATCH] help: remove YELP macro > +Date: Sun, 24 Mar 2019 02:46:07 +0100 > +Subject: [PATCH] Do not build help - we do not have yelp yet > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > @@ -10,19 +10,21 @@ Upstream-Status: Inappropriate [embedded-specific] > > Signed-off-by: Andreas Müller <[email protected]> > --- > - help/Makefile.am | 2 -- > - 1 file changed, 2 deletions(-) > + meson.build | 1 - > + 1 file changed, 1 deletion(-) > > -diff --git a/help/Makefile.am b/help/Makefile.am > -index c5cd0d3..4b83adf 100644 > ---- a/help/Makefile.am > -+++ b/help/Makefile.am > -@@ -1,5 +1,3 @@ > --@YELP_HELP_RULES@ > -- > - HELP_ID = gnome-system-monitor > +diff --git a/meson.build b/meson.build > +index d60ced7..6a0ab4b 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -183,7 +183,6 @@ subdir('data') > + subdir('po') > + subdir('scripts') > + subdir('src') > +-subdir('help') > > - HELP_FILES = \ > + > + message('\n'.join(['', > -- > -2.14.3 > +2.20.1 > > 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.32.0.bb > similarity index 43% > rename from > meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb > rename to > meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb > index 9b6ce17ca..d0297d438 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.32.0.bb > @@ -3,32 +3,30 @@ LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" > > DEPENDS = " \ > - intltool-native \ > + itstool-native \ > gnome-common-native \ > + libxml2-native \ > glib-2.0-native \ > gtkmm3 \ > libgtop \ > librsvg \ > libwnck3 \ > + polkit \ > " > > -inherit gnomebase distro_features_check > +GNOMEBASEBUILDCLASS = "meson" > > -REQUIRED_DISTRO_FEATURES = "x11" > +inherit gnomebase gtk-icon-cache distro_features_check gettext > > -SRC_URI[archive.md5sum] = "fcd59867c07f8c4853b1e28d60cbc037" > -SRC_URI[archive.sha256sum] = > "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3" > -SRC_URI += "file://0001-help-remove-YELP-macro.patch" > +REQUIRED_DISTRO_FEATURES = "x11 polkit" > + > +SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd" > +SRC_URI[archive.sha256sum] = > "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3" > +SRC_URI += "file://0001-Do-not-build-help-we-do-not-have-yelp-yet.patch" > > RRECOMMENDS_${PN} = "adwaita-icon-theme" > > FILES_${PN} += " \ > - ${datadir}/icons \ > ${datadir}/dbus-1 \ > - ${datadir}/gnome/autostart \ > -" > - > -FILES_${PN}-doc += " \ > - ${datadir}/omf \ > - ${datadir}/gnome/help \ > + ${datadir}/metainfo \ > " > -- > 2.20.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
