* [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass
@ 2010-02-26 3:15 99% Jonathan Callen (abcd)
0 siblings, 0 replies; 1+ results
From: Jonathan Callen (abcd) @ 2010-02-26 3:15 UTC (permalink / raw
To: gentoo-commits
abcd 10/02/26 03:15:27
Modified: eutils.eclass
Log:
Properly implement the Desktop File Specification in make_desktop_entry()
Revision Changes Path
1.334 eclass/eutils.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.334&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.334&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?r1=1.333&r2=1.334
Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- eutils.eclass 17 Feb 2010 17:10:23 -0000 1.333
+++ eutils.eclass 26 Feb 2010 03:15:26 -0000 1.334
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.333 2010/02/17 17:10:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.334 2010/02/26 03:15:26 abcd Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@@ -961,6 +961,7 @@
news) type=News;;
nntp) type=News;;
p2p) type=FileTransfer;;
+ voip) type=Telephony;;
*) type=;;
esac
type="Network;${type}"
@@ -979,7 +980,7 @@
visual*) type=DataVisualization;;
*) type=;;
esac
- type="Science;${type}"
+ type="Education;Science;${type}"
;;
sys)
@@ -991,7 +992,7 @@
client) type=WebBrowser;;
*) type=;;
esac
- type="Network"
+ type="Network;${type}"
;;
*)
@@ -1007,6 +1008,17 @@
local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
#local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
+ # Don't append another ";" when a valid category value is provided.
+ type=${type%;}${type:+;}
+
+ eshopts_push -s extglob
+ if [[ -n ${icon} && ${icon} != /* && ${icon} == *.@(xpm|png|svg) ]]; then
+ ewarn "As described in the Icon Theme Specification, icon file extensions are not"
+ ewarn "allowed in .desktop files if the value is not an absolute path."
+ icon=${icon%.@(xpm|png|svg)}
+ fi
+ eshopts_pop
+
cat <<-EOF > "${desktop}"
[Desktop Entry]
Name=${name}
@@ -1015,7 +1027,7 @@
Exec=${exec}
TryExec=${exec%% *}
Icon=${icon}
- Categories=${type};
+ Categories=${type}
EOF
[[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2010-02-26 3:15 99% [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass Jonathan Callen (abcd)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox