From patchwork Thu Dec 9 15:34:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 35093 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7CB5627BBE9; Thu, 9 Dec 2021 15:38:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B77527BBEA for ; Thu, 9 Dec 2021 15:38:11 +0000 (GMT) Received: from localhost ([::1]:44864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvLUo-00029Y-56 for patchwork@mira.cbaines.net; Thu, 09 Dec 2021 10:38:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvLUg-00029H-Ar for guix-patches@gnu.org; Thu, 09 Dec 2021 10:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33041) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvLUg-0003ul-2E for guix-patches@gnu.org; Thu, 09 Dec 2021 10:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvLUf-0006Y4-SV for guix-patches@gnu.org; Thu, 09 Dec 2021 10:38:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52371] [PATCH 0/2] Update tdlib and emacs-telega. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Dec 2021 15:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: zevlg@yandex.ru, 52371@debbugs.gnu.org Received: via spool by 52371-submit@debbugs.gnu.org id=B52371.163906422525094 (code B ref 52371); Thu, 09 Dec 2021 15:38:01 +0000 Received: (at 52371) by debbugs.gnu.org; 9 Dec 2021 15:37:05 +0000 Received: from localhost ([127.0.0.1]:44583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvLTk-0006Wf-FK for submit@debbugs.gnu.org; Thu, 09 Dec 2021 10:37:05 -0500 Received: from mail-ed1-f44.google.com ([209.85.208.44]:34601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvLTi-0006W7-4r for 52371@debbugs.gnu.org; Thu, 09 Dec 2021 10:37:03 -0500 Received: by mail-ed1-f44.google.com with SMTP id x15so21162007edv.1 for <52371@debbugs.gnu.org>; Thu, 09 Dec 2021 07:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=qRNGkgAq8hmmnQUO6VVq0/6V7QSbvpFsvIOHU5K/Szs=; b=NfMIJoD4zsGy1FNYs28W1QbsvbJdlf2HJe5h5Kg/YIBcH+CrhZYrFqJsx/eHy3v6G5 6wfgUIVRYOPvkUh6mZZ7Cz4QZN0ZvA1wDDr7THXAlsUmk+96U00a8emp/qFteV/Yd3XT U0ckKi/KW/Z4CH5d5H7USK4V9tDz5Nj9Igx4A5ka/mag0NFDrtHOJw3Tk4UxKsL+/v9y RHpwAlLeCIXcsByCQUnCz9jw/kqG6XfDkWQsl/VuSFYNOHt9WJg99B/G24isrR50bUuz yvB5PFeGcJkDZIjYe+/lg7uM8EkJe/sN6w0GHD6pVImSK5UgCf1NfQ7QsCytW+KXiHOA Vjiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=qRNGkgAq8hmmnQUO6VVq0/6V7QSbvpFsvIOHU5K/Szs=; b=BpCTpyE9z5eA3WYq5rVndwp7iDJsgVvx+b6ylerfXSjkU/sKU3f+VQznOpFDsMK8jD h106mRY9ocBRz3ZX+1p7skVldor6N38jczgE3sFpkakaqwPngZjyUnSnLtd6dM3vP/pR HUZQkHD6s1cG0Bufrwi+zoDb0GLCzWEAS0rlFQqbHrtXKbibuJ+gelaVfV5fJHioczPm xT8wBsGOPiFWV25T9f+j1NQmK/7qe1ETeuey5Qg3UUpfDznu2okEnid49PvWNzTe9AAw CAHLhTtSCrqw3SbvQvJfveBDQLPI11pgXt6lS00/qsvuzgeD7eDgJNtPQHRAZo2vNzl8 r/Mg== X-Gm-Message-State: AOAM5311jTbEOhfhcNuJU/ab5S0+BmAyApO5HmcjbvhAeBaTa6sheUxq vL5IWcU4GiwSxt0Kb0ZUgDNPyQ== X-Google-Smtp-Source: ABdhPJw0ifdT0lfxKYfINzUbFWN1LuC1IhCpdstakKlLx6d6YdNaoLT1V1ioJHGzk9W5ZWSzxPBQmg== X-Received: by 2002:aa7:c313:: with SMTP id l19mr29682864edq.209.1639064095999; Thu, 09 Dec 2021 07:34:55 -0800 (PST) Received: from localhost (109-252-167-227.dynamic.spd-mgts.ru. [109.252.167.227]) by smtp.gmail.com with ESMTPSA id sa17sm96475ejc.123.2021.12.09.07.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Dec 2021 07:34:55 -0800 (PST) From: Andrew Tropin In-Reply-To: <87bl1qtc7y.fsf@nicolasgoaziou.fr> References: <875yrzh2ee.fsf@trop.in> <87bl1qtc7y.fsf@nicolasgoaziou.fr> Date: Thu, 09 Dec 2021 18:34:50 +0300 Message-ID: <87k0gdg5b9.fsf@trop.in> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On 2021-12-09 09:27, Nicolas Goaziou wrote: > Hello, > > Andrew Tropin writes: > >> tdlib version 1.7.0 is deprecated and doesn't work anymore, there is no >> 1.7.9 tag in upstream repo, but the version is present in source code. >> https://github.com/tdlib/td/blob/858078d89fcd2ad1d9860547e3f87c49d0f9abe9/CMakeLists.txt#L9 >> >> emacs-telega 0.7.031 is inteded for tdlib 1.7.0, but because this tdlib >> version doesn't work anymore, Evgeny (author of telega.el) suggest to >> use telega version from master branch. I used 0.7.15 tag (closest tag >> to the version in master branch I found) + revision + commit hash. >> >> Without those updates tdlib and all clients based on it doesn't work, >> it's quite unfortunate behavior from Telegram developers, IMHO of >> course, but it's necessary to update to non-tagged versions to get it >> work again. > > Thank you. > > Could you use commit a53cb30e99f937cfd64e0266fa558785a184a553 for tdlib. > It corresponds to release 0.7.10 so you don't have to use revision and > commit binding. Updated tdlib and telega. > > Also, could you send this in two separate patches, and provide a proper > commit message, specifying new patch files and registering them in > local.mk? > > Also, you can remove trailing #t from phases. Removed. > > Could you send an updated patch? > > Regards, Attaching two patches. From 83d78a5f70351eeef7b7deb1edb96ed5cf2458cc Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 7 Dec 2021 16:05:22 +0300 Subject: [PATCH 2/2] gnu: emacs-telega: Update to 0.7.15-1.b4a5e20. * gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.7.15-1.b4a5e20. * gnu/packages/patches/emacs-telega-path-placeholder.patch: Match patch with newer source code. * gnu/packages/patches/emacs-telega-test-env.patch: Match patch with newer source code. --- gnu/packages/emacs-xyz.scm | 100 +++++++++--------- .../emacs-telega-path-placeholder.patch | 49 ++++----- .../patches/emacs-telega-test-env.patch | 30 ++++-- 3 files changed, 93 insertions(+), 86 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e542da0c26..52537b754e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27144,55 +27144,57 @@ (define-public emacs-helm-switch-to-repl (license license:gpl3+))) (define-public emacs-telega-server - (package - (name "emacs-telega-server") - (version "0.7.031") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zevlg/telega.el") - (commit (string-append "v" version)))) - (sha256 - (base32 "05j82796s4k3yr0igl6hir3p8qj0cw66vvhbpbcy28d6q9v9vjjz")) - (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 - `(#: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* "run_tests.py" - (("^(TELEGA_SERVER = ).*$" _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 + (let ((commit "b4a5e206bd259f3d7f7633a725b2990704d6a1e8") + (revision "1")) + (package + (name "emacs-telega-server") + (version (git-version "0.7.15" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevlg/telega.el") + (commit commit))) + (sha256 + (base32 "0gr4nmpk175hxmj357bpzaqywbjc6dmmvfxnyzkh884vyzbwdxlc")) + (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 + `(#: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"))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "run_tests.py" + (("^(TELEGA_SERVER = ).*$" _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 "..")))) + #: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+))) + (license license:gpl3+)))) (define-public emacs-telega (package @@ -27226,7 +27228,7 @@ (define-public emacs-telega "\"" ffmpeg-bin "\")")))))) (add-after 'unpack 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "telega-server.el" + (substitute* "telega-customize.el" (("@TELEGA_SERVER_BIN@") (string-append (assoc-ref inputs "emacs-telega-server") "/bin/telega-server"))) diff --git a/gnu/packages/patches/emacs-telega-path-placeholder.patch b/gnu/packages/patches/emacs-telega-path-placeholder.patch index c20be36712..5829edd22a 100644 --- a/gnu/packages/patches/emacs-telega-path-placeholder.patch +++ b/gnu/packages/patches/emacs-telega-path-placeholder.patch @@ -1,36 +1,31 @@ -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. +From bf95de21faa623e48bca00d6a2c9b33ab2c5d812 Mon Sep 17 00:00:00 2001 +From: Andrew Tropin +Date: Wed, 8 Dec 2021 11:01:31 +0300 +Subject: [PATCH] Use absolute path for telega-server-command. --- - telega-server.el | 6 +----- - telega-util.el | 2 +- - 2 files changed, 2 insertions(+), 6 deletions(-) + telega-customize.el | 2 +- + telega-util.el | 2 +- + 2 files changed, 2 insertions(+), 2 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@") +diff --git a/telega-customize.el b/telega-customize.el +index 0af343f..cc2938c 100644 +--- a/telega-customize.el ++++ b/telega-customize.el +@@ -591,7 +591,7 @@ In range [1..3]. Use 1." + :prefix "telega-server-" + :group 'telega) - (defun telega-server-version () - "Return telega-server version." +-(defcustom telega-server-command "telega-server" ++(defcustom telega-server-command "@TELEGA_SERVER_BIN@" + "Command to run as telega server. + It should be absolute path or binary file searchable in `exec-path'." + :type 'string diff --git a/telega-util.el b/telega-util.el -index 73a46b1..f53e20a 100644 +index 6340c27..01e3cb7 100644 --- a/telega-util.el +++ b/telega-util.el -@@ -464,7 +464,7 @@ N can't be 0." +@@ -587,7 +587,7 @@ N can't be 0." (defun telega-etc-file (filename) "Return absolute path to FILENAME from etc/ directory in telega." @@ -40,5 +35,5 @@ index 73a46b1..f53e20a 100644 (defun telega-link-props (link-type link-to &optional face) "Generate props for link button openable with `telega-link--button-action'." -- -2.32.0 +2.34.0 diff --git a/gnu/packages/patches/emacs-telega-test-env.patch b/gnu/packages/patches/emacs-telega-test-env.patch index 75fe2e12fc..c6b02be6ff 100644 --- a/gnu/packages/patches/emacs-telega-test-env.patch +++ b/gnu/packages/patches/emacs-telega-test-env.patch @@ -1,14 +1,24 @@ -Test Emacs environment on startup. +From 237ea2471bb6521390bbac174ac2a8a5e9683e4d Mon Sep 17 00:00:00 2001 +From: Andrew Tropin +Date: Tue, 7 Dec 2021 16:20:38 +0300 +Subject: [PATCH] Test Emacs environment on startup. -Patch by Diego N. Barbato +--- + telega.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/telega.el 2020-02-07 17:07:18.549970090 +0100 -+++ b/telega.el 2020-02-07 17:10:08.383499765 +0100 -@@ -82,6 +82,7 @@ - "Start telegramming. - If prefix ARG is given, then will not pop to telega root buffer." +diff --git a/telega.el b/telega.el +index d6b28b5..40854ec 100644 +--- a/telega.el ++++ b/telega.el +@@ -181,7 +181,7 @@ can't write to `telega-server-logfile'" logfile-dir))) + Pop to root buffer. + If `\\[universal-argument]' is specified, then do not pop to root buffer." (interactive "P") +- + (telega-test-env t) - (telega--create-hier) - - (unless (telega-server-live-p) + ;; For multiple accounts setup possibly select (if there is no + ;; default account declared) an account to use + (if (and telega-accounts (not (telega-account-current))) +-- +2.34.0 -- 2.34.0