From patchwork Thu May 30 08:17:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 14160 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 01D051704D; Thu, 30 May 2019 09:18:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BA57D1700C for ; Thu, 30 May 2019 09:18:08 +0100 (BST) Received: from localhost ([127.0.0.1]:49000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWGGG-0007BD-8o for patchwork@mira.cbaines.net; Thu, 30 May 2019 04:18:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWGGC-00079c-Si for guix-patches@gnu.org; Thu, 30 May 2019 04:18:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWGGB-0003qo-W4 for guix-patches@gnu.org; Thu, 30 May 2019 04:18:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWGGB-0003qf-S7 for guix-patches@gnu.org; Thu, 30 May 2019 04:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hWGGB-0006kg-Kj for guix-patches@gnu.org; Thu, 30 May 2019 04:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36000] [PATCH 2/4] gnu: emacs-exwm: Use make-desktop-entry-file. References: <20190530071138.31690-1-mail@ambrevar.xyz> In-Reply-To: <20190530071138.31690-1-mail@ambrevar.xyz> Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2019 08:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36000 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36000@debbugs.gnu.org Received: via spool by 36000-submit@debbugs.gnu.org id=B36000.155920426725913 (code B ref 36000); Thu, 30 May 2019 08:18:03 +0000 Received: (at 36000) by debbugs.gnu.org; 30 May 2019 08:17:47 +0000 Received: from localhost ([127.0.0.1]:60712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWGFv-0006jo-Hh for submit@debbugs.gnu.org; Thu, 30 May 2019 04:17:47 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:32861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWGFr-0006jJ-P2 for 36000@debbugs.gnu.org; Thu, 30 May 2019 04:17:45 -0400 X-Originating-IP: 92.169.116.19 Received: from localhost.localdomain (lfbn-1-4117-19.w92-169.abo.wanadoo.fr [92.169.116.19]) (Authenticated sender: mail@ambrevar.xyz) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 2AB131C0004 for <36000@debbugs.gnu.org>; Thu, 30 May 2019 08:17:38 +0000 (UTC) From: Pierre Neidhardt Date: Thu, 30 May 2019 10:17:26 +0200 Message-Id: <20190530081728.27140-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-exwm)[arguments]: Do it. --- gnu/packages/emacs-xyz.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9199b45e40..fed92528c3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7498,15 +7498,12 @@ It should enable you to implement low-level X11 applications.") ;; Add a .desktop file to xsessions (mkdir-p xsessions) (mkdir-p bin) - (with-output-to-file - (string-append xsessions "/exwm.desktop") - (lambda _ - (format #t "[Desktop Entry]~@ - Name=~a~@ - Comment=~a~@ - Exec=~a~@ - TryExec=~:*~a~@ - Type=Application~%" ,name ,synopsis exwm-executable))) + (make-desktop-entry-file + (string-append xsessions "/exwm.desktop") + #:name ,name + #:comment ,synopsis + #:exec exwm-executable + #:try-exec exwm-executable) ;; Add a shell wrapper to bin (with-output-to-file exwm-executable (lambda _ From patchwork Thu May 30 08:17:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 14159 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 59A8B1704D; Thu, 30 May 2019 09:18:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0F4601700C for ; Thu, 30 May 2019 09:18:08 +0100 (BST) Received: from localhost ([127.0.0.1]:48998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWGGF-0007Ao-Gs for patchwork@mira.cbaines.net; Thu, 30 May 2019 04:18:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWGGC-00079b-Gz for guix-patches@gnu.org; Thu, 30 May 2019 04:18:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWGGB-0003qR-DF for guix-patches@gnu.org; Thu, 30 May 2019 04:18:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47169) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWGGB-0003qH-9g for guix-patches@gnu.org; Thu, 30 May 2019 04:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hWGGB-0006kZ-4A for guix-patches@gnu.org; Thu, 30 May 2019 04:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36000] [PATCH 3/4] gnu: tome4: Use make-desktop-entry-file. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2019 08:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36000 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36000@debbugs.gnu.org Received: via spool by 36000-submit@debbugs.gnu.org id=B36000.155920426725907 (code B ref 36000); Thu, 30 May 2019 08:18:03 +0000 Received: (at 36000) by debbugs.gnu.org; 30 May 2019 08:17:47 +0000 Received: from localhost ([127.0.0.1]:60710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWGFv-0006jh-6d for submit@debbugs.gnu.org; Thu, 30 May 2019 04:17:47 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:59261) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWGFr-0006jI-M4 for 36000@debbugs.gnu.org; Thu, 30 May 2019 04:17:44 -0400 X-Originating-IP: 92.169.116.19 Received: from localhost.localdomain (lfbn-1-4117-19.w92-169.abo.wanadoo.fr [92.169.116.19]) (Authenticated sender: mail@ambrevar.xyz) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 637FF1C0009 for <36000@debbugs.gnu.org>; Thu, 30 May 2019 08:17:39 +0000 (UTC) From: Pierre Neidhardt Date: Thu, 30 May 2019 10:17:27 +0200 Message-Id: <20190530081728.27140-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530081728.27140-1-mail@ambrevar.xyz> References: <20190530081728.27140-1-mail@ambrevar.xyz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (tome4)[arguments]: Do it. --- gnu/packages/games.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4fdc9b01e6..af875435d6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5035,19 +5035,13 @@ Crowther & Woods, its original authors, in 1995. It has been known as (copy-recursively "game" (string-append data "/game")) ;; launcher (mkdir-p applications) - (with-output-to-file (string-append applications "/" - ,name ".desktop") - (lambda () - (display - (string-append - "[Desktop Entry] -Name=ToME4 -Comment=" ,synopsis "\n" -"Exec=" ,name "\n" -"Icon=" icon "\n" -"Terminal=false -Type=Application -Categories=Game;RolePlaying;\n"))))) + (make-desktop-entry-file + (string-append applications "/" ,name ".desktop") + #:name "ToME4" + #:comment ,synopsis + #:exec ,name + #:icon icon + #:categories '("Game" "RolePlaying"))) #t))))) (home-page "https://te4.org") (description "Tales of Maj’Eyal (ToME) RPG, featuring tactical turn-based From patchwork Thu May 30 08:17:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 14158 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7A4D21704D; Thu, 30 May 2019 09:18:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 193EF1700C for ; Thu, 30 May 2019 09:18:07 +0100 (BST) Received: from localhost ([127.0.0.1]:48994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWGGE-0007A1-8p for patchwork@mira.cbaines.net; Thu, 30 May 2019 04:18:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWGGB-00079a-Tb for guix-patches@gnu.org; Thu, 30 May 2019 04:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWGGA-0003q1-Ut for guix-patches@gnu.org; Thu, 30 May 2019 04:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47168) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWGGA-0003pq-RZ for guix-patches@gnu.org; Thu, 30 May 2019 04:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hWGGA-0006kR-B0 for guix-patches@gnu.org; Thu, 30 May 2019 04:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36000] [PATCH 4/4] gnu: drascula: Use make-desktop-entry-file. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2019 08:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36000 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36000@debbugs.gnu.org Received: via spool by 36000-submit@debbugs.gnu.org id=B36000.155920426725900 (code B ref 36000); Thu, 30 May 2019 08:18:02 +0000 Received: (at 36000) by debbugs.gnu.org; 30 May 2019 08:17:47 +0000 Received: from localhost ([127.0.0.1]:60708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWGFu-0006je-Q3 for submit@debbugs.gnu.org; Thu, 30 May 2019 04:17:47 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:39083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWGFr-0006jH-M4 for 36000@debbugs.gnu.org; Thu, 30 May 2019 04:17:44 -0400 X-Originating-IP: 92.169.116.19 Received: from localhost.localdomain (lfbn-1-4117-19.w92-169.abo.wanadoo.fr [92.169.116.19]) (Authenticated sender: mail@ambrevar.xyz) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 95ED01C0008 for <36000@debbugs.gnu.org>; Thu, 30 May 2019 08:17:39 +0000 (UTC) From: Pierre Neidhardt Date: Thu, 30 May 2019 10:17:28 +0200 Message-Id: <20190530081728.27140-3-mail@ambrevar.xyz> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530081728.27140-1-mail@ambrevar.xyz> References: <20190530081728.27140-1-mail@ambrevar.xyz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (drascula)[arguments]: Do it. --- gnu/packages/games.scm | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index af875435d6..94a44f0fc1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7276,22 +7276,18 @@ on items and player adaptability for character progression.") ;; game, so we borrow SCUMMVM's. (let ((apps (string-append out "/share/applications"))) (mkdir-p apps) - (with-output-to-file (string-append apps "/drascula.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=Drascula: The Vampire Strikes Back~@ - GenericName=Drascula~@ - Exec=~a/bin/drascula~@ - Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@ - Categories=AdventureGame;Game;RolePlaying;~@ - Keywords=game;adventure;roleplaying;2D,fantasy;~@ - Comment=Classic 2D point and click adventure game~@ - Comment[de]=klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier~@ - Comment[fr]=Jeux classique d'aventure pointer-et-cliquer en 2D~@ - Comment[it]=Gioco classico di avventura punta e clicca 2D~@ - Type=Application~%" - out scummvm)))) + (make-desktop-entry-file + (string-append apps "/drascula.desktop") + #:name "Drascula: The Vampire Strikes Back" + #:generic-name "Drascula" + #:exec (string-append out "/bin/drascula") + #:icon (string-append scummvm "/share/icons/hicolor/scalable/apps/scummvm.svg") + #:categories '("AdventureGame" "Game" "RolePlaying") + #:keywords '("game" "adventure" "roleplaying" "2D" "fantasy") + #:comment '((#f "Classic 2D point and click adventure game") + ("de" "Klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier") + ("fr" "Jeu classique d'aventure pointer-et-cliquer en 2D") + ("it" "Gioco classico di avventura punta e clicca 2D")))) #t)))) (native-inputs `(("bash" ,bash)