--- trunk/include/xfce.sminc 2013/01/28 09:10:20 16173 +++ trunk/include/xfce.sminc 2014/10/21 11:32:06 22510 @@ -11,7 +11,7 @@ >= dev-util/intltool-0.40 >= sys-dev/gettext-0.17" -sminclude mtools +sminclude mtools gtk2 fdo-mime case ${PNAME} in thunar-*-plugin) URISUBDIR="thunar-plugins" ;; @@ -30,7 +30,7 @@ ) # special functions needed by postinstall|postremove -SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} xfce_update_desktop_db xfce_update_mime_db xfce_update_icon_cache xfce_postinstall xfce_postremove" +SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} xfce_postinstall xfce_postremove" xfce_configure() { @@ -79,61 +79,18 @@ done } -xfce_update_desktop_db() -{ - # update desktop db - if [ -x ${MROOT}/usr/bin/update-desktop-database ] - then - echo "Updating desktop mime database ..." - ${MROOT}/usr/bin/update-desktop-database -q ${MROOT}/usr/share/applications - fi -} - -xfce_update_mime_db() -{ - # update mime db - if [ -x ${MROOT}/usr/bin/update-mime-database ] - then - echo "Updating shared mime info database ..." - ${MROOT}/usr/bin/update-mime-database ${MROOT}/usr/share/mime - fi -} - -xfce_update_icon_cache() -{ - if [ -x ${MROOT}/usr/bin/gtk-update-icon-cache ] - then - pushd ${BUILDDIR}/${PKGNAME}/binfiles &> /dev/null - local icons=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) - popd &> /dev/null - - # abort here, if no icons where found - [[ -z ${icons} ]] && return - - echo "Updating icons cache ..." - local i - for i in ${icons} - do - if [[ -f ${MROOT}/${i}/index.theme ]] - then - ${MROOT}/usr/bin/gtk-update-icon-cache -qf ${MROOT}/${i} - fi - done - fi -} - xfce_postinstall() { - xfce_update_desktop_db - xfce_update_mime_db - xfce_update_icon_cache + fdo-mime_update_desktop_db + fdo-mime_update_mime_db + gtk2_update_icon_cache } xfce_postremove() { - xfce_update_desktop_db - xfce_update_mime_db - xfce_update_icon_cache + fdo-mime_update_desktop_db + fdo-mime_update_mime_db + gtk2_update_icon_cache } export_inherits xfce src_prepare src_compile src_check src_install postinstall postremove