[PATCH v2 1/2] hicolor-icon-theme: keep inherited dependencies and switch to gnomebase

[PATCH v2 1/2] hicolor-icon-theme: keep inherited dependencies and switch to gnomebase

[Eric Bénard]

- switching to gnomebase removes postinst and postrm scripts that
gtk-icon-cache was bringing (and which are not necessary) else, if an
image installs hicolor-icon-theme without any other gnome package,
the dependency on gdk-pixbuf-native was missing and if it exists,
the host gdk-pixbuf-query-loaders binary was be
used and it will try to update the host's cache

- keep inherited dependencies as these are only native ones
DEPENDS = autoconf-native automake-native gnome-common-native
gnu-config-native libtool-native pkgconfig-native

[YOCTO #4572]

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
index 7c911e0..9a8e5a6 100644
--- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
+++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
@@ -6,9 +6,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426"
 
 SECTION = "unknown"
-inherit gnome allarch
-
-DEPENDS = ""
+inherit gnomebase allarch
 
 PR = "r1"
 
-- 
1.8.1.4

[PATCH v2 2/2] gtk-icon-cache pixbufcache: add a clear dependency on gdk-pixbuf-native

[Eric Bénard]

not really sure if the dependency is always inherited but at least
there won't be bad surprise.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 meta/classes/gtk-icon-cache.bbclass | 2 +-
 meta/classes/pixbufcache.bbclass    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 789fa38..8ed7feb 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,6 +1,6 @@
 FILES_${PN} += "${datadir}/icons/hicolor"
 
-DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-update-icon-cache-native"
+DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-update-icon-cache-native gdk-pixbuf-native"
 
 gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index 274d67d..4ac17ee 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -3,7 +3,7 @@
 # packages.
 #
 
-DEPENDS += "qemu-native"
+DEPENDS += "qemu-native gdk-pixbuf-native"
 inherit qemu
 
 PIXBUF_PACKAGES ??= "${PN}"
-- 
1.8.1.4

Re: [PATCH v2 2/2] gtk-icon-cache pixbufcache: add a clear dependency on gdk-pixbuf-native

[Saul Wold]

On 05/31/2013 05:40 AM, Eric Bénard wrote:
> not really sure if the dependency is always inherited but at least
> there won't be bad surprise.
>
This seems to have caused a circular dependency, not sure the exact 
nature, please verify this.

There might have been a patch from someone else recently, so please 
check the latest master.

Thanks
    Sau!

> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
>   meta/classes/gtk-icon-cache.bbclass | 2 +-
>   meta/classes/pixbufcache.bbclass    | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
> index 789fa38..8ed7feb 100644
> --- a/meta/classes/gtk-icon-cache.bbclass
> +++ b/meta/classes/gtk-icon-cache.bbclass
> @@ -1,6 +1,6 @@
>   FILES_${PN} += "${datadir}/icons/hicolor"
>
> -DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-update-icon-cache-native"
> +DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-update-icon-cache-native gdk-pixbuf-native"
>
>   gtk_icon_cache_postinst() {
>   if [ "x$D" != "x" ]; then
> diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
> index 274d67d..4ac17ee 100644
> --- a/meta/classes/pixbufcache.bbclass
> +++ b/meta/classes/pixbufcache.bbclass
> @@ -3,7 +3,7 @@
>   # packages.
>   #
>
> -DEPENDS += "qemu-native"
> +DEPENDS += "qemu-native gdk-pixbuf-native"
>   inherit qemu
>
>   PIXBUF_PACKAGES ??= "${PN}"
>

Re: [PATCH v2 2/2] gtk-icon-cache pixbufcache: add a clear dependency on gdk-pixbuf-native

[Eric Bénard]

Le Fri, 31 May 2013 15:35:35 +0900,
Saul Wold <sgw@linux.intel.com> a écrit :

> On 05/31/2013 05:40 AM, Eric Bénard wrote:
> > not really sure if the dependency is always inherited but at least
> > there won't be bad surprise.
> >
> This seems to have caused a circular dependency, not sure the exact 
> nature, please verify this.
> 
> There might have been a patch from someone else recently, so please 
> check the latest master.
> 
ok please forget this one it will need more testing if it's required at
all

Eric

Re: [PATCH v2 1/2] hicolor-icon-theme: keep inherited dependencies and switch to gnomebase

[Burton, Ross]

Signed-off-by: Ross Burton <ross.burton@intel.com>