summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-06-19 15:11:06 +0800
committerRobert Yang <liezhi.yang@windriver.com>2019-06-20 18:18:39 +0800
commit7c21a708c10593deaab0740c1f593f6b4ca0f631 (patch)
treefad0479fe58a02fd36bdedf5b00242e4726a5ec2
parentd02500d78c61f9cdee7a5f4bc99148379054cfcd (diff)
downloadopenembedded-core-contrib-rbt/4fixes.tar.gz
openembedded-core-contrib-rbt/4fixes.tar.bz2
openembedded-core-contrib-rbt/4fixes.zip
gtk-icon-cache.bbclass: Depends on gtk+3rbt/4fixes
The gtk-update-icon-cache is provided by gtk+3, gdk-pixbuf-query-loaders is provided by gdk-pixbuf, and gtk+3 depends on gdk-pixbuf, so depends on gtk+3 can fix the problems. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/classes/gtk-icon-cache.bbclass14
1 files changed, 10 insertions, 4 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 66fe781bd2..4e60fe6db9 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -4,6 +4,11 @@ DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk
PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native"
+inherit distro_features_check
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+DEPENDS += "gtk+3"
+
gtk_icon_cache_postinst() {
if [ "x$D" != "x" ]; then
$INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
@@ -45,10 +50,11 @@ python populate_packages_append () {
if not os.path.exists(icon_dir):
continue
- bb.note("adding hicolor-icon-theme dependency to %s" % pkg)
- rdepends = ' ' + d.getVar('MLPREFIX', False) + "hicolor-icon-theme"
- d.appendVar('RDEPENDS_%s' % pkg, rdepends)
-
+ for dep in ('hicolor-icon-theme', 'gtk+3'):
+ bb.note("Adding %s dependency to %s" % (dep, pkg))
+ rdepends = ' ' + d.getVar('MLPREFIX', False) + dep
+ d.appendVar('RDEPENDS_%s' % pkg, rdepends)
+
bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
postinst = d.getVar('pkg_postinst_%s' % pkg)