From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IubnK-0003KA-4s for garchives@archives.gentoo.org; Tue, 20 Nov 2007 22:42:14 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id lAKMg53r000603; Tue, 20 Nov 2007 22:42:05 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id lAKMfqjn032653 for ; Tue, 20 Nov 2007 22:42:04 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 4DF7566031 for ; Tue, 20 Nov 2007 22:32:04 +0000 (UTC) Received: from wolf31o2 by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IubdS-0008Ai-JP for gentoo-commits@lists.gentoo.org; Tue, 20 Nov 2007 22:32:02 +0000 From: "Chris Gianelloni (wolf31o2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, wolf31o2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: eutils.eclass X-VCS-Directories: eclass X-VCS-Committer: wolf31o2 X-VCS-Committer-Name: Chris Gianelloni Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Chris Gianelloni Date: Tue, 20 Nov 2007 22:32:02 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: ff34357a-f72c-4ff7-9e1f-b49505d650ad X-Archives-Hash: b4158ec01efc01bc1939b5b23caadf0d wolf31o2 07/11/20 22:32:02 Modified: eutils.eclass Log: Added a couple minor fixes for make_desktop_entry to clean it up, per discussion on the gentoo-dev mailing list. This closes bug #181999 and bug #197891. Thanks to Carsten Lohrke , Samuli Suominen . Revision Changes Path 1.293 eclass/eutils.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.293&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.293&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?r1=1.292&r2=1.293 Index: eutils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v retrieving revision 1.292 retrieving revision 1.293 diff -u -r1.292 -r1.293 --- eutils.eclass 14 Oct 2007 21:55:35 -0000 1.292 +++ eutils.eclass 20 Nov 2007 22:32:01 -0000 1.293 @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.292 2007/10/14 21:55:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.293 2007/11/20 22:32:01 wolf31o2 Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -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} -- gentoo-commits@gentoo.org mailing list