Patchwork gtk-icon-cache: add hicolor-icon-theme to DEPENDS

login
register
mail settings
Submitter Koen Kooi
Date Aug. 5, 2011, 2:18 p.m.
Message ID <1312553937-29414-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/9365/
State New, archived
Headers show

Comments

Koen Kooi - Aug. 5, 2011, 2:18 p.m.
This fixes do_rootfs breaking because OE didn't resolve the RDEPENDS added with python

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/classes/gtk-icon-cache.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Richard Purdie - Aug. 5, 2011, 4:25 p.m.
On Fri, 2011-08-05 at 16:18 +0200, Koen Kooi wrote:
> This fixes do_rootfs breaking because OE didn't resolve the RDEPENDS added with python
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/classes/gtk-icon-cache.bbclass |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
> index 4981aec..8436cd3 100644
> --- a/meta/classes/gtk-icon-cache.bbclass
> +++ 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 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() {

Merged to master, thanks.

Richard
Michael Morscher - Aug. 30, 2011, 11:52 a.m.
Hi Koen,

This is still not working for my xfce46-image, described here:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-August/034653.html 


Bye
Michael
Richard Purdie - Aug. 30, 2011, 4:14 p.m.
On Tue, 2011-08-30 at 13:52 +0200, Michael Morscher wrote:
> This is still not working for my xfce46-image, described here:
> http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-August/034653.html 

Is this with a clean build and with master?

To be specific, this commit

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=4a5336d403bb0b8dfe2e5f863288a7d3489132c2

should have fixed the spacing issue (note the additional space being
added).

Cheers,

Richard
Michael Morscher - Aug. 30, 2011, 7:54 p.m.
Hey Richard,

Thanks for your answer. That patch hasn't fixed it for me, also the 
others don't... I checked your and Koens old conversations and tried all 
those patches, but no change :(
I have no idea why and some DEPEND and RDEPEND things didn't fix it as 
well. I'm not a pro at the moment.

I'm running the git master and copied those patches or manually edited 
the smaller things. I'm not sure but all other gnome/X (not gpe) things 
are broken due to that error.

MFG
Michael
Richard Purdie - Aug. 30, 2011, 7:58 p.m.
On Tue, 2011-08-30 at 21:54 +0200, Michael Morscher wrote:
> Thanks for your answer. That patch hasn't fixed it for me, also the 
> others don't... I checked your and Koens old conversations and tried all 
> those patches, but no change :(
>
> I have no idea why and some DEPEND and RDEPEND things didn't fix it as 
> well. I'm not a pro at the moment.
> 
> I'm running the git master and copied those patches or manually edited 
> the smaller things. I'm not sure but all other gnome/X (not gpe) things 
> are broken due to that error.

I'm a little confused as if you're running master, you should already
have those patches applied?

Cheers,

Richard

Patch

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 4981aec..8436cd3 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ 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 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() {