Re: [gentoo-dev] Patch make_desktop_entry to produce entries that validate better
On Sun, 2007-11-18 at 02:59 +0100, Daniel Pielmeier wrote: > I have attached an updated patch. Thanks, Daniel. The patch has been applied. -- Chris Gianelloni Release Engineering Strategic Lead Alpha/AMD64/x86 Architecture Teams Games Developer/Foundation Trustee Gentoo Foundation signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Patch make_desktop_entry to produce entries that validate better
Petteri Räty schrieb: Petteri Räty kirjoitti: Any objections to the attached patch: [EMAIL PROTECTED] ~ $ desktop-file-validate /usr/share/applications/jedit-jedit.desktop /usr/share/applications/jedit-jedit.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated /usr/share/applications/jedit-jedit.desktop: warning: value "" for key "Path" in group "Desktop Entry" does not look like an absolute path Regards, Petteri Hmm. Wrong patch attached. There are two other bugs (#197891, #181999) which are related to changes regarding the freedesktop specs. One for the Encoding key depreciation which you can see above too and one for the Icon key which should not specify a suffix if the value does not use the full path to the icon. These could be taken into consideration when desktop-file-utils-0.14 is stable on all archs. I have attached an updated patch. Regards, Daniel --- eutils.eclass 2007-11-18 02:06:50.0 +0100 +++ eutils.eclass 2007-11-18 02:32:44.0 +0100 @@ -741,7 +741,7 @@ local exec=${1} local name=${2:-${PN}} - local icon=${3:-${PN}.png} + local icon=${3:-${PN}} local type=${4} local path=${5} @@ -875,18 +875,18 @@ cat <<-EOF > "${desktop}" [Desktop Entry] - Encoding=UTF-8 Version=1.0 Name=${name} Type=Application Comment=${DESCRIPTION} Exec=${exec} TryExec=${exec%% *} - Path=${path} Icon=${icon} Categories=${type}; EOF + [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" + ( # wrap the env here so that the 'insinto' call # doesn't corrupt the env of the caller @@ -938,7 +938,6 @@ cat <<-EOF > "${desktop}" [Desktop Entry] - Encoding=UTF-8 Name=${title} Comment=This session logs you into ${title} Exec=${command}
Re: [gentoo-dev] Patch make_desktop_entry to produce entries that validate better
Petteri Räty kirjoitti: > Any objections to the attached patch: > > [EMAIL PROTECTED] ~ $ desktop-file-validate > /usr/share/applications/jedit-jedit.desktop > /usr/share/applications/jedit-jedit.desktop: warning: key "Encoding" in > group "Desktop Entry" is deprecated > /usr/share/applications/jedit-jedit.desktop: warning: value "" for key > "Path" in group "Desktop Entry" does not look like an absolute path > > Regards, > Petteri > Hmm. Wrong patch attached. Index: eutils.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v retrieving revision 1.292 diff -u -r1.292 eutils.eclass --- eutils.eclass 14 Oct 2007 21:55:35 - 1.292 +++ eutils.eclass 17 Nov 2007 22:53:28 - @@ -882,11 +882,12 @@ Comment=${DESCRIPTION} Exec=${exec} TryExec=${exec%% *} - Path=${path} Icon=${icon} Categories=${type}; EOF + [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" + ( # wrap the env here so that the 'insinto' call # doesn't corrupt the env of the caller signature.asc Description: OpenPGP digital signature
[gentoo-dev] Patch make_desktop_entry to produce entries that validate better
Any objections to the attached patch: [EMAIL PROTECTED] ~ $ desktop-file-validate /usr/share/applications/jedit-jedit.desktop /usr/share/applications/jedit-jedit.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated /usr/share/applications/jedit-jedit.desktop: warning: value "" for key "Path" in group "Desktop Entry" does not look like an absolute path Regards, Petteri --- /usr/portage/dev-util/desktop-file-utils/desktop-file-utils-0.10-r1.ebuild 2005-11-06 04:42:18.0 +0200 +++ desktop-file-utils-0.11.ebuild 2006-09-10 01:08:28.0 +0300 @@ -13,7 +13,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" -RDEPEND=">=dev-libs/glib-2.0.0 +RDEPEND=">=dev-libs/glib-2.6.0 >=dev-libs/popt-1.6.3" DEPEND="${RDEPEND} signature.asc Description: OpenPGP digital signature