From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QKK2INI52WBvoQAAgWs5BA (envelope-from ) for ; Mon, 28 Jun 2021 04:54:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id CEVpHNI52WC+DQAA1q6Kng (envelope-from ) for ; Mon, 28 Jun 2021 02:54:10 +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 221E42B991 for ; Mon, 28 Jun 2021 04:54:09 +0200 (CEST) Received: from localhost ([::1]:58170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxhPT-0006s8-NN for larch@yhetil.org; Sun, 27 Jun 2021 22:54:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxhPO-0006rx-4J for guix-patches@gnu.org; Sun, 27 Jun 2021 22:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxhPN-0007Us-TP for guix-patches@gnu.org; Sun, 27 Jun 2021 22:54:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxhPN-0003Xw-M9 for guix-patches@gnu.org; Sun, 27 Jun 2021 22:54:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49219] Acknowledgement ([PATCH]: Update emacs-telega.) Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 02:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Prikler Cc: 49219@debbugs.gnu.org Received: via spool by 49219-submit@debbugs.gnu.org id=B49219.162484879813583 (code B ref 49219); Mon, 28 Jun 2021 02:54:01 +0000 Received: (at 49219) by debbugs.gnu.org; 28 Jun 2021 02:53:18 +0000 Received: from localhost ([127.0.0.1]:50550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxhOY-0003Wt-UO for submit@debbugs.gnu.org; Sun, 27 Jun 2021 22:53:18 -0400 Received: from mail-m974.mail.163.com ([123.126.97.4]:57758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxhOV-0003Wh-0K for 49219@debbugs.gnu.org; Sun, 27 Jun 2021 22:53:09 -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=rY0mL dC+p4JDM6pQTXPiiVXcb2WbEdR3/4Prb2LKw+Y=; b=ONCxkiiC0uHIiuq08yCl+ QPOvrCUTVuOLAgaGQP32Jvcvmp7KZCib0j76x0NAxBABs000BB9ToSM4HEx+NOZU rO4Gs5O70iXsgItFsSioQfehwCK83dL8SDQ/N1pwUNFyoAxGm+DDmoJU/4XWq6OP kE/437DRoikxSMYJ0DKetM= Received: from asus-laptop (unknown [27.38.248.136]) by smtp4 (Coremail) with SMTP id HNxpCgB3xBCNOdlgo8wsHA--.25672S2; Mon, 28 Jun 2021 10:53:02 +0800 (CST) References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> <86o8bsg40d.fsf@163.com> User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao In-reply-to: <86o8bsg40d.fsf@163.com> Date: Mon, 28 Jun 2021 10:53:00 +0800 Message-ID: <86v95ybsz7.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HNxpCgB3xBCNOdlgo8wsHA--.25672S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUI2-eUUUUU X-Originating-IP: [27.38.248.136] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiTxO-r1sGZUHmngAAsN 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=1624848849; 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:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=rY0mLdC+p4JDM6pQTXPiiVXcb2WbEdR3/4Prb2LKw+Y=; b=YmAIGi/o8xZpL4+hcJz1f3XtTF3PcoCLpxyTn6C+ncUEfCEWFaTKUpmmilNSpXBqvL8hsG kq1Wbk8owsNtF+7o3163HsREBfMi2iq+MeSlgIbrgbyxLDvwbtdWG+9qt3A4u/NukHkoqu 1ouVeQFQMGD7oJMP5ron1+HnjVxvbXTlwDEqbUalOLorz+G858GOthFVjHArjMzuAIHlTp yTAGxdvTmzyvOY+9G6QntnOre51/aJ6tbFlN1L7afHiwHQ5zlC+fP1/HoXy8FFCJsGCkwQ /SyPWMgrG/Z+413BKl0ETSeoMF2ZV4DwEQhSOfMQW4mLdCiLrREOxD189QO9HQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624848849; a=rsa-sha256; cv=none; b=LjEh1cjzlgcmOdo1h6w+AQL+jIPBbUiUvFmjuqHai31yf4lX7zpOKUlyEn0a7ndfQaBB+3 +bQO0XpCgShbwYcD+E2Eolo78xz564gs2aFGESaMsnqnGQ/CfcwFoZnIL8yYXMY/k2P74I DAr3V2nATjEn9HZdW5Md6tctdY1LQM8Fq4cNt9IYvtTg7fMaCjtm1GvHvunp9fnrJHFg7E 8K/n+/g2+cHBa1XwJ/qvYDEvEay20zfMt7LeC2ijMeBoht7ugV6CkdYYQiszjBgGasYiaN SmX38IwGZ+I7ntCAA/FAUFEI6FJ+l5pa3x/F3RKtmvScc2zADD66ZhIG1Ea17w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=ONCxkiiC; 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: -1.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=ONCxkiiC; 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: 221E42B991 X-Spam-Score: -1.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: d2bHTdvmTP/k --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYNk5jBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh9FoQD9FtpaSKKJo89mZTfySboUMXPqw8Wd aVqzapBeHJtf47oBANhf9lAWa53vsoIzYCDcKixQs6+sYrx3LkzshCYbBHAH =ZJ9+ -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-emacs-telega-server.patch Content-Transfer-Encoding: quoted-printable >From ffcd346a5d2a7b6fccfc56d16156b833bbd6c8bb Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 25 Jun 2021 13:25:05 +0800 Subject: [PATCH 1/3] gnu: Add emacs-telega-server. * gnu/packages/emacs-xyz.scm(emacs-telega-server): New variable. * gnu/packages/patches/emacs-telega-path-placeholder.patch: New file. * gnu/package/patches/emacs-telega-patch-server-functions.patch: Remove sta= le patch. * gnu/local.mk(dist_patch_DATA): Update corresponding entries. --- gnu/local.mk | 2 +- gnu/packages/emacs-xyz.scm | 55 ++++++++++++++++++- .../emacs-telega-patch-server-functions.patch | 31 ----------- .../emacs-telega-path-placeholder.patch | 44 +++++++++++++++ 4 files changed, 99 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/emacs-telega-patch-server-function= s.patch create mode 100644 gnu/packages/patches/emacs-telega-path-placeholder.patch diff --git a/gnu/local.mk b/gnu/local.mk index 509970f044..8f432ed326 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -989,7 +989,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ - %D%/packages/patches/emacs-telega-patch-server-functions.patch \ + %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/enjarify-setup-py.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b84c0d6622..ab5d0ed061 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -81,7 +81,7 @@ ;;; Copyright =C2=A9 2020, 2021 Niklas Eklund ;;; Copyright =C2=A9 2020 Marco Grassi ;;; Copyright =C2=A9 2020 Tom=C3=A1s Ort=C3=ADn Fern=C3=A1ndez -;;; Copyright =C2=A9 2020 Zhu Zihao +;;; Copyright =C2=A9 2020, 2021 Zhu Zihao ;;; Copyright =C2=A9 2020 Adam Kandur ;;; Copyright =C2=A9 2020 Tim Howes ;;; Copyright =C2=A9 2020 Noah Landis @@ -144,6 +144,7 @@ #:use-module (gnu packages djvu) #:use-module (gnu packages ebook) #:use-module (gnu packages emacs) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages gtk) @@ -26011,6 +26012,58 @@ fish-completion. It can be used in both Eshell an= d M-x shell.") other @code{helm-type-file} sources such as @code{helm-locate}.") (license license:gpl3+))) =20 +(define-public emacs-telega-server + (package + (name "emacs-telega-server") + (version "0.7.024") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevlg/telega.el") + (commit (string-append "v" version)))) + (sha256 + (base32 "1ra04cp49zzx8vy8aswd00l46ixyc44sxh1s3nw880b4ywzxmc6j")) + (file-name (git-file-name "emacs-telega" version)) + (patches + (search-patches "emacs-telega-path-placeholder.patch" + "emacs-telega-test-env.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'enter-subdirectory + (lambda _ (chdir "server") #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("CC=3Dcc") ,(string-append "CC=3D" (cc-for-target))) + (("^(INSTALL_PREFIX=3D).*$" _all prefix) + (string-append prefix out "/bin\n"))) + + (substitute* "run_tests.py" + (("^(TELEGA_SERVER =3D ).*$" _all prefix) + (string-append prefix + "\"" out "/bin/telega-server\"\n")))))) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'install-license-files 'leave-subdirectory + (lambda _ (chdir "..") #t))) + #:test-target "test")) + (inputs + `(("tdlib" ,tdlib) + ("libappindicator" ,libappindicator))) + (native-inputs + `(("python" ,python) + ("pkg-config" ,pkg-config))) + (home-page "https://zevlg.github.io/telega.el/") + (synopsis "Server process of Telega") + (description "Telega-server is helper program to interact with Telegram +service, and connect it with Emacs via inter-process communication.") + (license license:gpl3+))) + (define-public emacs-telega ;; This package has versions newer than indicated on MELPA. ;; Get the current version from `telega-version` in telega.el. diff --git a/gnu/packages/patches/emacs-telega-patch-server-functions.patch= b/gnu/packages/patches/emacs-telega-patch-server-functions.patch deleted file mode 100644 index e3d49278d0..0000000000 --- a/gnu/packages/patches/emacs-telega-patch-server-functions.patch +++ /dev/null @@ -1,31 +0,0 @@ -Remove interactive build for telega-server, as it fails on Guix. -Modify the `telega-server--find-bin' function to only use the version -of telega-server installed by Guix. - -Created by Brett Gilio - ---- a/telega-server.el -+++ b/telega-server.el -@@ -113,7 +113,6 @@ If already deferring, then just executes the BODY." - If BUILD-FLAGS is specified, then rebuild server without any - queries using this flags for building, could be empty string. - Otherwise query user about building flags." -- (interactive) - (telega-test-env 'quiet) - (when (or build-flags - (y-or-n-p "Build `telega-server'? ")) -@@ -137,11 +136,8 @@ Otherwise query user about building flags." - (defun telega-server--find-bin () - "Find telega-server executable. - Raise error if not found." -- (let ((exec-path (cons telega-directory exec-path))) -- (or (executable-find "telega-server") -- (progn (telega-server-build) -- (executable-find "telega-server")) -- (error "`telega-server' not found in exec-path")))) -+ (or (executable-find "telega-server") -+ (error "`telega-server' not found in exec-path"))) -=20 - (defun telega-server-version () - "Return telega-server version." - diff --git a/gnu/packages/patches/emacs-telega-path-placeholder.patch b/gnu= /packages/patches/emacs-telega-path-placeholder.patch new file mode 100644 index 0000000000..c20be36712 --- /dev/null +++ b/gnu/packages/patches/emacs-telega-path-placeholder.patch @@ -0,0 +1,44 @@ +From 865b8c553722a971c68742c2e849e41eb0e2360c Mon Sep 17 00:00:00 2001 +From: Zhu Zihao +Date: Thu, 24 Jun 2021 23:43:50 +0800 +Subject: [PATCH] Replace code that search path with placeholder for + configuration. + +--- + telega-server.el | 6 +----- + telega-util.el | 2 +- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/telega-server.el b/telega-server.el +index 999125d..0fa0817 100644 +--- a/telega-server.el ++++ b/telega-server.el +@@ -142,11 +142,7 @@ Otherwise query user about building flags." + (defun telega-server--find-bin () + "Find telega-server executable. + Raise error if not found." +- (let ((exec-path (cons telega-directory exec-path))) +- (or (executable-find "telega-server") +- (progn (telega-server-build) +- (executable-find "telega-server")) +- (error "`telega-server' not found in exec-path")))) ++ "@TELEGA_SERVER_BIN@") +=20 + (defun telega-server-version () + "Return telega-server version." +diff --git a/telega-util.el b/telega-util.el +index 73a46b1..f53e20a 100644 +--- a/telega-util.el ++++ b/telega-util.el +@@ -464,7 +464,7 @@ N can't be 0." +=20 + (defun telega-etc-file (filename) + "Return absolute path to FILENAME from etc/ directory in telega." +- (expand-file-name (concat "etc/" filename) telega--lib-directory)) ++ (concat "@TELEGA_SHARE@" "/" filename)) +=20 + (defun telega-link-props (link-type link-to &optional face) + "Generate props for link button openable with `telega-link--button-acti= on'." +--=20 +2.32.0 + --=20 2.32.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-emacs-telega-Update-to-0.7.024.patch >From e8d88e5b99b6136223a8be6e143bc91199cfd02f Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 25 Jun 2021 13:26:51 +0800 Subject: [PATCH 2/3] gnu: emacs-telega: Update to 0.7.024. * gnu/packages/emacs-xyz.scm(emacs-telega): Update to 0.7.024. Rewrite build recipe. --- gnu/packages/emacs-xyz.scm | 165 +++++++++++-------------------------- 1 file changed, 46 insertions(+), 119 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ab5d0ed061..dfbdb6b8f8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26065,125 +26065,52 @@ service, and connect it with Emacs via inter-process communication.") (license license:gpl3+))) (define-public emacs-telega - ;; This package has versions newer than indicated on MELPA. - ;; Get the current version from `telega-version` in telega.el. - ;; or by running M-x telega-version. - (let ((commit "1d28dc209e2acf1a3bf2852cc620b6e412ea73f9") - (revision "1") - (version "0.7.1")) - (package - (name "emacs-telega") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zevlg/telega.el") - (commit commit))) - (sha256 - (base32 - "0h6kj3r36x26v6p4gkzg5s6fv0brlvrf6ycsdwnz27fw5sdb99k7")) - (patches (search-patches - "emacs-telega-patch-server-functions.patch" - "emacs-telega-test-env.patch")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - ((guix build emacs-build-system) #:prefix emacs:) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-build-system) - (guix build emacs-utils)) - #:test-target "test" - ;; TODO: Currently tgVOIP is not functional, thus we have disabled it - ;; temporarily. - ;; #:make-flags (list "WITH_VOIP=t") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prefix-patch - (lambda _ - (substitute* "server/Makefile" - (("CC=cc") - ,(string-append "CC=" (cc-for-target))) - (("INSTALL_PREFIX=\\$\\(HOME\\)/.telega") - (string-append "INSTALL_PREFIX=" (assoc-ref %outputs "out") - "/bin")) - ;; Manually invoke `run_tests.py` after install phase. - (("python3 run_tests.py") - "")) - #t)) - (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") - "/bin/ffplay")) - (ffmpeg-bin (string-append (assoc-ref inputs "ffmpeg") - "/bin/ffmpeg"))) - (substitute* "telega-ffplay.el" - (("\\(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 "\")")))) - ;; 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 .* load-path\\)") "")) - #t)) - ;; The server test suite has a hardcoded path. - ;; Reset this behavior to use the proper path. - (add-after 'unpack 'patch-test-suite - (lambda _ - (substitute* "server/run_tests.py" - (("~/.telega/telega-server") - (string-append (assoc-ref %outputs "out") - "/bin/telega-server"))) - #t)) - (add-after 'install 'run-server-suite - (lambda _ - (invoke "python3" "server/run_tests.py") - #t)) - (delete 'configure) - (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 'emacs-install 'emacs-make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads))))) - (inputs - `(("ffmpeg" ,ffmpeg))) ; mp4/gif support. - (propagated-inputs - `(("emacs-visual-fill-column" ,emacs-visual-fill-column) - ("emacs-company" ,emacs-company) - ("emacs-rainbow-identifiers" - ,emacs-rainbow-identifiers) - ("libwebp" ,libwebp))) ; sticker support. - (native-inputs - `(("tdlib" ,tdlib) - ;; Use Emacs with wide ints on 32-bit architectures. - ("emacs" ,(match (%current-system) - ((or "i686-linux" "armhf-linux") - emacs-wide-int) - (_ - emacs))) - ("python" ,python))) - (synopsis "GNU Emacs client for the Telegram messenger") - (description - "Telega is a full-featured, unofficial GNU Emacs-based client for the -Telegram messaging platform.") - (home-page "https://zevlg.github.io/telega.el/") - (license license:gpl3+)))) + (package + (inherit emacs-telega-server) + (name "emacs-telega") + (build-system emacs-build-system) + (arguments + `(#:emacs ,(if (target-64bit?) + emacs-minimal + ;; Require wide-int support for 32-bit platform. + emacs-wide-int) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "telega-server.el" + (("@TELEGA_SERVER_BIN@") + (string-append (assoc-ref inputs "emacs-telega-server") + "/bin/telega-server"))) + (substitute* "telega-util.el" + (("@TELEGA_SHARE@") + (string-append (assoc-ref outputs "out") + "/share/emacs-telega"))))) + (add-after 'install 'install-share-files + (lambda* (#:key outputs #:allow-other-keys) + (define install-plan + '("langs" "sounds" "emojis.alist" + "verified.svg" "telega-logo.svg")) + + (define prefix (string-append (assoc-ref outputs "out") + "/share/emacs-telega")) + (with-directory-excursion "etc" + (for-each (lambda (file) + (if (file-is-directory? file) + (let ((dest (string-append prefix "/" file))) + (copy-recursively file dest)) + (install-file file prefix))) + install-plan)) + #t))))) + (inputs `(("emacs-telega-server" ,emacs-telega-server))) + (native-inputs '()) + (propagated-inputs + `(("emacs-visual-fill-column" ,emacs-visual-fill-column) + ("emacs-company" ,emacs-company) + ("emacs-rainbow-identifiers" ,emacs-rainbow-identifiers))) + (synopsis "GNU Emacs client for the Telegram messenger") + (description "Telega is a full-featured, unofficial GNU Emacs-based client +for the Telegram messaging platform."))) (define-public emacs-telega-contrib (package/inherit emacs-telega -- 2.32.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-emacs-telega-contrib-Update-to-0.7.024.patch >From c2901b296be139a12ed0e94e7956706ec2a3243e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 25 Jun 2021 13:29:30 +0800 Subject: [PATCH 3/3] gnu: emacs-telega-contrib: Update to 0.7.024. * gnu/packages/emacs-xyz.scm(emacs-telega-contrib): Update to 0.7.024. [arguments]: Back to root directory of build before phase 'install-license-files' to properly install licenses. [propagated-inputs]: Add emacs-dashboard, emacs-transient. --- gnu/packages/emacs-xyz.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dfbdb6b8f8..fbec1fda29 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26113,19 +26113,28 @@ service, and connect it with Emacs via inter-process communication.") for the Telegram messaging platform."))) (define-public emacs-telega-contrib - (package/inherit emacs-telega + (package + (inherit emacs-telega) (name "emacs-telega-contrib") - (build-system emacs-build-system) (arguments `(#:exclude '("telega-live-location.el") #:phases (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "contrib") #t))))) + (add-after 'unpack 'enter-subdirectory + (lambda _ (chdir "contrib") #t)) + (add-before 'install-license-files 'leave-subdirectory + (lambda _ (chdir "..") #t))))) + (inputs '()) + (native-inputs '()) (propagated-inputs - `(("emacs-telega" ,emacs-telega) - ("emacs-alert" ,emacs-alert) - ("emacs-all-the-icons" ,emacs-all-the-icons))))) + `(("emacs-alert" ,emacs-alert) + ("emacs-all-the-icons" ,emacs-all-the-icons) + ("emacs-dashboard" ,emacs-dashboard) + ("emacs-telega" ,emacs-telega) + ("emacs-transient" ,emacs-transient))) + (synopsis "Contributed packages to Telega") + (description "Telega-contrib is a collection of third-party +contributed packages to Telega."))) (define-public emacs-doom-modeline (package -- 2.32.0 --=-=-= Content-Type: text/plain Patches updated. -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=--