summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2020-08-05 14:27:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-07 20:20:21 (GMT)
commit09c99632ac74f4ebd9e8fa4696f8d0ddaea37d36 (patch)
tree4a1bd993e18345f1db6666d7c2b0b2cf5ee43812
parenteee52b524ef837a0032a24a937cb085292f079d8 (diff)
downloadpoky-dunfell.tar.gz
Revert "gtk-icon-cache.bbclass: add runtime dependency"dunfell
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>
-rw-r--r--meta/classes/gtk-icon-cache.bbclass19
1 files changed, 3 insertions, 16 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index dd394af..91cb4ad 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,10 +1,6 @@
1FILES_${PN} += "${datadir}/icons/hicolor" 1FILES_${PN} += "${datadir}/icons/hicolor"
2 2
3DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} \ 3DEPENDS +=" ${@['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
9PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native" 5PACKAGE_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'