From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: bug#23094: [PATCHv2] Re: bug#23094: icecat is missing a desktop file Date: Sat, 16 Apr 2016 20:15:16 +0200 Message-ID: <20160416201516.7aeb07d7@scratchpost.org> References: <20160322202004.7e9de603@scratchpost.org> <20160410120404.0a37366e@scratchpost.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1arUlL-0003xI-7h for bug-guix@gnu.org; Sat, 16 Apr 2016 14:16:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1arUlG-0004DF-7B for bug-guix@gnu.org; Sat, 16 Apr 2016 14:16:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1arUlG-0004DA-3l for bug-guix@gnu.org; Sat, 16 Apr 2016 14:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1arUlG-0002AX-0a for bug-guix@gnu.org; Sat, 16 Apr 2016 14:16:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20160410120404.0a37366e@scratchpost.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 23094@debbugs.gnu.org Any news on this? I just got a merge conflict so I was reminded of it again... The current version of the patch that I'm successfully using is below - although I still can't get the version number into the installation lambda. diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1ae97b2..96d32a1 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -501,7 +501,46 @@ standards.") (format #t "configure flags: ~s~%" flags) (zero? (apply system* bash (string-append srcdir "/configure") - flags)))))))) + flags))))) + (add-after + 'install + 'install-desktop-entry + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (applications (string-append out "/share/applications"))) + (mkdir-p applications) + (call-with-output-file (string-append applications "/icecat.desktop") + (lambda (port) + (format port "~ +[Desktop Entry]~@ +Version=1.0~@ +Name=GNU IceCat~@ +GenericName=Web Browser~@ +Comment=Browse the World Wide Web~@ +Keywords=Internet;WWW;Browser;Web~@ +Exec=~a/bin/icecat %u~@ +Terminal=false~@ +X-MultipleArgs=false~@ +Type=Application~@ +Icon=~a/lib/icecat-~a/browser/icons/mozicon128.png~@ +Categories=GNOME;GTK;Network;WebBrowser;~@ +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;~@ +StartupNotify=true~@ +Actions=NewWindow;NewPrivateWindow~@ +~@ +[Desktop Action NewWindow]~@ +Name=Open a New Window~@ +Exec=~a/bin/icecat --new-window~@ +~@ +[Desktop Action NewPrivateWindow]~@ +Name=Open a New Private Window~@ +Exec=~a/bin/icecat -private-window~@ +" + out + out + (string-drop-right "38.7.1-gnu1" (string-length "-gnu1")) ; FIXME do not hardcode + out + out))))))))) (home-page "http://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") (description