From patchwork Thu Mar 9 22:55:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Miguel_=C3=81ngel_Moreno?= X-Patchwork-Id: 47832 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 76A1E16E4E; Thu, 9 Mar 2023 22:56:18 +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=-1.8 required=5.0 tests=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 6CDDE16E4D for ; Thu, 9 Mar 2023 22:56:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paPB5-0001Iz-VE; Thu, 09 Mar 2023 17:56:03 -0500 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 1paPB4-0001Il-C5 for guix-patches@gnu.org; Thu, 09 Mar 2023 17:56:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paPB4-0006nV-4s for guix-patches@gnu.org; Thu, 09 Mar 2023 17:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paPB3-0008Ot-PP for guix-patches@gnu.org; Thu, 09 Mar 2023 17:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61941] [PATCH v2] gnu: emacs-helpful: Update to 0.19.1c98f6f. References: In-Reply-To: Resent-From: conses Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Mar 2023 22:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61941@debbugs.gnu.org Cc: contact@conses.eu, Nicolas Goaziou Received: via spool by 61941-submit@debbugs.gnu.org id=B61941.167840254732270 (code B ref 61941); Thu, 09 Mar 2023 22:56:01 +0000 Received: (at 61941) by debbugs.gnu.org; 9 Mar 2023 22:55:47 +0000 Received: from localhost ([127.0.0.1]:53289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paPAo-0008OO-B3 for submit@debbugs.gnu.org; Thu, 09 Mar 2023 17:55:46 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:37053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paPAn-0008OC-2Y for 61941@debbugs.gnu.org; Thu, 09 Mar 2023 17:55:45 -0500 Received: (Authenticated sender: contact@conses.eu) by mail.gandi.net (Postfix) with ESMTPSA id 7074120003; Thu, 9 Mar 2023 22:55:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conses.eu; s=gm1; t=1678402539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Juem8ydde8zF48Z47TYWnLVEzpAgDbzwIRH4a1kwjvI=; b=WNyCtPaBqTwDZuoUxaoqgXNDusL9ChPRaLjvMikaUjRrGdf5bQ2q1L5dMx5raFXnA89DFj GFpLmN2NiXl6HIYDlNJCRhBojzzAvS6+eYBAMti5RXpZznkxAPjovn1K3i2YQJyojqMQZW KiHQSDTJlChZt+aXm2erFjPZA8DQlP2WybqEX2XAcL0XGjdkb1+M3FcJ6K/QnZKHpr76B5 LkKTf8xg9gHGJDiQIzvKm/QOw1WUxzDTfJt7FkjVQ36+Dn8tfEfRCFSD1ar4gqgVexkKze 9dr2sUfmBx0+f2SNRdmpIIWDoUdNPE2t8uzbiOFrHxk/FgqNRvbYdR7BI8o8mQ== From: conses Date: Thu, 09 Mar 2023 23:55:37 +0100 Message-ID: <86v8j9a61i.fsf@conses.eu> User-Agent: Gnus/5.13 (Gnus v5.13) 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.19.1c98f6f. [source]: Remove fix-docstring-test.patch. [propagated-inputs]: Remove emacs-shut-up. --- gnu/packages/emacs-xyz.scm | 52 +++++++++---------- .../emacs-helpful-fix-docstring-test.patch | 18 ------- 2 files changed, 26 insertions(+), 44 deletions(-) delete mode 100644 gnu/packages/patches/emacs-helpful-fix-docstring-test.patch diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c067fe16c..fa528432cb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23303,31 +23303,31 @@ (define-public emacs-download-region (license license:gpl3+)))) (define-public emacs-helpful - (package - (name "emacs-helpful") - (version "0.19") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Wilfred/helpful") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0qwsifzsjw95l83m7z07fr9h1sqbhggwmcps1qgbddpan2a8ab8a")) - ;; Cherry-picked from upstream, remove when bumping to 0.20. - (patches (search-patches "emacs-helpful-fix-docstring-test.patch")))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-elisp-refs emacs-dash emacs-s emacs-f emacs-shut-up)) - (native-inputs - (list emacs-ert-runner emacs-undercover)) - (arguments - `(#:tests? #t - #:test-command '("ert-runner"))) - (home-page "https://github.com/Wilfred/helpful") - (synopsis "More contextual information in Emacs help") - (description "@code{helpful} is an alternative to the built-in Emacs help + (let ((commit "1c98f6f06a85def5d34c735f8cd407f20cebddf9") + (revision "0")) + (package + (name "emacs-helpful") + (version (git-version "0.19" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Wilfred/helpful") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18b5hjfji51zxjrxhkklxx3j9svk295awmxv8n95mp8ilas2kd3l")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-dash emacs-elisp-refs emacs-f emacs-s)) + (native-inputs + (list emacs-ert-runner emacs-undercover)) + (arguments + `(#:tests? #t + #:test-command '("ert-runner"))) + (home-page "https://github.com/Wilfred/helpful") + (synopsis "More contextual information in Emacs help") + (description "@code{helpful} is an alternative to the built-in Emacs help that provides much more contextual information. @itemize @@ -23346,7 +23346,7 @@ (define-public emacs-helpful @item Trace, disassemble functions from inside Helpful. This is discoverable and doesn't require memorisation of commands. @end itemize\n") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-logview (package diff --git a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch b/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch deleted file mode 100644 index de40010fa2..0000000000 --- a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -This patch fixing a build failure has been cherry-picked from upstream. -Originally submitted as pull request by Erik Šabič. -See also . -diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el -index a07aa8e..8a95129 100644 ---- a/test/helpful-unit-test.el -+++ b/test/helpful-unit-test.el -@@ -119,7 +119,9 @@ bar"))) - (should - (equal - (helpful--docstring #'test-foo-advised t) -- "Docstring here too."))) -+ (if (version< emacs-version "28") -+ "Docstring here too." -+ "Docstring here too.\n\nThis function has :around advice: `ad-Advice-test-foo-advised'.")))) - - (defun test-foo-no-docstring () - nil)