gtk-icon-cache.bbclass: Remove '-' characters from function names fixing issues with recent bitbakes (from poky)

1 files changed, 8 insertions, 4 deletions

diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index b86562890a..b256365175 100644
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -3,14 +3,18 @@ RDEPENDS += "hicolor-icon-theme"
 
 # This could run on the host as icon cache files are architecture independent,
 # but there is no gtk-update-icon-cache built natively.
-gtk-icon-cache_postinst() {
+gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
         exit 1
 fi
+
+# Update the pixbuf loaders in case they haven't been registered yet
+gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+
 gtk-update-icon-cache -q /usr/share/icons/hicolor
 }
 
-gtk-icon-cache_postrm() {
+gtk_icon_cache_postrm() {
 gtk-update-icon-cache -q /usr/share/icons/hicolor
 }
 
@@ -29,13 +33,13 @@ python populate_packages_append () {
 		postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
 		if not postinst:
 			postinst = '#!/bin/sh\n'
-		postinst += bb.data.getVar('gtk-icon-cache_postinst', d, 1)
+		postinst += bb.data.getVar('gtk_icon_cache_postinst', d, 1)
 		bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 
 		postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1)
 		if not postrm:
 			postrm = '#!/bin/sh\n'
-		postrm += bb.data.getVar('gtk-icon-cache_postrm', d, 1)
+		postrm += bb.data.getVar('gtk_icon_cache_postrm', d, 1)
 		bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
 }