From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 45MGIcJCb2CwZQEAgWs5BA (envelope-from ) for ; Thu, 08 Apr 2021 19:52:02 +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 MIfeGcJCb2BVVAAA1q6Kng (envelope-from ) for ; Thu, 08 Apr 2021 17:52:02 +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 1807410E70 for ; Thu, 8 Apr 2021 19:52:02 +0200 (CEST) Received: from localhost ([::1]:35662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYoz-0005XA-5G for larch@yhetil.org; Thu, 08 Apr 2021 13:52:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYo7-00053A-BE for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYo4-0004Kp-R7 for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYo4-0003jC-QY for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 07/33] gnu: emacs-telega: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Apr 2021 17:51:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161790424814151 (code B ref 47661); Thu, 08 Apr 2021 17:51:04 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:48 +0000 Received: from localhost ([127.0.0.1]:48178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnn-0003gA-RL for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:48 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:12255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnm-0003g1-5p for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:46 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTM74pSfz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTM74pSfz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904243; bh=wFpOxO08PT99LU5tUj3mRkXt4L8gYo9gCd9HUUoDOrE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=F0oJ+dbBvK4WFR/AdJ9/MvTFnLLjVdgkoUzRmqFCZ9NJVNL0t5A+uApm8+fX+3cZ3 BgKJl8hFbdW3hbAEJjCW8jNckIRr3E2w5grqqlRwPjhyDCnJhh38S6/GoVO5hhKVXU q6+sv78iHaqIicTH3KjZ1Y73yCKa3082ba7OfhZk= From: Leo Prikler Date: Thu, 8 Apr 2021 19:49:41 +0200 Message-Id: <20210408175007.13360-7-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.117 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=1617904322; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wFpOxO08PT99LU5tUj3mRkXt4L8gYo9gCd9HUUoDOrE=; b=RPtLredk+dROlSRM8AoDNdAbMp7yuM70s3AdqkZYmhghA5Fe6lnaoYWX8Sk3xMaGAtSrh2 wHShk6XFu9gLALbYD52/LeUU/d08TIGgA9Bht+QxTUVwwcjgOKn1Wq/e6TR5WfULU7sS3g OskZBkDVXPyOiZ19ALjnIfjH8jw67bVhI9wrGhPYZf1hiOau6VMl7ZvnPlZ2gUgRj2fvw/ tuFv3ho2wpkW3VHg/0+iTQ8bHSxVSlZfgi2YRw9Mai1xxJUs07VXqYKZ3QZJevXTOrBAHk gRZrmIuXhJdTagSzEOrEwliATmIsF2d391o5Ia4dmTYwjecVf5857KBPByCSOg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617904322; a=rsa-sha256; cv=none; b=TTtj3k5b+JDeeoB2A/XZXY8AhCZgjQdcW+UrCRyQcmfgza6U+KAb1RwWGqRNEESGlrtGyY HdN9NM0mP5BIKR3FhGlMKBnmn29C0svuHOmcwZPEhupFtjA0lDovtVlyZfEBsTdnOTLOUR PySNFhCR2StyAQyNNvpU1x7YTICsP87YNfc0y09GZZ4GOVSqxFsDzj5HwoahbW5TM2hcN1 WYy8yxPwBgc6R2+d6vSKEC/AalhP5K/jB8Bs6XAo36RwEW4ZzDqqX7VmCweuCW333cVMF+ +TkAR3ZCInUThGe7znM51Qj2u2g/8h3GVgWM0BMUsd3Y+r0KxnNnOFA4vWt04Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=F0oJ+dbB; 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.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=F0oJ+dbB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (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: 1807410E70 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: xezEbejF0oMZ * gnu/packages/emacs-telega.scm (emacs-telega)[#:phases]: Reorder. : Rename to... : ... this. Also don't patch paths to subdirs. Remove the snippet, that would push contrib to the load path. : Rename to... : ... this. : Also install etc. : Removed phases. --- gnu/packages/emacs-xyz.scm | 62 +++++++++----------------------------- 1 file changed, 15 insertions(+), 47 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f918ade782..fd38f023d3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25131,7 +25131,9 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (("python3 run_tests.py") "")) #t)) - (add-after 'check 'telega-paths-patch + (add-after 'unpack 'expand-load-path + (assoc-ref emacs:%standard-phases 'expand-load-path)) + (add-after 'unpack 'patch-sources (lambda* (#:key inputs #:allow-other-keys) ;; Hard-code paths to `ffplay` and `ffmpeg`. (let ((ffplay-bin (string-append (assoc-ref inputs "ffmpeg") @@ -25147,24 +25149,15 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" "\"" ffmpeg-bin "\")")))) - ;; Modify telega-util to reflect unique dir name in - ;; `telega-install-data' phase. - (substitute* "telega-util.el" - (("\\(concat \"etc/\" filename\\) telega--lib-directory") - "(concat \"telega-data/\" filename) - (locate-dominating-file telega--lib-directory - \"telega-data\")")) - ;; Modify telega.el to reflect unique dir name in - ;; `telega-install-contrib' phase. + ;; This would push the "contrib" sources to the load path, + ;; but as contrib is not installed alongside telega, it does + ;; nothing. (substitute* "telega.el" - (("\\(push \\(expand-file-name \"contrib\" telega--lib-directory\\) load-path\\)") - "(push (expand-file-name \"telega-contrib\" - (locate-dominating-file telega--lib-directory - \"telega-contrib\")) load-path)")) + (("\\(push .* load-path\\)") "")) #t)) ;; The server test suite has a hardcoded path. ;; Reset this behavior to use the proper path. - (add-after 'unpack 'server-suite-patch + (add-after 'unpack 'patch-test-suite (lambda _ (substitute* "server/run_tests.py" (("~/.telega/telega-server") @@ -25176,39 +25169,14 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (invoke "python3" "server/run_tests.py") #t)) (delete 'configure) - ;; Build emacs-side using `emacs-build-system' - (add-after 'compress-documentation 'emacs-add-source-to-load-path - (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) - ;; Manually invoke bytecompilation for the contrib - ;; subdirectory. - (add-after 'emacs-add-source-to-load-path 'emacs-bytecomp-contrib - (lambda _ - (substitute* "Makefile" - (("byte-recompile-directory \".\"") - "byte-recompile-directory \"contrib\"")) - (invoke "make" "compile") - #t)) - (add-after 'emacs-bytecomp-contrib 'emacs-install - (assoc-ref emacs:%standard-phases 'install)) - ;; This step installs subdir /etc, which contains images, sounds and - ;; various other data, next to the site-lisp dir. - (add-after 'emacs-install 'telega-install-data - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively - "etc" - (string-append (assoc-ref outputs "out") - "/share/emacs/telega-data/")) - #t)) - (add-after 'emacs-install 'telega-install-contrib - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively - "contrib" - (string-append (assoc-ref outputs "out") - "/share/emacs/telega-contrib")) - #t)) - (add-after 'telega-install-contrib 'emacs-build + (add-after 'expand-load-path 'emacs-install + (lambda args + (apply (assoc-ref emacs:%standard-phases 'install) + #:include `("etc" ,@emacs:%default-include) + args))) + (add-after 'emacs-install 'emacs-build (assoc-ref emacs:%standard-phases 'build)) - (add-after 'telega-install-contrib 'emacs-make-autoloads + (add-after 'emacs-install 'emacs-make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads))))) (inputs `(("ffmpeg" ,ffmpeg))) ; mp4/gif support. -- 2.31.1