[bug#50429] [PATCH] gnu: update emacs-telega-server and some change

[bug#50429] [PATCH] gnu: update emacs-telega-server and some change

[Zheng Junjie via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-emacs-telega-server-Update-to-0.7.030.patch --]
[-- Type: text/x-patch, Size: 1329 bytes --]

From 92a450fe602c1f0d5ff244762239240d6b72749f Mon Sep 17 00:00:00 2001
From: Z572 <873216071@qq.com>
Date: Mon, 6 Sep 2021 18:43:56 +0800
Subject: [PATCH 1/3] gnu: emacs-telega-server: Update to 0.7.030.

* gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.7.030.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f04a0225b3..e682d9cdd2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -26599,7 +26599,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
 (define-public emacs-telega-server
   (package
     (name "emacs-telega-server")
-    (version "0.7.025")
+    (version "0.7.030")
     (source
      (origin
        (method git-fetch)
@@ -26607,7 +26607,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
              (url "https://github.com/zevlg/telega.el")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "1fdvghwpmja94d65p02j7wa09lwjs3ah1kfb1v17b6l9qd5g80nc"))
+        (base32 "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9"))
        (file-name (git-file-name "emacs-telega" version))
        (patches
         (search-patches "emacs-telega-path-placeholder.patch"
-- 
2.33.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-emacs-telega-server-use-make-flags-instead-of-mo.patch --]
[-- Type: text/x-patch, Size: 1708 bytes --]

From c0ea703079ea9e209c07b0c67d4f2818cd6d94fd Mon Sep 17 00:00:00 2001
From: Z572 <873216071@qq.com>
Date: Mon, 6 Sep 2021 18:44:38 +0800
Subject: [PATCH 2/3] gnu: emacs-telega-server: use make-flags instead of
 modify makefile.

* gnu/packages/emacs-xyz.scm (emacs-telega-server)[arguments]: Add the
 #:make-flags argument. and remove substitute* makefile.
---
 gnu/packages/emacs-xyz.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e682d9cdd2..081e8cceab 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -26614,18 +26614,17 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
                         "emacs-telega-test-env.patch"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     `(#:make-flags
+       (list (string-append "CC=" ,(cc-for-target))
+             (string-append "INSTALL_PREFIX="
+                            (assoc-ref %outputs "out") "/bin"))
+       #: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=cc") ,(string-append "CC=" (cc-for-target)))
-                 (("^(INSTALL_PREFIX=).*$" _all prefix)
-                  (string-append prefix out "/bin\n")))
-
                (substitute* "run_tests.py"
                  (("^(TELEGA_SERVER = ).*$" _all prefix)
                   (string-append prefix
-- 
2.33.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0003-gnu-emacs-telega-Install-etc-directory-to-better-pat.patch --]
[-- Type: text/x-patch, Size: 2384 bytes --]

From 51806ebddc0cc85a84017ed6537eee6ed6238760 Mon Sep 17 00:00:00 2001
From: Z572 <873216071@qq.com>
Date: Mon, 6 Sep 2021 18:56:18 +0800
Subject: [PATCH 3/3] gnu: emacs-telega: Install etc directory to better path.

* gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: Add the #:include
argument.  Remove install-share-files phase.
---
 gnu/packages/emacs-xyz.scm | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 081e8cceab..2f5a0d46ee 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -26657,6 +26657,7 @@ service, and connect it with Emacs via inter-process communication.")
                     emacs-minimal
                     ;; Require wide-int support for 32-bit platform.
                     emacs-wide-int)
+       #:include (cons "^etc\\/" %default-include)
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-sources
@@ -26684,24 +26685,8 @@ service, and connect it with Emacs via inter-process communication.")
                                "/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)))))
+                (string-append (elpa-directory (assoc-ref outputs "out"))
+                               "/etc"))))))))
     (inputs
      `(("emacs-telega-server" ,emacs-telega-server)
        ("ffmpeg" ,ffmpeg)))
-- 
2.33.0


[-- Attachment #4: Type: text/plain, Size: 10 bytes --]


-- 
over

[bug#50429] [PATCH] gnu: update emacs-telega-server and some change

[Nicolas Goaziou]

Hello,

All applied. Thank you.

Regards,
-- 
Nicolas Goaziou