bug#49493: closed ([PATCH]: gnu: emacs-telega: Fix 'patch-source' phase.)

[GNU bug Tracking System]

Your message dated Fri, 09 Jul 2021 17:59:00 +0200
with message-id 
<1604e368b41975d5f31079e6d8c7cb94108dab9e.camel@student.tugraz.at>
and subject line Re: [PATCH]: gnu: emacs-telega: Fix 'patch-source' phase.
has caused the debbugs.gnu.org bug report #49493,
regarding [PATCH]: gnu: emacs-telega: Fix 'patch-source' phase.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
49493: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=49493
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems

--- Begin Message --- Subject: [PATCH]: gnu: emacs-telega: Fix 'patch-source' phase. Date: Fri, 09 Jul 2021 23:04:09 +0800 User-agent: mu4e 1.4.15; emacs 27.2

'patch-source' phase will replace binary name with wrong full path name
(e.g. ffmpeg => /gnu/store/<hash>-ffmpeg-X.Ybin/ffmpeg)

This patch attempts to fix this issue, and also add missing
'telega-vvnote.el' to patch targets.

signature.asc
Description: PGP signature

>From f63d44007a89f13ff9e23bbf0b8fb22ee4d94dcb Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 9 Jul 2021 22:58:34 +0800
Subject: [PATCH] gnu: emacs-telega: Fix 'patch-source' phase.

* gnu/packages/emacs-xyz.scm(emacs-telega):

[arguments]<phases>: Add missing slash in file name.

Patch telega-vvnote.el.
---
 gnu/packages/emacs-xyz.scm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6ac61fd596..0770795044 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -26290,17 +26290,25 @@ service, and connect it with Emacs via inter-process 
communication.")
              (let* ((ffmpeg (assoc-ref inputs "ffmpeg"))
                     (ffmpeg-bin (string-append ffmpeg "/bin/ffmpeg"))
                     (ffplay-bin (string-append ffmpeg "/bin/ffplay")))
-              (substitute* "telega-ffplay.el"
-                (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)"
-                  all func cmd)
-                 (string-append func " \"" (assoc-ref inputs "ffmpeg")
-                                "bin/" cmd))
-                (("\\(executable-find \"ffplay\"\\)")
-                 (string-append "(and (file-executable-p \"" ffplay-bin "\")"
-                                "\"" ffplay-bin "\")"))
-                (("\\(executable-find \"ffmpeg\"\\)")
-                 (string-append "(and (file-executable-p \"" ffmpeg-bin "\")"
-                                "\"" ffmpeg-bin "\")"))))))
+
+               (define targets
+                 '("telega-ffplay.el" "telega-vvnote.el"))
+
+               (define (patch-ffmpeg file)
+                 (substitute* file
+                   (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)"
+                     all func cmd)
+                    (string-append func " \"" (assoc-ref inputs "ffmpeg")
+                                   "/bin/" cmd))
+                   (("\\(executable-find \"ffplay\"\\)")
+                    (string-append "(and (file-executable-p \"" ffplay-bin 
"\")"
+                                   "\"" ffplay-bin "\")"))
+                   (("\\(executable-find \"ffmpeg\"\\)")
+                    (string-append "(and (file-executable-p \"" ffmpeg-bin 
"\")"
+                                   "\"" ffmpeg-bin "\")"))))
+
+               (for-each patch-ffmpeg targets)
+               #t)))
          (add-after 'unpack 'configure
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (substitute* "telega-server.el"
-- 
2.32.0

-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

--- End Message ---

> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [PATCH]: gnu: emacs-telega: Fix 'patch-source' phase.
>
>
>
>
> Date: 
>
> Fri, 09 Jul 2021 17:59:00 +0200
>
>
>
>
> User-agent: 
>
> Evolution 3.34.2 
>
>
>
>
> Am Freitag, den 09.07.2021, 23:04 +0800 schrieb Zhu Zihao:
> > 'patch-source' phase will replace binary name with wrong full path
> > name
> > (e.g. ffmpeg => /gnu/store/<hash>-ffmpeg-X.Ybin/ffmpeg)
> > 
> > This patch attempts to fix this issue, and also add missing
> > 'telega-vvnote.el' to patch targets.
> Thanks for catching this.  I've simplified your patch and pushed it.
>
> Regards,
> Leo
>
>
>
> --- End Message ---