diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2007-05-28 19:09:30 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2007-05-28 19:09:30 +0000 |
| commit | 27d5e549d9f38b5c299786ae0ba605f3303e9762 (patch) | |
| tree | 2da82dddbe1676541458c57ec9fc6248ef682941 /eclass/kde-functions.eclass | |
| parent | fixed mirror:// in SRC_URI (diff) | |
| download | historical-27d5e549d9f38b5c299786ae0ba605f3303e9762.tar.gz historical-27d5e549d9f38b5c299786ae0ba605f3303e9762.tar.bz2 historical-27d5e549d9f38b5c299786ae0ba605f3303e9762.zip | |
Added the proposed patch from bug 180057.
Diffstat (limited to 'eclass/kde-functions.eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 596a4a988a25..b3e0e603adaa 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.153 2007/05/28 00:45:33 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.154 2007/05/28 19:09:30 philantrop Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -916,11 +916,20 @@ postprocess_desktop_entries() { local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -mindepth 2 -maxdepth 2 \ -name '*\.desktop' -not -path '*.hidden*' 2>/dev/null)" + local uninstall_file="[Desktop Entry] +Encoding=UTF-8 +Hidden=true" + if [[ -n ${desktop_entries} ]]; then for entry in ${desktop_entries} ; do - if [[ ! -f ${D}${PREFIX}/share/applications/kde/$(basename ${entry}) ]]; then - dodir ${PREFIX}/share/applications/kde - mv ${entry} ${D}${PREFIX}/share/applications/kde + echo "$uninstall_file" | diff -qs ${entry} - &> /dev/null + if [[ "$?" != "0" ]]; then + if [[ ! -f ${D}${PREFIX}/share/applications/kde/$(basename ${entry}) ]]; then + dodir ${PREFIX}/share/applications/kde + mv ${entry} ${D}${PREFIX}/share/applications/kde + else + ewarn "QA: $(basename ${entry}) already exists in ${PREFIX}/share/applications/kde." + fi fi done fi |