From patchwork Mon May 6 09:16:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 64107 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 EBDF627BBE2; Mon, 6 May 2024 10:18:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 BF66F27BBE9 for ; Mon, 6 May 2024 10:18:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3uTo-0003mB-Oc; Mon, 06 May 2024 05:17:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s3uTb-0003k4-Ea for guix-patches@gnu.org; Mon, 06 May 2024 05:17:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s3uTb-0003UY-3n for guix-patches@gnu.org; Mon, 06 May 2024 05:17:39 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s3uTy-000734-KK; Mon, 06 May 2024 05:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70799] [PATCH] gnu: emacs-telega: Update to 0.8.255. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 06 May 2024 09:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70799 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70799@debbugs.gnu.org Cc: Sergey Trofimov , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.171498702227071 (code B ref -1); Mon, 06 May 2024 09:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 May 2024 09:17:02 +0000 Received: from localhost ([127.0.0.1]:36676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s3uT0-00072Y-4p for submit@debbugs.gnu.org; Mon, 06 May 2024 05:17:02 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s3uSu-000723-Cr for submit@debbugs.gnu.org; Mon, 06 May 2024 05:17:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s3uSO-0003Rb-JE for guix-patches@gnu.org; Mon, 06 May 2024 05:16:24 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s3uSL-0003Iy-Vm for guix-patches@gnu.org; Mon, 06 May 2024 05:16:24 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a59c5c9c6aeso215649866b.2 for ; Mon, 06 May 2024 02:16:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1714986977; x=1715591777; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7F+R5u5CNf95wYzaiNiNE8brHAUK9qiCuIs6A6ZCjgE=; b=RzQyMOZuv3ZJZ1iTMN8yDPnJLuKJE+b9oGtTJoXvvC4Kg5+twJNExZ6oJsxLlypeFe Ghk0QcXGsc4HYChwgWwDJvBF9V15bIDPWm3F+7qyiMKevG0ZbjHvY8kKcOPrwyTrt6fn 25Xq3eRp/IF41VDSJ2tp+Y30Zj8CN9cCcE1NA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714986977; x=1715591777; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7F+R5u5CNf95wYzaiNiNE8brHAUK9qiCuIs6A6ZCjgE=; b=Jta7xeKyGxTRm2fVdoorqwccJyZm02M27QL2EddEgBxgLRIQF3gzSRo3tQQFDxhHRX GLjiFGjoutivm2mtSk9a8XwstRjiuRncNENuya+o2Ufvd+7PJtOgSN5E/zGEoTmhb+M5 4ikPvHg/otkIxZw/EUMr4bdjv5nvd+pXDIWdgJ1UvQjXG1Te9FMfUZQOV0LFkM8/55OE 19e4ZRaVf5cGjoHz4iAFFmys5KxpVrhKhSpMwRMkNV7zFqfR/WNMR5JvQgAc5sH2y/E9 x2UXLlGnytk+4a9r2yLsPpRdS+kjIw5/dS2sOwOF4SRHtB3WwY+bWSgD7Zsd5JsWFZKg YUMQ== X-Gm-Message-State: AOJu0YyhqQrlT3d8Kt0wTzdkUwGe6JqITMuwgWRfndBPu8vGwUmYyEPQ idH7u7eQ2U8CmqmocjveNe77aTKfonp4QSdt0LnQWMd6pMxGRN4KJgVO6t2XufcIDVQTTTV8zP4 LgW4= X-Google-Smtp-Source: AGHT+IFYQC6AVZ0b8AjlMJp/zvFMNmyN8yZVGjT0C4iXCPPCKVvXcrw0jlPLLrdL37XUTARrIyg6/w== X-Received: by 2002:a17:907:7da6:b0:a59:ad15:6142 with SMTP id oz38-20020a1709077da600b00a59ad156142mr3195836ejc.77.1714986977290; Mon, 06 May 2024 02:16:17 -0700 (PDT) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id gx16-20020a1709068a5000b00a59bd75b4f6sm1958780ejc.40.2024.05.06.02.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 02:16:17 -0700 (PDT) From: Sergey Trofimov Date: Mon, 6 May 2024 11:16:13 +0200 Message-ID: <235aeb88718a1490dace03cde087cc9ecdc0f11d.1714986941.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::62b; envelope-from=sarg@sarg.org.ru; helo=mail-ej1-x62b.google.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.8.255. * gnu/packages/patches/emacs-telega-path-placeholder.patch: Update patch. --- gnu/packages/emacs-xyz.scm | 6 ++-- .../emacs-telega-path-placeholder.patch | 33 ++++++++++--------- 2 files changed, 20 insertions(+), 19 deletions(-) base-commit: 00aa6b5a3c1505b033d19c6d3a3021d6d6ecb31b prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3 prerequisite-patch-id: 1bcd992c56c1b094479b842032fc9731315cbf83 prerequisite-patch-id: 500c43ab90039ca164d6b0864adb110bd9bd9afe diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 310c4e1587..890ed6297c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34992,11 +34992,11 @@ (define-public emacs-helm-switch-to-repl (license license:gpl3+))) (define-public emacs-telega-server - (let ((commit "d1cf1ffe289a18f366b7f3b64f827f0d0755947a") + (let ((commit "30615199c76333af9f71992e0992ac691ca5e197") (revision "0")) (package (name "emacs-telega-server") - (version (git-version "0.8.250" revision commit)) + (version (git-version "0.8.255" revision commit)) (source (origin (method git-fetch) @@ -35004,7 +35004,7 @@ (define-public emacs-telega-server (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 - (base32 "0s1w4zb252d70n05dbsv2rnlfsg53paklafqxasl566nnzbi0d2q")) + (base32 "1kdp4wg4fkv5iiihvlkcb633d07vlqzndlv3qgak0s05vylhs72r")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" diff --git a/gnu/packages/patches/emacs-telega-path-placeholder.patch b/gnu/packages/patches/emacs-telega-path-placeholder.patch index 07ab8c1e66..e87fd89736 100644 --- a/gnu/packages/patches/emacs-telega-path-placeholder.patch +++ b/gnu/packages/patches/emacs-telega-path-placeholder.patch @@ -1,31 +1,32 @@ -From bfcd616f2870c8c3ffc9a526fcd574eb5e726a96 Mon Sep 17 00:00:00 2001 +From 52b9a0f91094888b9dd55d3d5a50cb44887ff3d3 Mon Sep 17 00:00:00 2001 From: Andrew Tropin -Date: Sat, 14 Jan 2023 09:33:34 +0400 +Date: Mon, 6 May 2024 10:41:53 +0200 Subject: [PATCH] Add path placeholder for telega-server-command and etc-file. --- - telega-core.el | 2 +- + telega-core.el | 3 +-- telega-customize.el | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/telega-core.el b/telega-core.el -index 36f121e..f9f7976 100644 +index f798b40..2db0d64 100644 --- a/telega-core.el +++ b/telega-core.el -@@ -41,7 +41,7 @@ - +@@ -45,8 +45,7 @@ (defun telega-etc-file (filename) - "Return absolute path to FILENAME from etc/ directory in telega." -- (expand-file-name (concat "etc/" filename) telega--lib-directory)) -+ (concat "@TELEGA_SHARE@" "/" filename)) - - (defconst telega-spoiler-translation-table - (let ((table (make-char-table 'translation-table))) + "Return absolute path to FILENAME from etc/ directory in telega. + Use FILENAME as is if resulting file does not exist." +- (let ((abspath (expand-file-name (concat "etc/" filename) +- telega--lib-directory))) ++ (let ((abspath (concat "@TELEGA_SHARE@" "/" filename))) + (if (file-exists-p abspath) + abspath + filename))) diff --git a/telega-customize.el b/telega-customize.el -index 0efb001..77cec5f 100644 +index 8393f0f..cb21465 100644 --- a/telega-customize.el +++ b/telega-customize.el -@@ -633,7 +633,7 @@ In range [1..3]. Use 1." +@@ -678,7 +678,7 @@ In range [1..3]. Use 1." :prefix "telega-server-" :group 'telega) @@ -35,4 +36,4 @@ index 0efb001..77cec5f 100644 It should be absolute path or binary file searchable in `exec-path'." :type 'string -- -2.38.1 +2.41.0