From patchwork Mon Mar 21 17:43:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37981 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 409F827BBEA; Mon, 21 Mar 2022 17:45:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B720527BBE9 for ; Mon, 21 Mar 2022 17:45:30 +0000 (GMT) Received: from localhost ([::1]:36938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWM5x-0001UR-Le for patchwork@mira.cbaines.net; Mon, 21 Mar 2022 13:45:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWM4a-0001Pr-31 for guix-patches@gnu.org; Mon, 21 Mar 2022 13:44:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWM4Z-0005xb-8j for guix-patches@gnu.org; Mon, 21 Mar 2022 13:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nWM4Z-0006XA-6L for guix-patches@gnu.org; Mon, 21 Mar 2022 13:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54508] [PATCH 2/2] gnu: emacs-gnugo: Patch 'gnugo-program' variable. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Mar 2022 17:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54508@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 54508-submit@debbugs.gnu.org id=B54508.164788463525076 (code B ref 54508); Mon, 21 Mar 2022 17:44:03 +0000 Received: (at 54508) by debbugs.gnu.org; 21 Mar 2022 17:43:55 +0000 Received: from localhost ([127.0.0.1]:38135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWM4Q-0006WO-NL for submit@debbugs.gnu.org; Mon, 21 Mar 2022 13:43:55 -0400 Received: from mail-qk1-f176.google.com ([209.85.222.176]:40795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWM4N-0006W9-Tj for 54508@debbugs.gnu.org; Mon, 21 Mar 2022 13:43:53 -0400 Received: by mail-qk1-f176.google.com with SMTP id i65so6406896qkd.7 for <54508@debbugs.gnu.org>; Mon, 21 Mar 2022 10:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e7RkeTVtMcpKq0m0+kW7hZZj6KgPqzCd2QBzm1aAgMA=; b=LE1VZluzXBpZRWgMXZLhP3QkjevjgrMZiaoT7wQLhb4qM3wC6FsOQX+ZbQqEHpcSsZ L7ajLQ3o+IJA3lHgMazhmgSagVZhR6e7li2RWfnfaStQscK+xrV0j3zf2hBwIYB7n336 bR+rYeXmM+BfB5Ei3eyiQeGaCRzNQWMAFYmdS+oMcaAwe+Xo37JohXF048SORNJxHmlr Wh5jDZVLODp1Joq3xqVF4an8vawUR37+UEyIfcpryyFWrmA05Hi6IDEFon0/arDl0YK4 69XjcQG8jmkluwn7N7mY7d/4OZp0MwMymY+dDN1o5ciGv5Q786a1/CU6e1Ata41cBeoW tGnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e7RkeTVtMcpKq0m0+kW7hZZj6KgPqzCd2QBzm1aAgMA=; b=1iw9X1ApCNThpXZH2bBc22MDDMFm2uQsL4xBmRIrC7+E0wnYFj2sBMT7hvZ75WwKN8 Qi7/1395IgG9RbO/rpNTg5U4x8/uNvOGTyIryjWlvw/ImtG9zIafDNwDXF3V55+rip9P 2u2efdxdcWCvATplbJvc3thv7N8eEwxwWCcz7lEPPtAdO7TvryUJ87w35PYm6YOzibnK oxd1k7XMbsL8otaOTLYcHGQovbMtuu3cm4Y3hZzUpoKaehb2Znr4sGwcKGnheQnvUzPZ MTLkXe4dAY8jhXp2lZaqaErJW8ucGxisitphbVRQ9fC9UdwuG4hTjcyC0+92izhMSiUt C+ng== X-Gm-Message-State: AOAM533bFqAxhTsSXOpGBlrg05kzQM3SJWCHHc0BAAfw6UoBG+M5T+/p 0hIaKnqViyd0/I8U5rcn/6NSjVzFnWI= X-Google-Smtp-Source: ABdhPJxYINFG7/D/7t5r2Kq95TMwhaXeGmu/DKy3Xi+jjotOmn2PSp2wTP/PdaGdUyoujUzQbpfRIw== X-Received: by 2002:a37:5c3:0:b0:67b:3187:d13 with SMTP id 186-20020a3705c3000000b0067b31870d13mr13147688qkf.41.1647884626206; Mon, 21 Mar 2022 10:43:46 -0700 (PDT) Received: from localhost.localdomain (dsl-10-148-199.b2b2c.ca. [72.10.148.199]) by smtp.gmail.com with ESMTPSA id f206-20020a379cd7000000b0067e620f0d1dsm4479940qke.129.2022.03.21.10.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 10:43:45 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 21 Mar 2022 13:43:15 -0400 Message-Id: <20220321174315.15097-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220321174315.15097-1-maxim.cournoyer@gmail.com> References: <20220321174315.15097-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-gnugo) [phases]{configure-default-gnugo-xpms-variable}: Rename to... {configure}: ... this. Patch the 'gnugo-program' variable. [inputs]: Add gnugo. [description]: Describe basic usage entry points. --- gnu/packages/emacs-xyz.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 42fc13f4c2..167d706c05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Mike Gerwitz -;;; Copyright © 2017, 2018, 2019, 2020, 2021 Maxim Cournoyer +;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee ;;; Copyright © 2018, 2019 Mathieu Lirzin ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt @@ -157,6 +157,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages emacs) #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages games) #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages gtk) @@ -14752,20 +14753,23 @@ (define-public emacs-gnugo "138gzdyi8scqimvs49da66j8f5a43bhgpasn1bxzdj2zffwlwp6g")))) (build-system emacs-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'configure-default-gnugo-xpms-variable - (lambda _ - (substitute* "gnugo.el" - (("defvar gnugo-xpms nil") - "defvar gnugo-xpms #'gnugo-imgen-create-xpms")) - #t))))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "gnugo.el" + ("gnugo-xpms" "#'gnugo-imgen-create-xpms" (as-display)) + ("gnugo-program" (search-input-file inputs "/bin/gnugo")))))))) + (inputs (list gnugo)) (propagated-inputs (list emacs-ascii-art-to-unicode emacs-xpm)) (home-page "https://elpa.gnu.org/packages/gnugo.html") (synopsis "Emacs major mode for playing GNU Go") - (description "This package provides an Emacs based interface for GNU Go. -It has a graphical mode where the board and stones are drawn using XPM images -and supports the use of a mouse.") + (description "This package provides an Emacs based interface for GNU Go, +which can be started via @samp{M-x gnugo}. It has a graphical mode where the +board and stones are drawn using XPM images and supports the use of a mouse. +You can switch to the graphical mode by running @samp{M-x +gnugo-image-display-mode}.") (license license:gpl3+))) (define-public emacs-gnuplot