hicolor-icon-theme: keep inherited dependencies and switch to gnomebase
PATCH v2 1/2 hicolor-icon-theme: keep inherited dependencies and switch to gnomebase
- 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]
--- meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb +1 -3
@@ -6,9 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426" SECTION = "unknown" -inherit gnome allarch - -DEPENDS = "" +inherit gnomebase allarch PR = "r1"
Signature · 1 line
1.8.1.4
PATCH v2 2/2 gtk-icon-cache pixbufcache: add a clear dependency on gdk-pixbuf-native
not really sure if the dependency is always inherited but at least there won't be bad surprise.
--- meta/classes/gtk-icon-cache.bbclass | 2 +- meta/classes/pixbufcache.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/gtk-icon-cache.bbclass +1 -1
@@ -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
meta/classes/pixbufcache.bbclass +1 -1
@@ -3,7 +3,7 @@ # packages. # -DEPENDS += "qemu-native" +DEPENDS += "qemu-native gdk-pixbuf-native" inherit qemu PIXBUF_PACKAGES ??= "${PN}"
Signature · 1 line
1.8.1.4
Re: [PATCH v2 2/2] gtk-icon-cache pixbufcache: add a clear dependency on gdk-pixbuf-native
Quoted 3 lines · Eric Bénard
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!
Quoted 32 lines
Signed-off-by Eric Bénard <[email protected]>--- meta/classes/gtk-icon-cache.bbclass | 2 +- meta/classes/pixbufcache.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)meta/classes/gtk-icon-cache.bbclass +1
-1@@ -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" ]; thenmeta/classes/pixbufcache.bbclass +1
-1@@ -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
Quoted 10 lines · Saul Wold
Quoted 3 lines · Eric Bénard
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