]> code.ossystems Code Review - openembedded-core.git/commitdiff
Revert "gtk-icon-cache.bbclass: add runtime dependency"
authorSteve Sakoman <steve@sakoman.com>
Wed, 5 Aug 2020 14:27:18 +0000 (04:27 -1000)
committerSteve Sakoman <steve@sakoman.com>
Wed, 5 Aug 2020 14:27:18 +0000 (04:27 -1000)
This reverts commit e921edd27e71af00f07e3f1e973d2b0c6c777bf4 since
it breaks adwaita-icon-theme and other recipes using gtk-icon-cache

Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/gtk-icon-cache.bbclass

index dd394af27ca8d6a9f260588adc30981604859075..91cb4ad4090a9ff9670cdceba5edb46a6ac3d596 100644 (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'