From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 01:48:48 2021 Received: (at submit) by debbugs.gnu.org; 25 Jun 2021 05:48:48 +0000 Received: from localhost ([127.0.0.1]:44625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwehj-0006jJ-Vc for submit@debbugs.gnu.org; Fri, 25 Jun 2021 01:48:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:41260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwehe-0006j8-Im for submit@debbugs.gnu.org; Fri, 25 Jun 2021 01:48:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwehe-0005ze-8l for guix-patches@gnu.org; Fri, 25 Jun 2021 01:48:34 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:49628) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lweha-0000en-0a for guix-patches@gnu.org; Fri, 25 Jun 2021 01:48:34 -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=I9+aZ akAyeITS8b4ChU+2EubgcLkrhUaRVeXuyNElX8=; b=BZoSzfdM64ak8Xq2/VLi6 FTUJ7P3QnjYfcTt5qcHUlAHeeKP81HnsFBy2IYhbSTKBLoFn568CVLJ6D1g0Pz3q NyIyZZPRLVFarFnQU68DWyUkhY4Pmb8fQrUm9U2v2bSi+Toz1YWpEr3sVGug1o6u JiRBkpimTB1/IjmngDjHZg= Received: from asus-laptop (unknown [27.38.248.154]) by smtp1 (Coremail) with SMTP id GdxpCgBn_G0lbtVgOIR6GQ--.15S2; Fri, 25 Jun 2021 13:48:22 +0800 (CST) User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao To: guix-patches@gnu.org Subject: [PATCH]: Update emacs-telega. Date: Fri, 25 Jun 2021 13:48:20 +0800 Message-ID: <86mtre8pgb.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgBn_G0lbtVgOIR6GQ--.15S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUD1SrUUUUU X-Originating-IP: [27.38.248.154] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbitAa8r1SImCUaZwAAs9 Received-SPF: pass client-ip=123.126.97.1; envelope-from=all_but_last@163.com; helo=mail-m971.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= 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+QrNSqfaCHwUCYNVuJBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh/gVAD9HoZOvMilm06oYlxHdG3g+wzfAEem 4faLICRL7Y1fCDkBAKsGZkFYtPbG5fCYUF9YRLmZ8L2CVRrAPQTBtoJGuFkA =wIpY -----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 32278ed29a5624efedab694c7c465a75f29c6725 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 | 54 ++++++++++++++++++- .../emacs-telega-patch-server-functions.patch | 31 ----------- .../emacs-telega-path-placeholder.patch | 44 +++++++++++++++ 4 files changed, 98 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..c722ff62fe 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 @@ -26011,6 +26011,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 5157c45126650f1439d7fdf15b2a7c8ba19d6bdc 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 | 169 +++++++++++-------------------------- 1 file changed, 50 insertions(+), 119 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c722ff62fe..c8540bbead 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26064,125 +26064,56 @@ 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) + ;; TODO: embbed references of following package into source file. + ("ffmpeg" ,ffmpeg) ; GIF, video support. + ("libwebp" ,libwebp) ; sticker support. + )) + (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 84963cfc29a53cb6d31850bd3fc85de3d5a4c893 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 c8540bbead..872f2253a0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26116,19 +26116,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 Some questions that Guix maintainer may have interest in: 1. Why separate telega-server to a dedicated package? emacs-build-system is quite cumbersome due to the different install step than gnu-build-system, if we try to mix the build code of server into it via 'modify-phases', it'll be very hard to read and understand the logic of package code. Move telega-server to a dedicated package can also help us separate package, if there's a program uses telega-server, it doesn't have to add emacs-telega as input, they just add emacs-telega-server. 2. Why propagated ffmpeg. I check the source and found that telega use binaries from ffmpeg many different place in telega-ffplay.el and telega-vvnote.el. So it's better to propagated it because it's not easy to fix them all. 3. Why install resources to '/share/emacs-telega'? I think it is closer to the flavor of FHS, and it's not hard to achieve it. -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 02:02:25 2021 Received: (at 49219) by debbugs.gnu.org; 25 Jun 2021 06:02:25 +0000 Received: from localhost ([127.0.0.1]:44633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lweuv-00076L-IM for submit@debbugs.gnu.org; Fri, 25 Jun 2021 02:02:25 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:50338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lweup-00075o-AF for 49219@debbugs.gnu.org; Fri, 25 Jun 2021 02:02:14 -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=D6u4E IgUd0SN4hDV5QCdStsr25KXtnVZnP6w3XRmSK4=; b=TYjS+oMggLj/uKvnS3eSZ HpD+1G9PI29PoRmv9vGRealnir537A+/8UDovfN84dXysefWpHvxfEGOfMiLHBMP VZWi8ROsHCuyUSqIx2gKRDMXuCxIaykx1VOycLU+6OiCDQl74S/bgQ3QJ5Xa2y34 tzTAscIJT6KokZa9MPQCBw= Received: from asus-laptop (unknown [27.38.248.154]) by smtp1 (Coremail) with SMTP id GdxpCgD33W5acdVgzFV8GQ--.110S2; Fri, 25 Jun 2021 14:02:04 +0800 (CST) References: <86mtre8pgb.fsf@163.com> User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao To: 49219@debbugs.gnu.org Subject: Re: bug#49219: Acknowledgement ([PATCH]: Update emacs-telega.) In-reply-to: Date: Fri, 25 Jun 2021 14:02:02 +0800 Message-ID: <86h7hm8oth.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgD33W5acdVgzFV8GQ--.110S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU5ku4UUUUU X-Originating-IP: [27.38.248.154] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbByQS8r11vk-H-tAAAsF X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49219 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Update patches: --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYNVxWhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh/X5gD+PAfltDOqLmLOIjaqbgiPWwbvqbz1 lr8hhEwh+LsDTgQA/jowcr6nafK5DxxSIWF9MWDaj7wYeOqvf3ns410wvsIA =4xBw -----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 f0767bee6883a5b5f6e7b3956fb0a1f5003a5182 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 | 169 +++++++++++-------------------------- 1 file changed, 50 insertions(+), 119 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ab5d0ed061..0535840293 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26065,125 +26065,56 @@ 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) + ;; TODO: embbed references of following package into source file. + ("ffmpeg" ,ffmpeg) ; GIF, video support. + ("libwebp" ,libwebp) ; sticker support. + )) + (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 aad569dfce7a3223192cd34be30ff083a6962e55 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 0535840293..5fa0a7d60e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26117,19 +26117,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 -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 02:24:02 2021 Received: (at 49219) by debbugs.gnu.org; 25 Jun 2021 06:24:02 +0000 Received: from localhost ([127.0.0.1]:44664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwfFy-0001RE-H9 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 02:24:02 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:8307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwfFu-0001Qm-KN for 49219@debbugs.gnu.org; Fri, 25 Jun 2021 02:24:01 -0400 Received: from nijino.local (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GB6Qg1MRDz1LX54; Fri, 25 Jun 2021 08:23:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GB6Qg1MRDz1LX54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624602235; bh=JUf2rzOdzWR6BWL2LaLd3ZWuf7o2x596lxqwoLYucwI=; h=Subject:From:To:Date:In-Reply-To:References:From; b=Z7LK67uHsJsWfFRF2XpeMFTvq0a6nhZ1RcqqEpug/AIkakYPxO4Ho4vC1fu/b8j0F WzGglhxA6B7Zoa6qU1Ra/JIHKUlRfoOHJo+7+T8uKAqgG1XeorTLZ/1wVBsACMkxGO MZCVydEfKs6MXe+hhy4YIcqFwfUFWdIeJ6tCXcvQ= Message-ID: Subject: Re: bug#49219: Acknowledgement ([PATCH]: Update emacs-telega.) From: Leo Prikler To: Zhu Zihao , 49219@debbugs.gnu.org Date: Fri, 25 Jun 2021 08:23:54 +0200 In-Reply-To: <86h7hm8oth.fsf@163.com> References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49219 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Freitag, den 25.06.2021, 14:02 +0800 schrieb Zhu Zihao: > Update patches: W.r.t. the propagation of ffmpeg and libwebp I don't think we'd want to force either onto the user (particularly ffmpeg might collide with a different version they've already installed). If finding and replacing all instances of "ffmpeg" with its full path is too broad, perhaps you could add procedures that find it or replace instances of ffmpeg as a binary with @ffmpeg@. I think a variable or procedure called telega- ffmpeg-command might even be acceptable by upstream and broader Emacs standards. If on the other hand you want the user's versions of those packages to be the one that's used, simply don't propagate it. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 05:32:09 2021 Received: (at 49219) by debbugs.gnu.org; 25 Jun 2021 09:32:10 +0000 Received: from localhost ([127.0.0.1]:44881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwiC1-0008Sj-MM for submit@debbugs.gnu.org; Fri, 25 Jun 2021 05:32:09 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:33906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwiBx-0008SL-CD for 49219@debbugs.gnu.org; Fri, 25 Jun 2021 05:32:07 -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=FeDdy ebAGBqqkPHTGbE9Uo9oIcUxlmzstT7ofiho8Eo=; b=IBAhv1c6SHCfJiQWlrbPM qSPs/DoL0//dw4rrTiktCcL7BdRPG4X2j2UHKsv2k6G2OZU1cCK6crdAXN6Lw33Z LtXKOB33ssYcOf/PdlwwggvwQDkPLZM4xX9qwHDjvPY94aOQ66h5UyyL0k6BOvlY oP3izS8R9IlM2trAhj8dck= Received: from asus-laptop (unknown [27.38.248.154]) by smtp1 (Coremail) with SMTP id GdxpCgDnuK+QotVgAWqUGQ--.1764S2; Fri, 25 Jun 2021 17:32:01 +0800 (CST) References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao To: Leo Prikler Subject: Re: bug#49219: Acknowledgement ([PATCH]: Update emacs-telega.) In-reply-to: Date: Fri, 25 Jun 2021 17:31:55 +0800 Message-ID: <864kdm8f3o.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GdxpCgDnuK+QotVgAWqUGQ--.1764S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7GF1kWw4DAr47AF45Cr4DArb_yoWDtwbE9F y8ZFZ3Jw4jqFWxXayDKF17GrWfGay2v34UAa1jqw1jv34kXFsxZr97WasayryUGa1rKFnI 9r1fKr4S93W29jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUb6pBDUUUUU== X-Originating-IP: [27.38.248.154] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiTxi8r1sGZSe7dAAAsU X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49219 Cc: 49219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Prikler writes: > Am Freitag, den 25.06.2021, 14:02 +0800 schrieb Zhu Zihao: >> Update patches: > W.r.t. the propagation of ffmpeg and libwebp I don't think we'd want to > force either onto the user (particularly ffmpeg might collide with a > different version they've already installed). If finding and replacing > all instances of "ffmpeg" with its full path is too broad, perhaps you > could add procedures that find it or replace instances of ffmpeg as a > binary with @ffmpeg@. I think a variable or procedure called telega- > ffmpeg-command might even be acceptable by upstream and broader Emacs > standards. > If on the other hand you want the user's versions of those packages to > be the one that's used, simply don't propagate it. > > Regards, > Leo Good, I think I can just remove ffmpeg and libwebp, leave the choice to user. Another question is, the new version is 0.7.024, which is lesser than 0.7.1. could you give me some suggestions on the version number? =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYNWiixUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh8R7gEAxOMhkrx+S0qKzBdPJU7/1B5xXZ5r YAhVjyAoAwYCV/4BAInKXMhJGvp7RiSULfzrKuvQsKbcwYPOJ3iaQItT0mIJ =VFHr -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 06:46:59 2021 Received: (at 49219) by debbugs.gnu.org; 25 Jun 2021 10:46:59 +0000 Received: from localhost ([127.0.0.1]:44941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwjMQ-0004Ar-U3 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 06:46:59 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:47056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwjMN-0004Af-NA for 49219@debbugs.gnu.org; Fri, 25 Jun 2021 06:46:58 -0400 Received: from nijino.local (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GBDG45r0yz1LX54; Fri, 25 Jun 2021 12:46:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GBDG45r0yz1LX54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624618013; bh=a7IBcSKqpD18V0nQ8K37E3u1MSazYd+KOMnAfsuH8yk=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=BXt/4OyQgvzhlCTOuzWk+Dhz9zBtiLIf1w8eSSEgwwVFHXC1U2On7ky3ABiVv8hND c3M5LSMCn6YRt0+AltshpE2g4Rin/EVVIHwssZBdgqH9LCXTzlSa18aTHcPpGLApmv ok0wROZn6vQQro024GDnyPvSmNpiVPxNfNo7JaYQ= Message-ID: <5458492367152b76fa274e54793135f2c0e16030.camel@student.tugraz.at> Subject: Re: bug#49219: Acknowledgement ([PATCH]: Update emacs-telega.) From: Leo Prikler To: Zhu Zihao Date: Fri, 25 Jun 2021 12:46:51 +0200 In-Reply-To: <864kdm8f3o.fsf@163.com> References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> <864kdm8f3o.fsf@163.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49219 Cc: 49219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Freitag, den 25.06.2021, 17:31 +0800 schrieb Zhu Zihao: > Leo Prikler writes: > > > Am Freitag, den 25.06.2021, 14:02 +0800 schrieb Zhu Zihao: > > > Update patches: > > W.r.t. the propagation of ffmpeg and libwebp I don't think we'd > > want to > > force either onto the user (particularly ffmpeg might collide with > > a > > different version they've already installed). If finding and > > replacing > > all instances of "ffmpeg" with its full path is too broad, perhaps > > you > > could add procedures that find it or replace instances of ffmpeg as > > a > > binary with @ffmpeg@. I think a variable or procedure called > > telega- > > ffmpeg-command might even be acceptable by upstream and broader > > Emacs > > standards. > > If on the other hand you want the user's versions of those packages > > to > > be the one that's used, simply don't propagate it. > > > > Regards, > > Leo > > Good, I think I can just remove ffmpeg and libwebp, leave the choice > to > user. > > Another question is, the new version is 0.7.024, which is lesser than > 0.7.1. could you give me some suggestions on the version number? Tough questions, you might want to ask upstream what their rationale is on the leading 0 and whether they plan to use a version 24 that supersedes it. Given that the switch happened between 0.7.15 and 0.7.016, you might look there for indicators, but I'm also somewhat tempted to just drop that 0. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 26 09:16:46 2021 Received: (at 49219) by debbugs.gnu.org; 26 Jun 2021 13:16:46 +0000 Received: from localhost ([127.0.0.1]:47292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lx8Aw-0006Mo-BA for submit@debbugs.gnu.org; Sat, 26 Jun 2021 09:16:46 -0400 Received: from mail-m972.mail.163.com ([123.126.97.2]:41040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lx8Au-0006Me-LK for 49219@debbugs.gnu.org; Sat, 26 Jun 2021 09:16:45 -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=hiN/s Ppj/D/5JVXGCvdF/yr4FZmxX+36Dr88+3c/0l4=; b=khwj7ZXwU6vG+ZkM53GtH ZfB4t+ncZ6jgTZRLgjwAwJaXA6BfER6f9IjIMB327oGAJl4YOBUAu/lLy5WyoHBH 9Q9zQtl4NcTKpQDyFAQruXGh231cDMLFNyWHnbzNxkfDCRJI54rd6b05wZac4M3R Dtcko+cJx/tBjTAs96+wGI= Received: from asus-laptop (unknown [27.38.248.154]) by smtp2 (Coremail) with SMTP id GtxpCgC39ci4KNdg7V1+HQ--.4399S2; Sat, 26 Jun 2021 21:16:40 +0800 (CST) References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao To: Leo Prikler Subject: Re: bug#49219: Acknowledgement ([PATCH]: Update emacs-telega.) In-reply-to: Date: Sat, 26 Jun 2021 21:16:34 +0800 Message-ID: <86o8bsg40d.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GtxpCgC39ci4KNdg7V1+HQ--.4399S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU7dWrDUUUU X-Originating-IP: [27.38.248.154] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiKRi9r1Xl08byhQAAsx X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49219 Cc: 49219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Prikler writes: https://github.com/zevlg/telega.el/issues/297 Just ask developer of telega. Seems that we'd better to let it downgrade :thinking: =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYNcoshUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh97FQD/bkv2SsVJZvMc3a7QLl6qxNTII/th SlanG0wUvt0YxDsA/i+uEVRkRKu/Xnzvydl7iJ0OvWV0D/ZZHB5sBrWm66kG =RKaz -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 22:53:18 2021 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 To: Leo Prikler Subject: Re: bug#49219: Acknowledgement ([PATCH]: Update emacs-telega.) 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49219 Cc: 49219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= 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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 05 23:04:50 2021 Received: (at 49219) by debbugs.gnu.org; 6 Jul 2021 03:04:50 +0000 Received: from localhost ([127.0.0.1]:46965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0bOE-0000dn-2V for submit@debbugs.gnu.org; Mon, 05 Jul 2021 23:04:50 -0400 Received: from m12-17.163.com ([220.181.12.17]:38191) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0bOB-0000dZ-EA for 49219@debbugs.gnu.org; Mon, 05 Jul 2021 23:04:49 -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=uyxW4 xncQaPGIFdCql0/2FjmBFPT0d9a3q0OJzV8xHk=; b=SAkhka6pZV/6qMw5rBagG dcUqu58AgY4oLZ4TvcmuDKFLGyj3hQAdcr2rza8IlTvlXZ164f75I3moUiy5v94u D1gc7r2t5dWIN7vyjkEM30M8KGFLxOb9nkVhnGB9swZqMkcYCLjcF4L+wcG7Y32k dljEJr4h5iM0jToFc94u6k= Received: from asus-laptop (unknown [117.136.40.193]) by smtp13 (Coremail) with SMTP id EcCowADXwXlHyONg4Mks_Q--.54954S2; Tue, 06 Jul 2021 11:04:41 +0800 (CST) References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> <86o8bsg40d.fsf@163.com> <86v95ybsz7.fsf@163.com> User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao To: 49219@debbugs.gnu.org Subject: Re: bug#49219: Acknowledgement ([PATCH]: Update emacs-telega.) In-reply-to: <86v95ybsz7.fsf@163.com> Date: Tue, 06 Jul 2021 11:04:36 +0800 Message-ID: <86zgv0b0sb.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: EcCowADXwXlHyONg4Mks_Q--.54954S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU3asjUUUUU X-Originating-IP: [117.136.40.193] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiTwnHr1sGZZkzbwAAsT X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49219 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable ping. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYOPIRBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh+GXAEA0vSCFSiOGGQ4HZ+KYdt4wkQrDkOh Focex92ypj6W9VUA/2Bpe1Oni7G53YH9zZPtsqoKBgx8c1Fqt0UXlX2ttygD =G0mo -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 07 09:52:37 2021 Received: (at 49219) by debbugs.gnu.org; 7 Jul 2021 13:52:37 +0000 Received: from localhost ([127.0.0.1]:51293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m17yf-0007TR-Cm for submit@debbugs.gnu.org; Wed, 07 Jul 2021 09:52:37 -0400 Received: from ns13.heimat.it ([46.4.214.66]:40842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m17yd-0007TC-2V for 49219@debbugs.gnu.org; Wed, 07 Jul 2021 09:52:35 -0400 Received: from localhost (ip6-localhost [127.0.0.1]) by ns13.heimat.it (Postfix) with ESMTP id 46E273021BC; Wed, 7 Jul 2021 13:52:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at ns13.heimat.it Received: from ns13.heimat.it ([127.0.0.1]) by localhost (ns13.heimat.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 41XzHouKvAWr; Wed, 7 Jul 2021 13:51:28 +0000 (UTC) Received: from bourrache.mug.xelera.it (unknown [93.56.171.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ns13.heimat.it (Postfix) with ESMTPSA id 2A3B93021BB; Wed, 7 Jul 2021 13:51:22 +0000 (UTC) Received: from roquette.mug.biscuolo.net (roquette [10.38.2.14]) by bourrache.mug.xelera.it (Postfix) with SMTP id A7A35109680D; Wed, 7 Jul 2021 15:51:21 +0200 (CEST) Received: (nullmailer pid 28848 invoked by uid 1000); Wed, 07 Jul 2021 13:51:21 -0000 From: Giovanni Biscuolo To: Zhu Zihao , Leo Prikler Subject: Re: [bug#49219] Acknowledgement ([PATCH]: Update emacs-telega.) In-Reply-To: <86o8bsg40d.fsf@163.com> Organization: Xelera.eu References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> <86o8bsg40d.fsf@163.com> Date: Wed, 07 Jul 2021 15:51:21 +0200 Message-ID: <87zguyut9i.fsf@xelera.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49219 Cc: 49219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello Zhu, thank you for your work on emacs-telega! ...sorry I'm late in this discussion. Zhu Zihao writes: > https://github.com/zevlg/telega.el/issues/297 > > Just ask developer of telega. > > Seems that we'd better to let it downgrade :thinking: for archival purposes, this is the comment [1] by Zajcev Evgeny: =2D-8<---------------cut here---------------start------------->8--- 0.7.0XX is for stable telega from "releases" branch 0.7.XX is for bleading edge telega from "master" branch We need a way to distinguish them, we use leading 0 right now =2D-8<---------------cut here---------------end--------------->8--- Also, the upstream README.md states: =2D-8<---------------cut here---------------start------------->8--- This project is developed on two primary branches. The 'releases' branch is kept in compatibility with TDLib major releases. The 'master' branch is for developmental purposes, and utilizes unstable features in TDLib. =2D-8<---------------cut here---------------end--------------->8--- As a general rule (AFAIU) Guix packages usually are based on stable releases so probably we should always use ..0 from now on: WDYT? In this case I'd add a comment before (version ...) to clarify this numbering scheme, something like: =2D-8<---------------cut here---------------start------------->8--- (define-public emacs-telega-server (package (name "emacs-telega-server") ;; 0.7.0XX is for stable telega from "releases" branch ;; that is kept in compatibility with TDLib major releases (version "0.7.024") =2D-8<---------------cut here---------------end--------------->8--- Also, if you think it's useful in the future we could also add a "emacs-telega-server-unstable" for testing bleading edge TDLib features. WDYT? I'll give your patch series a try if I find some time this week. Thanks! Gio' [1] https://github.com/zevlg/telega.el/issues/297#issuecomment-868992025 =2D-=20 Giovanni Biscuolo Xelera IT Infrastructures --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJABAEBCgAqFiEERcxjuFJYydVfNLI5030Op87MORIFAmDlsVkMHGdAeGVsZXJh LmV1AAoJENN9DqfOzDkStxwP/REpHim0XgPQwdwMp9jphrvd/oMlfB7eOlJzvogt 9yV9VmMlvCEDZMhIhwauHdJdpw0BBOwEe1oPLyVyFIn0p1XvaE8OdvZtHEDpVCNo 3xcZpg3EFHF6hzvzFXPewjzq8IW9i+zNc/K4Osx+fD3xZIgs5cL3UyygK8MyEgjw 6UpInrwAV/k1UW23J3AsaZEM2JDNh5igx9cuAdQHem0i3+gG4RiVxN6xsuNpAUrA I7nsxDHiRWyUPMMVtbXvEOMdAGuTm1J86qgG/nCBNi9/XZ8zUgotwH2HCs/qponl BixG7nR9mDlDWGoOgTfyPkJ63JF0RO+dkniSpbR+3plpGYe/IIHkR+xEfLitpAB9 9OLueiRQV4hLIFGdo+5wqYDNX9kCUEmKLwvZ7RqXooyCFrvMl4Z9J5CmoSxLR/WC v1G587X6c57AWezzm5m2pSBznNL7rIU1A63NNnEEvq+3VyOVIR5nYjAEK9Wp5Jye VH0OaTsu3+hzuRu71pbN6GPCthClayhI8vUEJDDpyIlWeyxg4Eu0dSGr10J2jqJd n4CnoaPQGjF0C3pnqecAC2P+Bd2GUjcAbhuTojXzRkjfdzXHofdYUfn5BVwiuj5X pEaIntiFOhUbQRiC6bhsiHgXgAV3NwT/Eap50CyCls9JRsggEVhU9Tf8DxghUG5a Gyxt =5DLY -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 06:36:55 2021 Received: (at 49219) by debbugs.gnu.org; 9 Jul 2021 10:36:55 +0000 Received: from localhost ([127.0.0.1]:58391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1nsN-0008I2-3Q for submit@debbugs.gnu.org; Fri, 09 Jul 2021 06:36:55 -0400 Received: from m12-13.163.com ([220.181.12.13]:55452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1nsJ-0008Ho-7V for 49219@debbugs.gnu.org; Fri, 09 Jul 2021 06:36:53 -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=CAzB7 rl0k83jQ9grhl5LUyt05SkbtZ/w/wH9ao8AbXc=; b=dc4H5EkWCDmoU+/zguWjw 8vlsl0QiVE4UvHYDpUhmBkTOM1ZyGF5qPPDPKC8fSYYpwmIXZn6nG8l33AgkdaAr dhDwti8WHrjxMHdlWMcWyXvRyDbzmyK3NyqoDVhiO8U8UnIDT+81Ta4ltKTpncJk MEdeAbxplIUIsmLmsPfKcw= Received: from asus-laptop (unknown [183.19.167.139]) by smtp9 (Coremail) with SMTP id DcCowAD3+3u9Juhga8EXKQ--.16747S2; Fri, 09 Jul 2021 18:36:46 +0800 (CST) References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> <86o8bsg40d.fsf@163.com> <87zguyut9i.fsf@xelera.eu> User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao To: Giovanni Biscuolo Subject: Re: [bug#49219] Acknowledgement ([PATCH]: Update emacs-telega.) In-reply-to: <87zguyut9i.fsf@xelera.eu> Date: Fri, 09 Jul 2021 18:36:42 +0800 Message-ID: <86eec793k5.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: DcCowAD3+3u9Juhga8EXKQ--.16747S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUxq2NDUUUU X-Originating-IP: [183.19.167.139] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbitBjKr1SImMGihgABsp X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49219 Cc: Leo Prikler , 49219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Giovanni Biscuolo writes: > > Also, if you think it's useful in the future we could also add a > "emacs-telega-server-unstable" for testing bleading edge TDLib features. > > WDYT? > > I'll give your patch series a try if I find some time this week. > > Thanks! Gio' > > > [1] https://github.com/zevlg/telega.el/issues/297#issuecomment-868992025 I'm OK with it, maybe rename it to `emacs-telega-server-next`? But I'm not sure Guix maintainer would accept it or not. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYOgmuhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh/8yAD/RC9Z5cT7/9Fpdz0PNHRli9mcoMWw ZaujqFQoo497Rz0A/34rjZChesG3XKgmx5tF5X+slnDJ5rVuymI/1J6R8XsA =7IJb -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 07:27:51 2021 Received: (at 49219) by debbugs.gnu.org; 9 Jul 2021 11:27:51 +0000 Received: from localhost ([127.0.0.1]:58420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1off-00011m-KW for submit@debbugs.gnu.org; Fri, 09 Jul 2021 07:27:51 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:11394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1ofc-00011b-9Z for 49219@debbugs.gnu.org; Fri, 09 Jul 2021 07:27:50 -0400 Received: from [10.0.0.4] (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GLrVm2nBkz1LLyW; Fri, 9 Jul 2021 13:27:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GLrVm2nBkz1LLyW DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625830064; bh=a3U5hLe0Ygu2KyC3jX7e57i+TTfmvzN5pcM77lQuzU8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=QLXs0reRxyu0oy41UTB/25jWAdDzUVAdNgUVS2bM1OD/3RRVwJFLWPI6aOesLKrHt CHNx/ShJbns/PPO6hbZBuwXgH4rZttjeQaO4g1Dmk5Ol5CTGSwQbjCAzZOlogdhGPc PkVWQeZU4/6WBuzqYJOVbcVxozQzIhn/FiZdNzkk= Message-ID: <0fb80caedd384347c57b0a0feaae0afff2861b96.camel@student.tugraz.at> Subject: Re: [bug#49219] Acknowledgement ([PATCH]: Update emacs-telega.) From: Leo Prikler To: Zhu Zihao , Giovanni Biscuolo Date: Fri, 09 Jul 2021 13:27:18 +0200 In-Reply-To: <86eec793k5.fsf@163.com> References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> <86o8bsg40d.fsf@163.com> <87zguyut9i.fsf@xelera.eu> <86eec793k5.fsf@163.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49219 Cc: 49219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Freitag, den 09.07.2021, 18:36 +0800 schrieb Zhu Zihao: > Giovanni Biscuolo writes: > > > Also, if you think it's useful in the future we could also add a > > "emacs-telega-server-unstable" for testing bleading edge TDLib > > features. > > > > WDYT? > > > > I'll give your patch series a try if I find some time this week. > > > > Thanks! Gio' > > > > > > [1] > > https://github.com/zevlg/telega.el/issues/297#issuecomment-868992025 > > I'm OK with it, maybe rename it to `emacs-telega-server-next`? > > But I'm not sure Guix maintainer would accept it or not. This probably depends on how often we'd have to bump TDLib to make this meaningful. "Major" release sounds like a 1.0 → 2.0 version bump, which if "unstable" telega only depended on stuff introduced e.g. in 1.1 → 1.2 sounds a little too strict. However, if unstable telega means tailing arbitrary TDLib commits, I'd rather avoid doing that. There's so far no precedent to worry about such things, though, so I'd rather push the existing patch after some testing or an altered one if problems are detected. I haven't gotten to testing things myself either, but given that we are one stable telega release behind, now sounds like a good time to start doing that. (Please pardon the laziness on my part – I typically do lexical work before practical one to allow myself to work on other patches and projects as well.) Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 09:16:01 2021 Received: (at 49219-done) by debbugs.gnu.org; 9 Jul 2021 13:16:01 +0000 Received: from localhost ([127.0.0.1]:58527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qML-0005pj-Ga for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:16:01 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:29275) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qMH-0005pT-R9 for 49219-done@debbugs.gnu.org; Fri, 09 Jul 2021 09:15:59 -0400 Received: from [10.0.0.4] (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GLtvZ09Z4z1LBRt; Fri, 9 Jul 2021 15:15:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GLtvZ09Z4z1LBRt DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625836554; bh=wsbpt2/OZZ0Y+WAb2svDRvmg6TWHag7qMc/q0wWHG/c=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=JchFH5g26GXBywYVKN32HFl8hRH2ug7rnGYegpYff8EJcrPjZONpRWEItVSXxCAOi TpKaJ0R6ddItlS0pOh8B9RIOTaGy2PigqA8EtHZKoyGaaNZ8B62XKhjZMWxeGyxwr9 kCzbBGmCCJIiRjRiC1c8Jxx6rUJZvJczaWqbpROo= Message-ID: Subject: Re: [bug#49219] Acknowledgement ([PATCH]: Update emacs-telega.) From: Leo Prikler To: Zhu Zihao , Giovanni Biscuolo Date: Fri, 09 Jul 2021 15:15:32 +0200 In-Reply-To: <0fb80caedd384347c57b0a0feaae0afff2861b96.camel@student.tugraz.at> References: <86mtre8pgb.fsf@163.com> <86h7hm8oth.fsf@163.com> <86o8bsg40d.fsf@163.com> <87zguyut9i.fsf@xelera.eu> <86eec793k5.fsf@163.com> <0fb80caedd384347c57b0a0feaae0afff2861b96.camel@student.tugraz.at> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 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.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49219-done Cc: 49219-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Freitag, den 09.07.2021, 13:27 +0200 schrieb Leo Prikler: > Am Freitag, den 09.07.2021, 18:36 +0800 schrieb Zhu Zihao: > > Giovanni Biscuolo writes: > > > > > Also, if you think it's useful in the future we could also add a > > > "emacs-telega-server-unstable" for testing bleading edge TDLib > > > features. > > > > > > WDYT? > > > > > > I'll give your patch series a try if I find some time this week. > > > > > > Thanks! Gio' > > > > > > > > > [1] > > > https://github.com/zevlg/telega.el/issues/297#issuecomment-868992025 > > > > I'm OK with it, maybe rename it to `emacs-telega-server-next`? > > > > But I'm not sure Guix maintainer would accept it or not. > This probably depends on how often we'd have to bump TDLib to make > this > meaningful. "Major" release sounds like a 1.0 → 2.0 version bump, > which if "unstable" telega only depended on stuff introduced e.g. in > 1.1 → 1.2 sounds a little too strict. However, if unstable telega > means tailing arbitrary TDLib commits, I'd rather avoid doing that. > > There's so far no precedent to worry about such things, though, so > I'd > rather push the existing patch after some testing or an altered one > if > problems are detected. I haven't gotten to testing things myself > either, but given that we are one stable telega release behind, now > sounds like a good time to start doing that. (Please pardon the > laziness on my part – I typically do lexical work before practical > one > to allow myself to work on other patches and projects as well.) > > Regards, > Leo After some testing, I've decided to push the current patch set, albeit with some changes. I redid my old hardcoding of ffmpeg and rephrased the commit messages to be more explicit. I also followed up with a bump to 0.7.025. There might still be some discussion to be had about versioning, but for now I will close this bug. Regards, Leo From unknown Sat Jun 14 05:07:40 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 07 Aug 2021 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator