From patchwork Thu Feb 24 13:11:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= X-Patchwork-Id: 14165 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Zoltan Boszormenyi" Subject: [PATCH v2] gtk-icon-cache: Allow using gtk4 Date: Thu, 24 Feb 2022 14:11:21 +0100 Message-Id: <20220224131121.2994520-1-zboszor@pr.hu> MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= From: Zoltán Böszörményi meta-openembedded has gtk4 which has its own version of gtk-update-icon-cache. Allow programs that want to use gtk4 use the proper version of the gtk-update-icon-cache utility and the proper build and runtime dependencies. Also use a more readable syntax for conditional values in DEPENDS. Signed-off-by: Zoltán Böszörményi --- meta/classes/gtk-icon-cache.bbclass | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 0248ba285e..6808339b90 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -1,17 +1,22 @@ FILES:${PN} += "${datadir}/icons/hicolor" -#gtk+3 reqiure GTK3DISTROFEATURES, DEPENDS on it make all the +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 +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} \ - ${@['gdk-pixbuf', '']['${BPN}' == 'gdk-pixbuf']} \ - ${@['gtk+3', '']['${BPN}' == 'gtk+3']} \ - gtk+3-native \ +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 += "gtk+3-native gdk-pixbuf-native" +PACKAGE_WRITE_DEPS += "${GTKPN}-native gdk-pixbuf-native" gtk_icon_cache_postinst() { if [ "x$D" != "x" ]; then @@ -25,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 @@ -39,7 +44,7 @@ if [ "x$D" != "x" ]; then 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 @@ -58,13 +63,13 @@ python populate_packages:append () { 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 + #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 gtk+3 dependency to %s" % pkg) - rdepends = ' ' + d.getVar('MLPREFIX', False) + "gtk+3" + 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)