From 3158adbe684890adc56af11e19af872e90e09d41 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 24 Jun 2019 17:27:11 +0100 Subject: gtk-icon-cache: rename intercept to update_gtk_icon_cache The intercept is called update_icon_cache which is vague: rename to update_gtk_icon_cache to make it clearer what it is for, and add a comment explaining what class caused it to be used. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/gtk-icon-cache.bbclass | 4 ++-- scripts/postinst-intercepts/update_gtk_icon_cache | 17 +++++++++++++++++ scripts/postinst-intercepts/update_icon_cache | 16 ---------------- 3 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 scripts/postinst-intercepts/update_gtk_icon_cache delete mode 100644 scripts/postinst-intercepts/update_icon_cache diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 66fe781bd2..91cb4ad409 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -6,7 +6,7 @@ PACKAGE_WRITE_DEPS += "gtk+3-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_native=${libdir_native} else @@ -24,7 +24,7 @@ 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} else diff --git a/scripts/postinst-intercepts/update_gtk_icon_cache b/scripts/postinst-intercepts/update_gtk_icon_cache new file mode 100644 index 0000000000..99367a2855 --- /dev/null +++ b/scripts/postinst-intercepts/update_gtk_icon_cache @@ -0,0 +1,17 @@ +#!/bin/sh +# +# SPDX-License-Identifier: MIT +# +# Post-install intercept for gtk-icon-cache.bbclass + +set -e + +# Update native pixbuf loaders +$STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache + +for icondir in $D/usr/share/icons/*/ ; do + if [ -d $icondir ] ; then + gtk-update-icon-cache -fqt $icondir + fi +done + diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_icon_cache deleted file mode 100644 index 212209a9da..0000000000 --- a/scripts/postinst-intercepts/update_icon_cache +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# SPDX-License-Identifier: MIT -# - -set -e - -# update native pixbuf loaders -$STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache - -for icondir in $D/usr/share/icons/*/ ; do - if [ -d $icondir ] ; then - gtk-update-icon-cache -fqt $icondir - fi -done - -- cgit 1.2.3-korg