[oe-commits] org.oe.dev gtk-icon-cache.bbclass: Remove '-' characters from function names fixing issues with recent bitbakes (from poky)

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 055be03147b7936adcf742bba759266ded7ebe54
ViewMTN: http://monotone.openembedded.org/revision/info/055be03147b7936adcf742bba759266ded7ebe54
Files:
1
classes/gtk-icon-cache.bbclass
Diffs:

#
# mt diff -rf92eb79f152085d0d4a1f62158c173044bb127eb -r055be03147b7936adcf742bba759266ded7ebe54
#
#
#
# patch "classes/gtk-icon-cache.bbclass"
#  from [75b805566ae03614fdfdd691b5b9542ed54bf96c]
#    to [328279a52c22c9296f097b015b4b3579453ab3c4]
#
============================================================
--- classes/gtk-icon-cache.bbclass	75b805566ae03614fdfdd691b5b9542ed54bf96c
+++ classes/gtk-icon-cache.bbclass	328279a52c22c9296f097b015b4b3579453ab3c4
@@ -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)
 }