diff options
-rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index dd394af27c..91cb4ad409 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass | |||
@@ -1,10 +1,6 @@ | |||
1 | FILES_${PN} += "${datadir}/icons/hicolor" | 1 | FILES_${PN} += "${datadir}/icons/hicolor" |
2 | 2 | ||
3 | DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} \ | 3 | DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk+3-native" |
4 | ${@['gdk-pixbuf', '']['${BPN}' == 'gdk-pixbuf']} \ | ||
5 | ${@['gtk+3', '']['${BPN}' == 'gtk+3']} \ | ||
6 | gtk+3-native \ | ||
7 | " | ||
8 | 4 | ||
9 | PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native" | 5 | PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native" |
10 | 6 | ||
@@ -52,18 +48,9 @@ python populate_packages_append () { | |||
52 | bb.note("adding hicolor-icon-theme dependency to %s" % pkg) | 48 | bb.note("adding hicolor-icon-theme dependency to %s" % pkg) |
53 | rdepends = ' ' + d.getVar('MLPREFIX', False) + "hicolor-icon-theme" | 49 | rdepends = ' ' + d.getVar('MLPREFIX', False) + "hicolor-icon-theme" |
54 | d.appendVar('RDEPENDS_%s' % pkg, rdepends) | 50 | d.appendVar('RDEPENDS_%s' % pkg, rdepends) |
55 | 51 | ||
56 | #gtk_icon_cache_postinst depend on gdk-pixbuf and gtk+3 | ||
57 | bb.note("adding gdk-pixbuf dependency to %s" % pkg) | ||
58 | rdepends = ' ' + d.getVar('MLPREFIX', False) + "gdk-pixbuf" | ||
59 | d.appendVar('RDEPENDS_%s' % pkg, rdepends) | ||
60 | |||
61 | bb.note("adding gtk+3 dependency to %s" % pkg) | ||
62 | rdepends = ' ' + d.getVar('MLPREFIX', False) + "gtk+3" | ||
63 | d.appendVar('RDEPENDS_%s' % pkg, rdepends) | ||
64 | |||
65 | bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) | 52 | bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) |
66 | 53 | ||
67 | postinst = d.getVar('pkg_postinst_%s' % pkg) | 54 | postinst = d.getVar('pkg_postinst_%s' % pkg) |
68 | if not postinst: | 55 | if not postinst: |
69 | postinst = '#!/bin/sh\n' | 56 | postinst = '#!/bin/sh\n' |