[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6492/8267] gnomebase.bbclass: add datadir/icons and datadir/appdata to standard FILES list

[Emmanuele Bassi <ebassi src gnome org>]

commit 0c6396b74a1348d1d2388ee3a28f41b4e0db23b1
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Fri Jun 16 14:38:58 2017 +0300

    gnomebase.bbclass: add datadir/icons and datadir/appdata to standard FILES list
    
    Gnome apps seem to increasingly package those, so let's make it common.
    
    (From OE-Core rev: fc318fb191b68232cc400db2d5eb543d296ee884)
    
    Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/gnomebase.bbclass                 |    2 ++
 meta/recipes-gnome/epiphany/epiphany_3.22.6.bb |    2 +-
 meta/recipes-kernel/sysprof/sysprof_3.24.1.bb  |    1 -
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass
index 54aa45f..4ccc8e0 100644
--- a/meta/classes/gnomebase.bbclass
+++ b/meta/classes/gnomebase.bbclass
@@ -14,6 +14,8 @@ FILES_${PN} += "${datadir}/application-registry  \
                 ${datadir}/polkit* \
                 ${datadir}/GConf \
                 ${datadir}/glib-2.0/schemas \
+                ${datadir}/appdata \
+                ${datadir}/icons \
 "
 
 FILES_${PN}-doc += "${datadir}/devhelp"
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb b/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
index 651fef1..e9e3493 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
@@ -19,5 +19,5 @@ do_configure_prepend() {
     sed -i -e s:help::g ${S}/Makefile.am
 }
 
-FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
+FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
diff --git a/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb b/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb
index ca3589b..36093ca 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.24.1.bb
@@ -30,7 +30,6 @@ PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus"
 
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${datadir}/icons/ ${datadir}/appdata"
 
 SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'sysprof2.service', '', d)}"