diff options
| author |   Marty E. Plummer <hanetzer@startmail.com> | 2019-01-01 16:19:13 -0600 |
|---|---|---|
| committer |   Mart Raudsepp <leio@gentoo.org> | 2019-02-11 19:13:56 +0200 |
| commit | 0d3868010666fe2ce95c307028b42d401da73d67 (patch) | |
| tree | 1e2f6d6789a951fdc5c2e5e9c8ebfd17fc7bf460 /eclass/xdg.eclass | |
| parent | gnome2-utils: move icon functions into xdg-utils (diff) | |
| download | gentoo-0d3868010666fe2ce95c307028b42d401da73d67.tar.gz gentoo-0d3868010666fe2ce95c307028b42d401da73d67.tar.bz2 gentoo-0d3868010666fe2ce95c307028b42d401da73d67.zip | |
gnome2.eclass: move icon handling code to xdg.eclass
Package-Manager: Portage-2.3.51, Repoman 2.3.11
Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'eclass/xdg.eclass')
| -rw-r--r-- | eclass/xdg.eclass | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass index 9ee771223dc0..5ed4739f86a2 100644 --- a/eclass/xdg.eclass +++ b/eclass/xdg.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xdg.eclass @@ -9,7 +9,7 @@ # @SUPPORTED_EAPIS: 4 5 6 # @BLURB: Provides phases for XDG compliant packages. # @DESCRIPTION: -# Utility eclass to update the desktop and shared mime info as laid +# Utility eclass to update the desktop, icon and shared mime info as laid # out in the freedesktop specs & implementations inherit xdg-utils @@ -40,9 +40,9 @@ xdg_src_prepare() { # @FUNCTION: xdg_pkg_preinst # @DESCRIPTION: -# Finds .desktop and mime info files for later handling in pkg_postinst. -# Locations are stored in XDG_ECLASS_DESKTOPFILES and XDG_ECLASS_MIMEINFOFILES -# respectively. +# Finds .desktop, icon and mime info files for later handling in pkg_postinst. +# Locations are stored in XDG_ECLASS_DESKTOPFILES, XDG_ECLASS_ICONFILES +# and XDG_ECLASS_MIMEINFOFILES respectively. xdg_pkg_preinst() { local f @@ -51,17 +51,22 @@ xdg_pkg_preinst() { XDG_ECLASS_DESKTOPFILES+=( ${f} ) done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 2>/dev/null) + XDG_ECLASS_ICONFILES=() + while IFS= read -r -d '' f; do + XDG_ECLASS_ICONFILES+=( ${f} ) + done < <(cd "${D}" && find 'usr/share/icons' -type f -print0 2>/dev/null) + XDG_ECLASS_MIMEINFOFILES=() while IFS= read -r -d '' f; do XDG_ECLASS_MIMEINFOFILES+=( ${f} ) done < <(cd "${D}" && find 'usr/share/mime' -type f -print0 2>/dev/null) - export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_MIMEINFOFILES + export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_ICONFILES XDG_ECLASS_MIMEINFOFILES } # @FUNCTION: xdg_pkg_postinst # @DESCRIPTION: -# Handle desktop and mime info database updates. +# Handle desktop, icon and mime info database updates. xdg_pkg_postinst() { if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then xdg_desktop_database_update @@ -69,6 +74,12 @@ xdg_pkg_postinst() { debug-print "No .desktop files to add to database" fi + if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then + xdg_icon_cache_update + else + debug-print "No icon files to add to cache" + fi + if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then xdg_mimeinfo_database_update else @@ -78,7 +89,7 @@ xdg_pkg_postinst() { # @FUNCTION: xdg_pkg_postrm # @DESCRIPTION: -# Handle desktop and mime info database updates. +# Handle desktop, icon and mime info database updates. xdg_pkg_postrm() { if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then xdg_desktop_database_update @@ -86,6 +97,12 @@ xdg_pkg_postrm() { debug-print "No .desktop files to add to database" fi + if [[ ${#XDG_ECLASS_ICONFILES[@]} -gt 0 ]]; then + xdg_icon_cache_update + else + debug-print "No icon files to add to cache" + fi + if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then xdg_mimeinfo_database_update else |