gnu: emacs-telega: Update to 0.8.600.

* gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.8.600.
[source]<patches>: Remove emacs-telega-path-placeholder.patch.
[arguments]<#:exclude>: Exclude extra files.
<#:phases>{'patch-sources}: Delete contrib (packaged separately),
substitute `telega-server-command'.
{'configure}: Remove obsolete phase.
[inputs]: Remove emacs-rainbow-identifiers, add emacs-transient.
* gnu/packages/patches/emacs-telega-path-placeholder.patch: Remove.
* gnu/local.mk: Unregister patch.

Merges guix/guix!6017

Change-Id: I5acc15a2bc478d076e40622a4b8b7611777ce369
Signed-off-by: Cayetano Santos <csantosb@inventati.org>

gnu/local.mk

@@ -1249,7 +1249,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
   %D%/packages/patches/emacs-pgtk-super-key-fix.patch	\
   %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.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/emacs-zoom-image-test-fix.patch	\

gnu/packages/emacs-xyz.scm

@@ -41772,10 +41772,10 @@ service, and connect it with Emacs via inter-process communication.")
       (license license:gpl3+))))
 
 (define-public emacs-telega
-  (let ((commit "956ce7f34bd3d88f446254461cb9c52cf7df071f"))
+  (let ((commit "70945291fff62ad0c8c2d2c28cbad319138ae811"))
     (package
       (name "emacs-telega")
-      (version "0.8.570")               ; see telega-version in telega.el
+      (version "0.8.600")               ; see telega-version in telega.el
       (source
        (origin
          (method git-fetch)
@@ -41783,11 +41783,10 @@ service, and connect it with Emacs via inter-process communication.")
                (url "https://github.com/zevlg/telega.el")
                (commit commit)))
          (sha256
-          (base32 "1yhkhdimryhh76bl71f84a5zabbkq54kkg8y6m6kwcs40g3587q5"))
+          (base32 "08z81m3aa7lf895iy5fkdp52qkvl2nw1r1k1k67dipnyrj4y2bfk"))
          (file-name (git-file-name "emacs-telega" version))
          (patches
-          (search-patches "emacs-telega-path-placeholder.patch"
-                          "emacs-telega-test-env.patch"))))
+          (search-patches "emacs-telega-test-env.patch"))))
       (build-system emacs-build-system)
       (arguments
        (list
@@ -41796,11 +41795,20 @@ service, and connect it with Emacs via inter-process communication.")
                     ;; Require wide-int support for 32-bit platform.
                     emacs-wide-int)
         #:test-command #~(list "make" "test_el")
-        #:include #~(cons "^etc\\/" %default-include)
+        #:include #~(cons "^etc/" %default-include)
+        #:exclude #~(list "etc/telega-make.el"
+                          "Dockerfile" "asound\\.conf"
+                          "etc/telegram-msgin\\.wav"
+                          "TODO.*org$" "\\.tl$" "^test\\.el")
         #:phases
         #~(modify-phases %standard-phases
             (add-after 'unpack 'patch-sources
               (lambda* (#:key inputs #:allow-other-keys)
+                (delete-file-recursively "contrib")
+                (emacs-substitute-variables "telega-customize.el"
+                  ("telega-server-command"
+                   (search-input-file inputs "/bin/telega-server")))
+
                 ;; Hard-code paths to `ffplay` and `ffmpeg`.
                 (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay"))
                        (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg"))
@@ -41820,15 +41828,6 @@ service, and connect it with Emacs via inter-process communication.")
                     (("\\(executable-find \"ffmpeg\"\\)")
                      (string-append "(and (file-executable-p \"" ffmpeg-bin "\")"
                                     "\"" ffmpeg-bin "\")"))))))
-            (add-after 'unpack 'configure
-              (lambda* (#:key inputs outputs #:allow-other-keys)
-                (substitute* "telega-customize.el"
-                  (("@TELEGA_SERVER_BIN@")
-                   (search-input-file inputs "/bin/telega-server")))
-                (substitute* "telega-core.el"
-                  (("@TELEGA_SHARE@")
-                   (string-append (elpa-directory (assoc-ref outputs "out"))
-                                  "/etc")))))
             (delete 'check)
             (add-after 'install 'check (assoc-ref %standard-phases 'check))
             (add-before 'check 'set-home
@@ -41843,8 +41842,9 @@ service, and connect it with Emacs via inter-process communication.")
        (list emacs-telega-server ffmpeg tgs2png))
       (native-inputs '())
       (propagated-inputs
-       (list emacs-visual-fill-column emacs-company
-             emacs-rainbow-identifiers))
+       (list emacs-company
+             emacs-transient            ; requires 0.9.0
+             emacs-visual-fill-column))
       (home-page "https://zevlg.github.io/telega.el/")
       (synopsis "GNU Emacs client for the Telegram messenger")
       (description "Telega is a full-featured, unofficial GNU Emacs-based client

gnu/packages/patches/emacs-telega-path-placeholder.patch

@@ -1,39 +0,0 @@
-From 52b9a0f91094888b9dd55d3d5a50cb44887ff3d3 Mon Sep 17 00:00:00 2001
-From: Andrew Tropin <andrew@trop.in>
-Date: Mon, 6 May 2024 10:41:53 +0200
-Subject: [PATCH] Add path placeholder for telega-server-command and etc-file.
-
----
- telega-core.el      | 3 +--
- telega-customize.el | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/telega-core.el b/telega-core.el
-index f798b40..2db0d64 100644
---- a/telega-core.el
-+++ b/telega-core.el
-@@ -45,8 +45,7 @@
- (defun telega-etc-file (filename)
-   "Return absolute path to FILENAME from etc/ directory in telega.
- Use FILENAME as is if resulting file does not exist."
--  (let ((abspath (expand-file-name (concat "etc/" filename)
--                                   telega--lib-directory)))
-+  (let ((abspath (concat "@TELEGA_SHARE@" "/" filename)))
-     (if (file-exists-p abspath)
-         abspath
-       filename)))
-diff --git a/telega-customize.el b/telega-customize.el
-index 8393f0f..cb21465 100644
---- a/telega-customize.el
-+++ b/telega-customize.el
-@@ -678,7 +678,7 @@ In range [1..3].  Use 1."
-   :prefix "telega-server-"
-   :group 'telega)
- 
--(defcustom telega-server-command "telega-server"
-+(defcustom telega-server-command "@TELEGA_SERVER_BIN@"
-   "Command to run as telega server.
- It should be absolute path or binary file searchable in `exec-path'."
-   :type 'string
--- 
-2.41.0