diff options
Diffstat (limited to 'meta/classes/gtk-icon-cache.bbclass')
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 69 |
1 files changed, 46 insertions, 23 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 6195fa4526..6808339b90 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -1,13 +1,28 @@ -FILES_${PN} += "${datadir}/icons/hicolor" +FILES:${PN} += "${datadir}/icons/hicolor" -DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-icon-utils-native" +GTKIC_VERSION ??= '3' + +GTKPN = "${@ 'gtk4' if d.getVar('GTKIC_VERSION') == '4' else 'gtk+3' }" +GTKIC_CMD = "${@ 'gtk-update-icon-cache-3.0.0' if d.getVar('GTKIC_VERSION') == '4' else 'gtk4-update-icon-cache' }" + +#gtk+3/gtk4 require GTK3DISTROFEATURES, DEPENDS on it make all the +#recipes inherit this class require GTK3DISTROFEATURES +inherit features_check +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS +=" ${@ '' if d.getVar('BPN') == 'hicolor-icon-theme' else 'hicolor-icon-theme' } \ + ${@ '' if d.getVar('BPN') == 'gdk-pixbuf' else 'gdk-pixbuf' } \ + ${@ '' if d.getVar('BPN') == d.getVar('GTKPN') else d.getVar('GTKPN') } \ + ${GTKPN}-native \ +" + +PACKAGE_WRITE_DEPS += "${GTKPN}-native gdk-pixbuf-native" gtk_icon_cache_postinst() { if [ "x$D" != "x" ]; then - $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ + $INTERCEPT_DIR/postinst_intercept update_gtk_icon_cache ${PKG} \ mlprefix=${MLPREFIX} \ - libdir=${libdir} \ - STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE} + libdir_native=${libdir_native} else # Update the pixbuf loaders in case they haven't been registered yet @@ -15,7 +30,7 @@ else for icondir in /usr/share/icons/* ; do if [ -d $icondir ] ; then - gtk-update-icon-cache -fqt $icondir + ${GTKIC_CMD} -fqt $icondir fi done fi @@ -23,44 +38,52 @@ fi gtk_icon_cache_postrm() { if [ "x$D" != "x" ]; then - $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ + $INTERCEPT_DIR/postinst_intercept update_gtk_icon_cache ${PKG} \ mlprefix=${MLPREFIX} \ - libdir=${libdir} \ - STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE} + libdir=${libdir} else for icondir in /usr/share/icons/* ; do if [ -d $icondir ] ; then - gtk-update-icon-cache -qt $icondir + ${GTKIC_CMD} -qt $icondir fi done fi } -python populate_packages_append () { - packages = d.getVar('PACKAGES', True).split() - pkgdest = d.getVar('PKGDEST', True) +python populate_packages:append () { + packages = d.getVar('PACKAGES').split() + pkgdest = d.getVar('PKGDEST') for pkg in packages: - icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, d.getVar('datadir', True)) + icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, d.getVar('datadir')) if not os.path.exists(icon_dir): continue bb.note("adding hicolor-icon-theme dependency to %s" % pkg) rdepends = ' ' + d.getVar('MLPREFIX', False) + "hicolor-icon-theme" - d.appendVar('RDEPENDS_%s' % pkg, rdepends) - + d.appendVar('RDEPENDS:%s' % pkg, rdepends) + + #gtk_icon_cache_postinst depend on gdk-pixbuf and gtk+3/gtk4 + 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 %s dependency to %s" % (d.getVar('GTKPN'), pkg)) + rdepends = ' ' + d.getVar('MLPREFIX', False) + d.getVar('GTKPN') + 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, True) + + postinst = d.getVar('pkg_postinst:%s' % pkg) if not postinst: postinst = '#!/bin/sh\n' - postinst += d.getVar('gtk_icon_cache_postinst', True) - d.setVar('pkg_postinst_%s' % pkg, postinst) + postinst += d.getVar('gtk_icon_cache_postinst') + d.setVar('pkg_postinst:%s' % pkg, postinst) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) + postrm = d.getVar('pkg_postrm:%s' % pkg) if not postrm: postrm = '#!/bin/sh\n' - postrm += d.getVar('gtk_icon_cache_postrm', True) - d.setVar('pkg_postrm_%s' % pkg, postrm) + postrm += d.getVar('gtk_icon_cache_postrm') + d.setVar('pkg_postrm:%s' % pkg, postrm) } |