gtk-icon-cache.bbclass: use postinst_intercept script
Since the hook has been made a standalone script, use postinst_intercept script in order to "link" the package to the hook. (From OE-Core rev: d7ddae84165b5b84dc6ac640fd492ade891ddd4e) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5bb362a0ba
commit
ceabaf6265
|
@ -2,23 +2,15 @@ FILES_${PN} += "${datadir}/icons/hicolor"
|
|||
|
||||
DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk+-native"
|
||||
|
||||
#
|
||||
# On host, the postinstall MUST return 1 because we do not know if the intercept
|
||||
# hook will succeed. If it does succeed, than the packages will be marked as
|
||||
# installed.
|
||||
#
|
||||
gtk_icon_cache_postinst() {
|
||||
if [ "x$D" != "x" ]; then
|
||||
if [ ! -f $INTERCEPT_DIR/update_icon_cache ]; then
|
||||
cat << "EOF" > $INTERCEPT_DIR/update_icon_cache
|
||||
#!/bin/sh
|
||||
|
||||
# update native pixbuf loaders
|
||||
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
|
||||
EOF
|
||||
fi
|
||||
exit 0
|
||||
$INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG}
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Update the pixbuf loaders in case they haven't been registered yet
|
||||
|
@ -33,21 +25,8 @@ done
|
|||
|
||||
gtk_icon_cache_postrm() {
|
||||
if [ "x$D" != "x" ]; then
|
||||
if [ ! -f $INTERCEPT_DIR/update_icon_cache ]; then
|
||||
cat << "EOF" > $INTERCEPT_DIR/update_icon_cache
|
||||
#!/bin/sh
|
||||
|
||||
# update native pixbuf loaders
|
||||
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
|
||||
EOF
|
||||
fi
|
||||
exit 0
|
||||
$INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG}
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for icondir in /usr/share/icons/* ; do
|
||||
|
|
Loading…
Reference in New Issue