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

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

[Koen Kooi]

Tested with gnome-icon-theme and libsoup recipes on angstrom.

Signed-off-by: Koen Kooi <koen@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)
-- 
1.6.6.1

Re: [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.
>
> Signed-off-by: Koen Kooi<koen@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)
Merged into OE-Core

Thanks
	Sau!

Re: [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@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)

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

[Koen Kooi]

Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:

> 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

So you found broken metadata. If tasks, connman-gnome and oprofileui-server need hicolor-icon-theme, they should list it in their RDEPENDS_${PN}. That is a seperate issue than what I fixed in the bbclass

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

[Saul Wold]

On 08/04/2011 10:28 PM, Koen Kooi wrote:
>
> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>
>> 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
>
> So you found broken metadata. If tasks, connman-gnome and oprofileui-server need hicolor-icon-theme, they should list it in their RDEPENDS_${PN}. That is a seperate issue than what I fixed in the bbclass

Koen, the gtk-icon-cache.bbclass did contain that RDEPENDS, which you 
removed, if you are going to modify bbclasses, you need to ensure that 
the recipes using them still work correctly.  Your fix broke others, 
please take the time to test against oe-core also.

(and yes we have all made changes that break other distros, there's no 
way test all, but this broke oe-core).

I look forward to a fix.

Thanks

Sau!

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

[Koen Kooi]

Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:

> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>> 
>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>> 
>>> 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
>> 
>> So you found broken metadata. If tasks, connman-gnome and oprofileui-server need hicolor-icon-theme, they should list it in their RDEPENDS_${PN}. That is a seperate issue than what I fixed in the bbclass
> 
> Koen, the gtk-icon-cache.bbclass did contain that RDEPENDS, which you removed

It wasn't removed, it was changed to only add the dependency when needed, and by the looks of it it works. 

Does the following patch work for you?

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index d9b5d1b..1e65e06 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,5 +1,8 @@
 FILES_${PN} += "${datadir}/icons/hicolor"
 
