mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-14 17:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gtk-icon-cache.bbclass: add runtime dependency"

Browse Source 
This reverts commit e921edd27e71af00f07e3f1e973d2b0c6c777bf4 since
it breaks adwaita-icon-theme and other recipes using gtk-icon-cache

(From OE-Core rev: 257758f175cdcb99f4fe890cc0b1a60e82b5b84b)

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Steve Sakoman
2020-08-05 04:27:18 -10:00
committed by Richard Purdie
parent eee52b524e
commit 09c99632ac
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meta/classes/gtk-icon-cache.bbclass
View File

@@ -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'