From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aIzbEStp6GCspQAAgWs5BA (envelope-from ) for ; Fri, 09 Jul 2021 17:20:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id CLibDStp6GAhbgAA1q6Kng (envelope-from ) for ; Fri, 09 Jul 2021 15:20:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5534081F1 for ; Fri, 9 Jul 2021 17:20:10 +0200 (CEST) Received: from localhost ([::1]:40912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1sIT-0007XX-7e for larch@yhetil.org; Fri, 09 Jul 2021 11:20:09 -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 Content-Type: multipart/mixed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625844011; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=ez2Gw+JZsprBj9Pzd3csq34Xc3AjtM2SuuKzo4mMiK4=; b=OuebcQ6kfNSIL2ahdQqgi2hlVRls5tc10U5GDthpTV+EUh5L4fN9S/vnouKz8tLMFVHtqM aVRtANye62m/EAMO/ONQQeEZQqUdXryBUlzV08Ak0YjN1woCfPEFaXKSXy/xbKCJvbBlG6 uuJUwXd9SKKj67nZKOmnEMoXLY6NxFXPqJJZd33kmq0i7xc1J+W5jRnL2RFZqi3mYpY+QQ /DsRAmw34LlHuSvBqJStamSTuBvHI4LutXTesg6660kqPvEx2kjad2CTsVBep3CpUzm9kQ Ng7yA92KYK6utuqQenpJECAgg1YJ+AZCF/cu2wf2uRuAQP6rYgZwd0lN86uZJw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625844011; a=rsa-sha256; cv=none; b=bSR203DacfWhxMQz68d8z7vjQ+o0OnqiAagKvgT7koR1sE743GIKobnynkjnINAs0+ToyQ CJi6Zdd/OMv5oOTzulWCs8sspr7pROw3pVaqoQcR7w3m28v6o9ZVoR34xJC+RnvGHIvAIV ruC7eVS6Wtp4VjeHl0LYd1REeoGe6beXcBdCZpQ1rJGD4LQOVN+f0cB9mnch6P6s92qHG8 ybTg7lLPNrf9oYF7Q6ECWQXFlyAkrSmTR/+JBIctN2ZaDcf1jSpXB20Ba9BM9HNgfcPUVw GLF7gezkcqyoseXWts6K7FlpS2qhRPR0QeJ8kmW10nwtJFMFqmHOHtSaLeAsWA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=FcN+Pp+f; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=FcN+Pp+f; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5534081F1 X-Spam-Score: -3.40 X-Migadu-Scanner: scn0.migadu.com X-TUID: VWD8g4fWO7zD --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain '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. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYOhlaRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh+0UwEAxeMITyVGfxD/hcWu3Zr1C1NsN1GS nGd/Zpzu5bDjcJIBAPqK5xuLQE1An/4YX8wXYkRd792IsFo0AwsTjty59LoH =ManO -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-emacs-telega-Fix-patch-source-phase.patch >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 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=--