unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Aleksandr Vityazev <avityazev@posteo.org>
To: 58831@debbugs.gnu.org
Subject: [bug#58831] [PATCH] gnu: emacs-tmr: Update arguments and license.
Date: Fri, 28 Oct 2022 09:04:00 +0000	[thread overview]
Message-ID: <090b44dbb6d53118c35817788ae9d31cd702870b.1666947787.git.avityazev@posteo.org> (raw)

* 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
-- 
2.38.0



-- 

Aleksandr Vityazev




             reply	other threads:[~2022-10-28  9:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-28  9:04 Aleksandr Vityazev [this message]
2022-10-29 21:55 ` bug#58831: [PATCH] gnu: emacs-tmr: Update arguments and license Nicolas Goaziou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=090b44dbb6d53118c35817788ae9d31cd702870b.1666947787.git.avityazev@posteo.org \
    --to=avityazev@posteo.org \
    --cc=58831@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).