[OE-core] [PATCH] gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons

[Saul Wold]

On 08/01/2011 04:08 AM, Koen Kooi wrote:
> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>
But you did not test it against anything in oe-core, it has broken the 
build for connman-gnome and oprofileui, which use this bbclass.

The oe-core gnome-icon-theme does not include this class.

Please correct this.

   Processing task-base-extended...
| error: Failed dependencies:
| 	hicolor-icon-theme is needed by tasks-0.19-r0.armv5te
| 	hicolor-icon-theme is needed by connman-gnome-0.5-r6.armv5te
| 	hicolor-icon-theme is needed by 
oprofileui-server-0.0+git1+0c3c32fa754c1d0b70e65767ea7048914f776396-r4.armv5te

Thanks
	Sau!


> Signed-off-by: Koen Kooi<koen at openembedded.org>
> ---
>   meta/classes/gtk-icon-cache.bbclass |    8 ++++++--
>   1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
> index dcabaf5..d9b5d1b 100644
> --- a/meta/classes/gtk-icon-cache.bbclass
> +++ b/meta/classes/gtk-icon-cache.bbclass
> @@ -1,5 +1,4 @@
>   FILES_${PN} += "${datadir}/icons/hicolor"
> -RDEPENDS += "hicolor-icon-theme"
>
>   # This could run on the host as icon cache files are architecture independent,
>   # but there is no gtk-update-icon-cache built natively.
> @@ -34,7 +33,12 @@ python populate_packages_append () {
>   		icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1))
>   		if not os.path.exists(icon_dir):
>   			continue
> -		
> +
> +		bb.note("adding hicolor-icon-theme dependency to %s" % pkg)	
> +		rdepends = bb.data.getVar('RDEPENDS', d, 1)
> +		rdepends += "hicolor-icon-theme"
> +		bb.data.setVar('RDEPENDS', rdepends, d)
> +	
>   		bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
>   		
>   		postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)