This reverts commit e921edd27e71af00f07e3f1e973d2b0c6c777bf4 since it breaks adwaita-icon-theme and other recipes using gtk-icon-cache
Signed-off-by: Steve Sakoman <[email protected]> --- meta/classes/gtk-icon-cache.bbclass | 19 +++---------------- 1 file 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 @@ FILES_${PN} += "${datadir}/icons/hicolor" -DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} \ - ${@['gdk-pixbuf', '']['${BPN}' == 'gdk-pixbuf']} \ - ${@['gtk+3', '']['${BPN}' == 'gtk+3']} \ - gtk+3-native \ -" +DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk+3-native" PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native" @@ -52,18 +48,9 @@ python populate_packages_append () { bb.note("adding hicolor-icon-theme dependency to %s" % pkg) rdepends = ' ' + d.getVar('MLPREFIX', False) + "hicolor-icon-theme" d.appendVar('RDEPENDS_%s' % pkg, rdepends) - - #gtk_icon_cache_postinst depend on gdk-pixbuf and gtk+3 - bb.note("adding gdk-pixbuf dependency to %s" % pkg) - rdepends = ' ' + d.getVar('MLPREFIX', False) + "gdk-pixbuf" - d.appendVar('RDEPENDS_%s' % pkg, rdepends) - - bb.note("adding gtk+3 dependency to %s" % pkg) - rdepends = ' ' + d.getVar('MLPREFIX', False) + "gtk+3" - 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) if not postinst: postinst = '#!/bin/sh\n' -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#141228): https://lists.openembedded.org/g/openembedded-core/message/141228 Mute This Topic: https://lists.openembedded.org/mt/76008809/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
