diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2007-05-01 12:29:25 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2007-05-01 12:29:25 +0000 |
| commit | 6980c7ea178afc01f2fc51bc13feb1bea3b2db2c (patch) | |
| tree | 740115f7123a27121005218ad5bedb91c795f7f5 /eclass/kde-functions.eclass | |
| parent | Removed explicit java CLASSPATH and added the friendly java folks to metadata... (diff) | |
| download | historical-6980c7ea178afc01f2fc51bc13feb1bea3b2db2c.tar.gz historical-6980c7ea178afc01f2fc51bc13feb1bea3b2db2c.tar.bz2 historical-6980c7ea178afc01f2fc51bc13feb1bea3b2db2c.zip | |
Deal a bit more selective with KDE legacy desktop entry path handling.
Diffstat (limited to 'eclass/kde-functions.eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 61ad43f7e380..638017a9c36c 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.151 2007/04/23 19:35:05 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.152 2007/05/01 12:29:25 carlo Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -911,10 +911,10 @@ postprocess_desktop_entries() { [[ $EBUILD_PHASE != preinst ]] && [[ $EBUILD_PHASE != install ]] && \ die "postprocess_desktop_entries() has to be called in src_install() or pkg_preinst()." - # Only third party apps, KDE 3.x isn't so basedir spec compliant... - if [[ -z ${KDEBASE} ]] ; then - local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -name '*.desktop' \ - -not -path '*.hidden*' 2>/dev/null)" + if [[ -d ${D}${PREFIX}/share/applnk ]] ; then + # min/max depth is _important_ as it excludes legacy KDE stuff. Moving it would cause breakage. + local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -mindepth 2 -maxdepth 2 \ + -name '*\.desktop' -not -path '*.hidden*' 2>/dev/null)" if [[ -n ${desktop_entries} ]]; then for entry in ${desktop_entries} ; do |