From patchwork Fri Oct 28 09:04:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 44168 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 540A727BBEB; Fri, 28 Oct 2022 10:05:25 +0100 (BST) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 32B2E27BBEA for ; Fri, 28 Oct 2022 10:05:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooLIX-0001rN-FX; Fri, 28 Oct 2022 05:05:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ooLIU-0001oc-S5 for guix-patches@gnu.org; Fri, 28 Oct 2022 05:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ooLIU-0004hz-Gs for guix-patches@gnu.org; Fri, 28 Oct 2022 05:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ooLIT-0002Ws-V0 for guix-patches@gnu.org; Fri, 28 Oct 2022 05:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58831] [PATCH] gnu: emacs-tmr: Update arguments and license. Resent-From: Aleksandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Oct 2022 09:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58831 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58831@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16669478719681 (code B ref -1); Fri, 28 Oct 2022 09:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Oct 2022 09:04:31 +0000 Received: from localhost ([127.0.0.1]:60377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooLHz-0002W4-6e for submit@debbugs.gnu.org; Fri, 28 Oct 2022 05:04:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:34534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooLHx-0002Vx-Of for submit@debbugs.gnu.org; Fri, 28 Oct 2022 05:04:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ooLHh-0001EX-BC for guix-patches@gnu.org; Fri, 28 Oct 2022 05:04:21 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ooLHd-0004c6-Um for guix-patches@gnu.org; Fri, 28 Oct 2022 05:04:12 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 145DB24002B for ; Fri, 28 Oct 2022 11:04:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1666947844; bh=Kwg7H1cQQK6LXq3ZEcbdxnRjzJI7cCO95ESokr8i5Ds=; h=From:To:Subject:Date:From; b=dz9qweC+UUQqDa1G4uJ7R94UeaXXW0O6WevxP2/SHJR65cZmj4cdkOBcNZD/DKHUC dCmMJFYWdFyaKCWCrzzGNSTrPpQspoovcJALHMNC03lehZriSwktIE0OHAXFopRbsV TMSVDuy8Wo5x3X5f6lXaHG6l0KA67Z8RaMH4bTUfRJ+QUrpJ9iLrO5pM/mgYwHTPeD 5M/Z4NihhO3iIZxjbn7eEyd5MJ5yqaE/pHmSSlzgRuUDOZ0uG3SctUwkBEGyKsz6kO OkYwDcWW035WJHCY33qcPdnxDxW5W8dCkhHX0jTvb0nHArJ85zvPwFoncRFPQ1OqJV JZPzgracq1IMA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MzGnG6YsWz6trF for ; Fri, 28 Oct 2022 11:04:02 +0200 (CEST) From: Aleksandr Vityazev Message-Id: <090b44dbb6d53118c35817788ae9d31cd702870b.1666947787.git.avityazev@posteo.org> Date: Fri, 28 Oct 2022 09:04:00 +0000 MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=avityazev@posteo.org; helo=mout01.posteo.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-trm): [arguments]: Rename patch-ffplay phase to patch-paths and substitute tmr-sound-file variable. Add makeinfo phase; [inputs]: Add sound-theme-freedesktop; [license]: Add fdl1.3+; [use-modules]: Add (gnu packages libcanberra). --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0a679c7167..b598ec6962 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -245,6 +245,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages ocaml) #:use-module (gnu packages erlang) #:use-module (gnu packages statistics) + #:use-module (gnu packages libcanberra) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -14502,21 +14503,35 @@ (define-public emacs-tmr (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-ffplay + (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (let ((ffplay (search-input-file inputs "/bin/ffplay"))) (make-file-writable "tmr.el") (substitute* "tmr.el" (("\"ffplay") - (string-append "\"" ffplay))))))))) + (string-append "\"" ffplay)))) + (emacs-substitute-variables "tmr.el" + ("tmr-sound-file" + (string-append + #$(this-package-input "sound-theme-freedesktop") + "/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga"))))) + (add-after 'install 'makeinfo + (lambda _ + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "tmr.info" (string-append #$output "/share/info"))))))) (native-inputs (list texinfo)) - (inputs (list ffmpeg)) + (inputs (list ffmpeg sound-theme-freedesktop)) (home-page "https://protesilaos.com/emacs/tmr/") (synopsis "Set timers using a convenient notation") (description "TMR is an Emacs package that provides facilities for setting timers using a convenient notation.") - (license license:gpl3+))) + (license (list license:gpl3+ + license:fdl1.3+)))) ;GFDLv1.3+ for the manual (define-public emacs-gn-mode (package