From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 11:19:56 2021 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 To: guix-patches@gnu.org Subject: [PATCH]: gnu: emacs-telega: Fix 'patch-source' phase. 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-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: submit Cc: Leo Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= 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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 11:59:32 2021 Received: (at 49493-done) by debbugs.gnu.org; 9 Jul 2021 15:59:33 +0000 Received: from localhost ([127.0.0.1]:59546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1sua-0003k2-OI for submit@debbugs.gnu.org; Fri, 09 Jul 2021 11:59:32 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:6030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1suU-0003jk-Ty for 49493-done@debbugs.gnu.org; Fri, 09 Jul 2021 11:59:31 -0400 Received: from [10.0.0.4] (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GLyXC4TK7z1LBRt; Fri, 9 Jul 2021 17:59:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GLyXC4TK7z1LBRt DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625846363; bh=vJEzOg5frTuM/5OUpkPFft2wVFLyyiiZ1up7zx6/ya8=; h=Subject:From:To:Date:In-Reply-To:References:From; b=YUPZrvk3+itZliQUZRM66XU4E8kJdKBd+1LSLywSILvske4h9QDeves7aTgvnOnjN a6HjdbGqXi1McLHf2WwdstHSf1WGY7yA44z0lO58MfeYtbrOqJtI/HCRbglQbn7e0K EM1+KmfHJticwdR70bkgzlhMepS6EjXdHR8Lq7c4= Message-ID: <1604e368b41975d5f31079e6d8c7cb94108dab9e.camel@student.tugraz.at> Subject: Re: [PATCH]: gnu: emacs-telega: Fix 'patch-source' phase. From: Leo Prikler To: Zhu Zihao , 49493-done@debbugs.gnu.org Date: Fri, 09 Jul 2021 17:59:00 +0200 In-Reply-To: <865yxjo7fa.fsf@163.com> References: <865yxjo7fa.fsf@163.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49493-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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/-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 From unknown Wed Sep 10 10:23:13 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 07 Aug 2021 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator