From patchwork Thu May 26 10:39:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 12525 Received: (qmail 28213 invoked by uid 89); 26 May 2016 10:40:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=BAYES_00, LIKELY_SPAM_SUBJECT, RP_MATCHES_RCVD, SPF_PASS autolearn=no version=3.3.2 spammy=gif, Browser, Browse, Terminal X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00, LIKELY_SPAM_SUBJECT, RP_MATCHES_RCVD, SPF_PASS autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 26 May 2016 10:40:20 +0000 Received: from localhost ([::1]:37788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5siA-0006JA-4M for patchwork@sourceware.org; Thu, 26 May 2016 06:40:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5si3-0006Gp-EP for guix-devel@gnu.org; Thu, 26 May 2016 06:40:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5shu-0004iG-F4 for guix-devel@gnu.org; Thu, 26 May 2016 06:40:10 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:60549) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5shu-0004gk-7x for guix-devel@gnu.org; Thu, 26 May 2016 06:40:02 -0400 Received: from localhost (178.165.131.98.wireless.dyn.drei.com [178.165.131.98]) by dd1012.kasserver.com (Postfix) with ESMTPSA id B16F61CA04A8 for ; Thu, 26 May 2016 12:39:56 +0200 (CEST) Date: Thu, 26 May 2016 12:39:52 +0200 From: Danny Milosavljevic To: guix-devel@gnu.org Subject: Fw: bug#23094: [PATCHv2] Re: bug#23094: icecat is missing a desktop file Message-ID: <20160526123952.7db75498@scratchpost.org> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-unknown-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 85.13.128.8 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" Begin forwarded message: Date: Sat, 16 Apr 2016 20:15:16 +0200 From: Danny Milosavljevic To: 23094@debbugs.gnu.org Subject: bug#23094: [PATCHv2] Re: bug#23094: icecat is missing a desktop file 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