+# OE can't resolve RDEPENDS added thru the python code below, so make sure it has been built.
+DEPENDS += "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.
 gtk_icon_cache_postinst() {

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

[Chris Larson]

On Thu, Aug 4, 2011 at 10:48 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>
> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
>
>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>>
>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>>>
>>>> On 08/01/2011 04:08 AM, Koen Kooi wrote:
>>>>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>>>>>

Can someone explain why this patch added the dependency to the global
RDEPENDS, rather than the RDEPENDS_<pkg> for the pkg in question?
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

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

[Koen Kooi]

Op 5 aug. 2011, om 07:51 heeft Chris Larson het volgende geschreven:

> On Thu, Aug 4, 2011 at 10:48 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> 
>> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
>> 
>>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>>> 
>>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>>>> 
>>>>> On 08/01/2011 04:08 AM, Koen Kooi wrote:
>>>>>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>>>>>> 
> 
> Can someone explain why this patch added the dependency to the global
> RDEPENDS, rather than the RDEPENDS_<pkg> for the pkg in question?

Ah, I assumed it was local to 'pkg' when iterating over packages.

So should it be:

rdepends = bb.data.getVar('RDEPENDS_%s' % pkg, d, 1)

[..]

bb.data.setVar('RDEPENDS_%s' % pkg, rdepends, d)

?

regards,

Koen

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

[Koen Kooi]

Op 5 aug. 2011, om 07:48 heeft Koen Kooi het volgende geschreven:

> 
> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
> 
>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>> 
>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>>> 
>>>> 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
>>> 
>>> So you found broken metadata. If tasks, connman-gnome and oprofileui-server need hicolor-icon-theme, they should list it in their RDEPENDS_${PN}. That is a seperate issue than what I fixed in the bbclass
>> 
>> Koen, the gtk-icon-cache.bbclass did contain that RDEPENDS, which you removed
> 
> It wasn't removed, it was changed to only add the dependency when needed, and by the looks of it it works. 
> 
> Does the following patch work for you?
> 
> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
> index d9b5d1b..1e65e06 100644
> --- a/meta/classes/gtk-icon-cache.bbclass
> +++ b/meta/classes/gtk-icon-cache.bbclass
> @@ -1,5 +1,8 @@
> FILES_${PN} += "${datadir}/icons/hicolor"
> 
> +# OE can't resolve RDEPENDS added thru the python code below, so make sure it has been built.
> +DEPENDS += "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.
> gtk_icon_cache_postinst() {


I can answer that myself: no, it will cause a dependency loop

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

[Koen Kooi]

Op 5 aug. 2011, om 08:44 heeft Koen Kooi het volgende geschreven:

> 
> Op 5 aug. 2011, om 07:48 heeft Koen Kooi het volgende geschreven:
> 
>> 
>> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
>> 
>>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>>> 
>>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>>>> 
>>>>> 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
>>>> 
>>>> So you found broken metadata. If tasks, connman-gnome and oprofileui-server need hicolor-icon-theme, they should list it in their RDEPENDS_${PN}. That is a seperate issue than what I fixed in the bbclass
>>> 
>>> Koen, the gtk-icon-cache.bbclass did contain that RDEPENDS, which you removed
>> 
>> It wasn't removed, it was changed to only add the dependency when needed, and by the looks of it it works. 
>> 
>> Does the following patch work for you?
>> 
>> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
>> index d9b5d1b..1e65e06 100644
>> --- a/meta/classes/gtk-icon-cache.bbclass
>> +++ b/meta/classes/gtk-icon-cache.bbclass
>> @@ -1,5 +1,8 @@
>> FILES_${PN} += "${datadir}/icons/hicolor"
>> 
>> +# OE can't resolve RDEPENDS added thru the python code below, so make sure it has been built.
>> +DEPENDS += "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.
>> gtk_icon_cache_postinst() {
> 
> 
> I can answer that myself: no, it will cause a dependency loop


And this one?

+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,5 +1,7 @@
 FILES_${PN} += "${datadir}/icons/hicolor"
 
+DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']}"

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

[Chris Larson]

On Thu, Aug 4, 2011 at 10:55 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Op 5 aug. 2011, om 07:51 heeft Chris Larson het volgende geschreven:
>
>> On Thu, Aug 4, 2011 at 10:48 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>
>>> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
>>>
>>>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>>>>
>>>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>>>>>
>>>>>> On 08/01/2011 04:08 AM, Koen Kooi wrote:
>>>>>>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>>>>>>>
>>
>> Can someone explain why this patch added the dependency to the global
>> RDEPENDS, rather than the RDEPENDS_<pkg> for the pkg in question?
>
> Ah, I assumed it was local to 'pkg' when iterating over packages.
>
> So should it be:
>
> rdepends = bb.data.getVar('RDEPENDS_%s' % pkg, d, 1)
>
> [..]
>
> bb.data.setVar('RDEPENDS_%s' % pkg, rdepends, d)

Perhaps it is, I haven't read the code that closely. I just noticed
that the pkg_postinst below did use the pkg suffix, and assumed.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

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

[Koen Kooi]

Op 5 aug. 2011 om 09:00 heeft Chris Larson <clarson@kergoth.com> het volgende geschreven:

> On Thu, Aug 4, 2011 at 10:55 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> Op 5 aug. 2011, om 07:51 heeft Chris Larson het volgende geschreven:
>> 
>>> On Thu, Aug 4, 2011 at 10:48 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>> 
>>>> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
>>>> 
>>>>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>>>>> 
>>>>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>>>>>> 
>>>>>>> On 08/01/2011 04:08 AM, Koen Kooi wrote:
>>>>>>>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>>>>>>>> 
>>> 
>>> Can someone explain why this patch added the dependency to the global
>>> RDEPENDS, rather than the RDEPENDS_<pkg> for the pkg in question?
>> 
>> Ah, I assumed it was local to 'pkg' when iterating over packages.
>> 
>> So should it be:
>> 
>> rdepends = bb.data.getVar('RDEPENDS_%s' % pkg, d, 1)
>> 
>> [..]
>> 
>> bb.data.setVar('RDEPENDS_%s' % pkg, rdepends, d)
> 
> Perhaps it is, I haven't read the code that closely. I just noticed
> that the pkg_postinst below did use the pkg suffix, and assumed.

I'll test when I get back home later today


> -- 
> Christopher Larson
> clarson at kergoth dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Maintainer - Tslib
> Senior Software Engineer, Mentor Graphics
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

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

[Kumar Gala]

On Aug 5, 2011, at 1:51 AM, Koen Kooi wrote:

> 
> Op 5 aug. 2011, om 08:44 heeft Koen Kooi het volgende geschreven:
> 
>> 
>> Op 5 aug. 2011, om 07:48 heeft Koen Kooi het volgende geschreven:
>> 
>>> 
>>> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
>>> 
>>>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>>>> 
>>>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>>>>> 
>>>>>> 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
>>>>> 
>>>>> So you found broken metadata. If tasks, connman-gnome and oprofileui-server need hicolor-icon-theme, they should list it in their RDEPENDS_${PN}. That is a seperate issue than what I fixed in the bbclass
>>>> 
>>>> Koen, the gtk-icon-cache.bbclass did contain that RDEPENDS, which you removed
>>> 
>>> It wasn't removed, it was changed to only add the dependency when needed, and by the looks of it it works. 
>>> 
>>> Does the following patch work for you?
>>> 
>>> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
>>> index d9b5d1b..1e65e06 100644
>>> --- a/meta/classes/gtk-icon-cache.bbclass
>>> +++ b/meta/classes/gtk-icon-cache.bbclass
>>> @@ -1,5 +1,8 @@
>>> FILES_${PN} += "${datadir}/icons/hicolor"
>>> 
>>> +# OE can't resolve RDEPENDS added thru the python code below, so make sure it has been built.
>>> +DEPENDS += "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.
>>> gtk_icon_cache_postinst() {
>> 
>> 
>> I can answer that myself: no, it will cause a dependency loop
> 
> 
> And this one?
> 
> +++ b/meta/classes/gtk-icon-cache.bbclass
> @@ -1,5 +1,7 @@
> FILES_${PN} += "${datadir}/icons/hicolor"
> 
> +DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']}"

This fixes my issue with core-image-sato on mpc8315

- k

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

[Richard Purdie]

On Fri, 2011-08-05 at 07:42 -0500, Kumar Gala wrote:
> On Aug 5, 2011, at 1:51 AM, Koen Kooi wrote:
> 
> > 
> > Op 5 aug. 2011, om 08:44 heeft Koen Kooi het volgende geschreven:
> > 
> >> 
> >> Op 5 aug. 2011, om 07:48 heeft Koen Kooi het volgende geschreven:
> >> 
> >>> 
> >>> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
> >>> 
> >>>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
> >>>>> 
> >>>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
> >>>>> 
> >>>>>> 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
> >>>>> 
> >>>>> So you found broken metadata. If tasks, connman-gnome and oprofileui-server need hicolor-icon-theme, they should list it in their RDEPENDS_${PN}. That is a seperate issue than what I fixed in the bbclass
> >>>> 
> >>>> Koen, the gtk-icon-cache.bbclass did contain that RDEPENDS, which you removed
> >>> 
> >>> It wasn't removed, it was changed to only add the dependency when needed, and by the looks of it it works. 
> >>> 
> >>> Does the following patch work for you?
> >>> 
> >>> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
> >>> index d9b5d1b..1e65e06 100644
> >>> --- a/meta/classes/gtk-icon-cache.bbclass
> >>> +++ b/meta/classes/gtk-icon-cache.bbclass
> >>> @@ -1,5 +1,8 @@
> >>> FILES_${PN} += "${datadir}/icons/hicolor"
> >>> 
> >>> +# OE can't resolve RDEPENDS added thru the python code below, so make sure it has been built.
> >>> +DEPENDS += "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.
> >>> gtk_icon_cache_postinst() {
> >> 
> >> 
> >> I can answer that myself: no, it will cause a dependency loop
> > 
> > 
> > And this one?
> > 
> > +++ b/meta/classes/gtk-icon-cache.bbclass
> > @@ -1,5 +1,7 @@
> > FILES_${PN} += "${datadir}/icons/hicolor"
> > 
> > +DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']}"
> 
> This fixes my issue with core-image-sato on mpc8315

This looks right to me. Should I turn this into a commit or are you
waiting for some reason?

Cheers,

Richard

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

[Koen Kooi]

Op 5 aug 2011, om 15:19 heeft Richard Purdie het volgende geschreven:

> On Fri, 2011-08-05 at 07:42 -0500, Kumar Gala wrote:
>> On Aug 5, 2011, at 1:51 AM, Koen Kooi wrote:
>>
>>>
>>> Op 5 aug. 2011, om 08:44 heeft Koen Kooi het volgende geschreven:
>>>
>>>>
>>>> Op 5 aug. 2011, om 07:48 heeft Koen Kooi het volgende geschreven:
>>>>
>>>>>
>>>>> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
>>>>>
>>>>>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>>>>>>
>>>>>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende  
>>>>>>> geschreven:
>>>>>>>
>>>>>>>> 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
>>>>>>>
>>>>>>> So you found broken metadata. If tasks, connman-gnome and  
>>>>>>> oprofileui-server need hicolor-icon-theme, they should list it  
>>>>>>> in their RDEPENDS_${PN}. That is a seperate issue than what I  
>>>>>>> fixed in the bbclass
>>>>>>
>>>>>> Koen, the gtk-icon-cache.bbclass did contain that RDEPENDS,  
>>>>>> which you removed
>>>>>
>>>>> It wasn't removed, it was changed to only add the dependency  
>>>>> when needed, and by the looks of it it works.
>>>>>
>>>>> Does the following patch work for you?
>>>>>
>>>>> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/ 
>>>>> gtk-icon-cache.bbclass
>>>>> index d9b5d1b..1e65e06 100644
>>>>> --- a/meta/classes/gtk-icon-cache.bbclass
>>>>> +++ b/meta/classes/gtk-icon-cache.bbclass
>>>>> @@ -1,5 +1,8 @@
>>>>> FILES_${PN} += "${datadir}/icons/hicolor"
>>>>>
>>>>> +# OE can't resolve RDEPENDS added thru the python code below,  
>>>>> so make sure it has been built.
>>>>> +DEPENDS += "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.
>>>>> gtk_icon_cache_postinst() {
>>>>
>>>>
>>>> I can answer that myself: no, it will cause a dependency loop
>>>
>>>
>>> And this one?
>>>
>>> +++ b/meta/classes/gtk-icon-cache.bbclass
>>> @@ -1,5 +1,7 @@
>>> FILES_${PN} += "${datadir}/icons/hicolor"
>>>
>>> +DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor- 
>>> icon-theme']}"
>>
>> This fixes my issue with core-image-sato on mpc8315
>
> This looks right to me. Should I turn this into a commit or are you
> waiting for some reason?

I was out of town most of the day, I'll send a patch in a few minutes  
now that I'm home again.

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

[Richard Purdie]

On Fri, 2011-08-05 at 07:55 +0200, Koen Kooi wrote:
> Op 5 aug. 2011, om 07:51 heeft Chris Larson het volgende geschreven:
> 
> > On Thu, Aug 4, 2011 at 10:48 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >> 
> >> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
> >> 
> >>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
> >>>> 
> >>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
> >>>> 
> >>>>> On 08/01/2011 04:08 AM, Koen Kooi wrote:
> >>>>>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
> >>>>>> 
> > 
> > Can someone explain why this patch added the dependency to the global
> > RDEPENDS, rather than the RDEPENDS_<pkg> for the pkg in question?
> 
> Ah, I assumed it was local to 'pkg' when iterating over packages.
> 
> So should it be:
> 
> rdepends = bb.data.getVar('RDEPENDS_%s' % pkg, d, 1)
> 
> [..]
> 
> bb.data.setVar('RDEPENDS_%s' % pkg, rdepends, d)
> 
> ?

Yes, it should.

Cheers,

Richard

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

[Koen Kooi]

Op 5 aug. 2011, om 18:27 heeft Richard Purdie het volgende geschreven:

> On Fri, 2011-08-05 at 07:55 +0200, Koen Kooi wrote:
>> Op 5 aug. 2011, om 07:51 heeft Chris Larson het volgende geschreven:
>> 
>>> On Thu, Aug 4, 2011 at 10:48 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>> 
>>>> Op 5 aug. 2011, om 07:32 heeft Saul Wold het volgende geschreven:
>>>> 
>>>>> On 08/04/2011 10:28 PM, Koen Kooi wrote:
>>>>>> 
>>>>>> Op 5 aug. 2011, om 04:23 heeft Saul Wold het volgende geschreven:
>>>>>> 
>>>>>>> On 08/01/2011 04:08 AM, Koen Kooi wrote:
>>>>>>>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>>>>>>>> 
>>> 
>>> Can someone explain why this patch added the dependency to the global
>>> RDEPENDS, rather than the RDEPENDS_<pkg> for the pkg in question?
>> 
>> Ah, I assumed it was local to 'pkg' when iterating over packages.
>> 
>> So should it be:
>> 
>> rdepends = bb.data.getVar('RDEPENDS_%s' % pkg, d, 1)
>> 
>> [..]
>> 
>> bb.data.setVar('RDEPENDS_%s' % pkg, rdepends, d)
>> 
>> ?
> 
> Yes, it should.

patch on its way :)

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

[Steffen Sledz]

On 04.08.2011 09:38, Koen Kooi wrote:
> Op 04-08-11 09:15, Steffen Sledz schreef:
>> On 01.08.2011 15:31, Steffen Sledz wrote:
>>> On 01.08.2011 11:59, Koen Kooi wrote:
>>>> Also import a fix from OE-core for setting the loader dir.
>>>> 
>>>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>>>> 
>>>> Signed-off-by: Koen Kooi <koen@openembedded.org>
>>> 
>>> Acked-by: Steffen Sledz <sledz@dresearch-fe.de>
> 
>> Ping!
> 
>>> Thx for this. Would be nice, if this patch could find it's way to 2011.03-maintenance branch too.
> 
> Wasn't this in the pull request you did this week?

Not yet. I would like to wait until it made it's way to oe-dev master.

-- 
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sledz@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058

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

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 04-08-11 09:15, Steffen Sledz schreef:
> On 01.08.2011 15:31, Steffen Sledz wrote:
>> On 01.08.2011 11:59, Koen Kooi wrote:
>>> Also import a fix from OE-core for setting the loader dir.
>>> 
>>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>>> 
>>> Signed-off-by: Koen Kooi <koen@openembedded.org>
>> 
>> Acked-by: Steffen Sledz <sledz@dresearch-fe.de>
> 
> Ping!
> 
>> Thx for this. Would be nice, if this patch could find it's way to 2011.03-maintenance branch too.

Wasn't this in the pull request you did this week?

>> 
>>> --- classes/gtk-icon-cache.bbclass |   11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
>>> 
>>> diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index 2449e95..d9b5d1b 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -1,6 +1,4 @@ FILES_${PN} += "${datadir}/icons/hicolor" -# Only add runtime dependency on hicolor-icon-theme
>>> for target recipes -RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}"
>>> 
>>> # This could run on the host as icon cache files are architecture independent, # but there is no gtk-update-icon-cache built natively. @@ -10,7 +8,7 @@ if [ "x$D" != "x" ]; then fi
>>> 
>>> # Update the pixbuf loaders in case they haven't been registered yet -gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders +GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache
>>> 
>>> for icondir in /usr/share/icons/* ; do if [ -d $icondir ] ; then @@ -35,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)
>> 
>> 
> 
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOOkyOMkyGM64RGpERAu38AKCbLXcD5+k5mD+zqBZ1vrmqD2MhyQCfeu8q
FWqQAhn7kDc46b8BkBlIuf8=
=NfMW
-----END PGP SIGNATURE-----

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

[Steffen Sledz]

On 01.08.2011 15:31, Steffen Sledz wrote:
> On 01.08.2011 11:59, Koen Kooi wrote:
>> Also import a fix from OE-core for setting the loader dir.
>>
>> Tested with gnome-icon-theme and libsoup recipes on angstrom.
>>
>> Signed-off-by: Koen Kooi <koen@openembedded.org>
> 
> Acked-by: Steffen Sledz <sledz@dresearch-fe.de>

Ping!

> Thx for this. Would be nice, if this patch could find it's way to 2011.03-maintenance branch too.
> 
>> ---
>>  classes/gtk-icon-cache.bbclass |   11 +++++++----
>>  1 files changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
>> index 2449e95..d9b5d1b 100644
>> --- a/classes/gtk-icon-cache.bbclass
>> +++ b/classes/gtk-icon-cache.bbclass
>> @@ -1,6 +1,4 @@
>>  FILES_${PN} += "${datadir}/icons/hicolor"
>> -# Only add runtime dependency on hicolor-icon-theme for target recipes
>> -RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}"
>>  
>>  # This could run on the host as icon cache files are architecture independent,
>>  # but there is no gtk-update-icon-cache built natively.
>> @@ -10,7 +8,7 @@ if [ "x$D" != "x" ]; then
>>  fi
>>  
>>  # Update the pixbuf loaders in case they haven't been registered yet
>> -gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
>> +GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache
>>  
>>  for icondir in /usr/share/icons/* ; do
>>      if [ -d $icondir ] ; then
>> @@ -35,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)
> 
> 


-- 
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sledz@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058

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

[Steffen Sledz]

On 01.08.2011 11:59, Koen Kooi wrote:
> Also import a fix from OE-core for setting the loader dir.
> 
> Tested with gnome-icon-theme and libsoup recipes on angstrom.
> 
> Signed-off-by: Koen Kooi <koen@openembedded.org>

Acked-by: Steffen Sledz <sledz@dresearch-fe.de>

Thx for this. Would be nice, if this patch could find it's way to 2011.03-maintenance branch too.

> ---
>  classes/gtk-icon-cache.bbclass |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
> index 2449e95..d9b5d1b 100644
> --- a/classes/gtk-icon-cache.bbclass
> +++ b/classes/gtk-icon-cache.bbclass
> @@ -1,6 +1,4 @@
>  FILES_${PN} += "${datadir}/icons/hicolor"
> -# Only add runtime dependency on hicolor-icon-theme for target recipes
> -RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}"
>  
>  # This could run on the host as icon cache files are architecture independent,
>  # but there is no gtk-update-icon-cache built natively.
> @@ -10,7 +8,7 @@ if [ "x$D" != "x" ]; then
>  fi
>  
>  # Update the pixbuf loaders in case they haven't been registered yet
> -gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
> +GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache
>  
>  for icondir in /usr/share/icons/* ; do
>      if [ -d $icondir ] ; then
> @@ -35,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)


-- 
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sledz@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058

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

[Koen Kooi]

Also import a fix from OE-core for setting the loader dir.

Tested with gnome-icon-theme and libsoup recipes on angstrom.

Signed-off-by: Koen Kooi <koen@openembedded.org>
---
 classes/gtk-icon-cache.bbclass |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index 2449e95..d9b5d1b 100644
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -1,6 +1,4 @@
 FILES_${PN} += "${datadir}/icons/hicolor"
-# Only add runtime dependency on hicolor-icon-theme for target recipes
-RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}"
 
 # This could run on the host as icon cache files are architecture independent,
 # but there is no gtk-update-icon-cache built natively.
@@ -10,7 +8,7 @@ if [ "x$D" != "x" ]; then
 fi
 
 # Update the pixbuf loaders in case they haven't been registered yet
-gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache
 
 for icondir in /usr/share/icons/* ; do
     if [ -d $icondir ] ; then
@@ -35,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)
-- 
1.6.6.1