From patchwork Fri Jul 9 15:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 31260 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 B529627BC78; Fri, 9 Jul 2021 16:20:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6E58627BC81 for ; Fri, 9 Jul 2021 16:20:31 +0100 (BST) Received: from localhost ([::1]:40912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1sIo-0007XX-DJ for patchwork@mira.cbaines.net; Fri, 09 Jul 2021 11:20:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1sIN-0007XP-Cy for guix-patches@gnu.org; Fri, 09 Jul 2021 11:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1sIN-0002Qj-5v for guix-patches@gnu.org; Fri, 09 Jul 2021 11:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1sIM-0002o9-52 for guix-patches@gnu.org; Fri, 09 Jul 2021 11:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49493] [PATCH]: gnu: emacs-telega: Fix 'patch-source' phase. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jul 2021 15:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49493@debbugs.gnu.org Cc: Leo Prikler X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162584399610775 (code B ref -1); Fri, 09 Jul 2021 15:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jul 2021 15:19:56 +0000 Received: from localhost ([127.0.0.1]:59530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1sIG-0002ni-IZ for submit@debbugs.gnu.org; Fri, 09 Jul 2021 11:19:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:56636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1sID-0002na-Pk for submit@debbugs.gnu.org; Fri, 09 Jul 2021 11:19:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1sID-0007Vp-JX for guix-patches@gnu.org; Fri, 09 Jul 2021 11:19:53 -0400 Received: from m12-16.163.com ([220.181.12.16]:44273) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1sI7-0002E2-Te for guix-patches@gnu.org; Fri, 09 Jul 2021 11:19:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=ez2Gw +JZsprBj9Pzd3csq34Xc3AjtM2SuuKzo4mMiK4=; b=FcN+Pp+fXec47vPPL17Cf mQsBXwVCg0sPTatGhXK/0t+eqSHieDppvGxB3E0wjD/T91fgbm+823+SLJT+1DSa UBVTmIFuRdkmZqWNDPCgK3zgL2co8zO/nosxEXaH76fdubr4rl/O3orOl1s5ahzX YQpPixGd8ky3eB7LcGZvdE= Received: from asus-laptop (unknown [183.19.167.139]) by smtp12 (Coremail) with SMTP id EMCowABHSU1pZehgjBYV1g--.20836S2; Fri, 09 Jul 2021 23:04:10 +0800 (CST) User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao Date: Fri, 09 Jul 2021 23:04:09 +0800 Message-ID: <865yxjo7fa.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: EMCowABHSU1pZehgjBYV1g--.20836S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUTdgWDUUUU X-Originating-IP: [183.19.167.139] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFArKr1aD9GRCHwAAsj Received-SPF: pass client-ip=220.181.12.16; envelope-from=all_but_last@163.com; helo=m12-16.163.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 'patch-source' phase will replace binary name with wrong full path name (e.g. ffmpeg => /gnu/store/-ffmpeg-X.Ybin/ffmpeg) This patch attempts to fix this issue, and also add missing 'telega-vvnote.el' to patch targets. From f63d44007a89f13ff9e23bbf0b8fb22ee4d94dcb Mon Sep 17 00:00:00 2001 From: Zhu Zihao 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]: 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