(address . guix-patches@gnu.org)(name . Sergey Trofimov)(address . sarg@sarg.org.ru)
235aeb88718a1490dace03cde087cc9ecdc0f11d.1714986941.git.sarg@sarg.org.ru
* gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.8.255.
* gnu/packages/patches/emacs-telega-path-placeholder.patch: Update patch.
---
gnu/packages/emacs-xyz.scm | 6 ++--
.../emacs-telega-path-placeholder.patch | 33 ++++++++++---------
2 files changed, 20 insertions(+), 19 deletions(-)
Toggle diff (92 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 310c4e1587..890ed6297c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -34992,11 +34992,11 @@ (define-public emacs-helm-switch-to-repl
(license license:gpl3+)))
(define-public emacs-telega-server
- (let ((commit "d1cf1ffe289a18f366b7f3b64f827f0d0755947a")
+ (let ((commit "30615199c76333af9f71992e0992ac691ca5e197")
(revision "0"))
(package
(name "emacs-telega-server")
- (version (git-version "0.8.250" revision commit))
+ (version (git-version "0.8.255" revision commit))
(source
(origin
(method git-fetch)
@@ -35004,7 +35004,7 @@ (define-public emacs-telega-server
(url "https://github.com/zevlg/telega.el")
(commit commit)))
(sha256
- (base32 "0s1w4zb252d70n05dbsv2rnlfsg53paklafqxasl566nnzbi0d2q"))
+ (base32 "1kdp4wg4fkv5iiihvlkcb633d07vlqzndlv3qgak0s05vylhs72r"))
(file-name (git-file-name "emacs-telega" version))
(patches
(search-patches "emacs-telega-path-placeholder.patch"
diff --git a/gnu/packages/patches/emacs-telega-path-placeholder.patch b/gnu/packages/patches/emacs-telega-path-placeholder.patch
index 07ab8c1e66..e87fd89736 100644
--- a/gnu/packages/patches/emacs-telega-path-placeholder.patch
+++ b/gnu/packages/patches/emacs-telega-path-placeholder.patch
@@ -1,31 +1,32 @@
-From bfcd616f2870c8c3ffc9a526fcd574eb5e726a96 Mon Sep 17 00:00:00 2001
+From 52b9a0f91094888b9dd55d3d5a50cb44887ff3d3 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
-Date: Sat, 14 Jan 2023 09:33:34 +0400
+Date: Mon, 6 May 2024 10:41:53 +0200
Subject: [PATCH] Add path placeholder for telega-server-command and etc-file.
---
- telega-core.el | 2 +-
+ telega-core.el | 3 +--
telega-customize.el | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/telega-core.el b/telega-core.el
-index 36f121e..f9f7976 100644
+index f798b40..2db0d64 100644
--- a/telega-core.el
+++ b/telega-core.el
-@@ -41,7 +41,7 @@
-
+@@ -45,8 +45,7 @@
(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))
-
- (defconst telega-spoiler-translation-table
- (let ((table (make-char-table 'translation-table)))
+ "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 0efb001..77cec5f 100644
+index 8393f0f..cb21465 100644
--- a/telega-customize.el
+++ b/telega-customize.el
-@@ -633,7 +633,7 @@ In range [1..3]. Use 1."
+@@ -678,7 +678,7 @@ In range [1..3]. Use 1."
:prefix "telega-server-"
:group 'telega)
@@ -35,4 +36,4 @@ index 0efb001..77cec5f 100644
It should be absolute path or binary file searchable in `exec-path'."
:type 'string
--
-2.38.1
+2.41.0
base-commit: 00aa6b5a3c1505b033d19c6d3a3021d6d6ecb31b
prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3
prerequisite-patch-id: 1bcd992c56c1b094479b842032fc9731315cbf83
prerequisite-patch-id: 500c43ab90039ca164d6b0864adb110bd9bd9afe
--
2.41.0