From patchwork Mon May 30 07:20:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: yarl baudig X-Patchwork-Id: 39682 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 B939027BBEA; Mon, 30 May 2022 08:21:35 +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 6F30B27BBE9 for ; Mon, 30 May 2022 08:21:35 +0100 (BST) Received: from localhost ([::1]:56258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvZiY-0000ZE-Je for patchwork@mira.cbaines.net; Mon, 30 May 2022 03:21:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvZi2-0000YR-1K for guix-patches@gnu.org; Mon, 30 May 2022 03:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48705) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvZi1-0006GW-OF for guix-patches@gnu.org; Mon, 30 May 2022 03:21:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nvZi1-0007Gh-Ko for guix-patches@gnu.org; Mon, 30 May 2022 03:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55674] [PATCH] gnu: emacs-helpful: Update to 0.19 References: <20220527125242.27817-2-erik.sab@gmail.com> Resent-From: yarl-baudig@mailoo.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 May 2022 07:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55674 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: liliana.prikler@gmail.com, 55674@debbugs.gnu.org Received: via spool by 55674-submit@debbugs.gnu.org id=B55674.165389523527897 (code B ref 55674); Mon, 30 May 2022 07:21:01 +0000 Received: (at 55674) by debbugs.gnu.org; 30 May 2022 07:20:35 +0000 Received: from localhost ([127.0.0.1]:42602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nvZha-0007Fs-KZ for submit@debbugs.gnu.org; Mon, 30 May 2022 03:20:34 -0400 Received: from msg-1.mailo.com ([213.182.54.11]:35018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nvZhX-0007Fe-Sg for 55674@debbugs.gnu.org; Mon, 30 May 2022 03:20:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailoo.org; s=mailo; t=1653895224; bh=vbvWYfmLIBO9PSyfiCptEDySOSeeKCE2l9oGqMBNYv4=; h=X-EA-Auth:From:To:Date:Subject:MIME-Version:X-Mailer:Message-ID: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=TVXigIsMSiRFnxmZKdvX5WzCP/JV7wk8QWOR2Si2PrWg3TZ74ZZEkH6qFqPCHMPSJ nsU3t0Aqka+9Ou0HP12GxQKYrTclJ+RiX4val+7f2lNvSPo9lbw6sTKhCneQMrSVuQ N6X/7G5cByq/BkUfwtGr/SdYsbVULQ2cWx/McQ/I= Received: by www-8.mailo.com with http webmail; Mon, 30 May 2022 09:20:24 +0200 (CEST) X-EA-Auth: V1fgJ0yJiODkK5R3GqtBySlC0ACBo9IvpmrY7x6w7upsbsJwex2ih9gn9MSuBOCbfQABsB+TL6mT+VA5ykByVp3pcAd3xXaw From: yarl-baudig@mailoo.org Date: Mon, 30 May 2022 09:20:24 +0200 (CEST) X-Priority: 3 MIME-Version: 1.0 X-Mailer: COMS/EA21.01/r20220415 Message-ID: In-Reply-To: <37d8fb49b31dd974ffc7c02689ddee2e3b9d98f9.camel@gmail.com> 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 Includes fixe for test from Erik Šabič against upstream, see details in the patch file. * gnu/packages/patches/emacs-helpful-fix-0.19-test.patch: New file. * gnu/packages/emacs-xyz.scm: Update emacs-helpful to 0.19, use the patch. * gnu/local.mk: Update dist_patch_DATA. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 7 ++++-- .../patches/emacs-helpful-fix-0.19-test.patch | 23 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/emacs-helpful-fix-0.19-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index bc82c5ba9f..71f6b7669a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1029,6 +1029,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ + %D%/packages/patches/emacs-helpful-fix-0.19-test.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 31822dc641..c5fa725bf5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20131,7 +20131,7 @@ (define-public emacs-download-region (define-public emacs-helpful (package (name "emacs-helpful") - (version "0.18") + (version "0.19") (source (origin (method git-fetch) @@ -20140,7 +20140,10 @@ (define-public emacs-helpful (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0gdjxykqkal2x765mi51m99i5ql23i1fy909wy4mzj5ajhjfgqcc")))) + (base32 "0qwsifzsjw95l83m7z07fr9h1sqbhggwmcps1qgbddpan2a8ab8a")) + ;; TODO: remove this patch as soon as the package is updated to 0.20 + ;; See explanation in the patch file + (patches (search-patches "emacs-helpful-fix-0.19-test.patch")))) (build-system emacs-build-system) (propagated-inputs (list emacs-elisp-refs emacs-dash emacs-s emacs-f emacs-shut-up)) diff --git a/gnu/packages/patches/emacs-helpful-fix-0.19-test.patch b/gnu/packages/patches/emacs-helpful-fix-0.19-test.patch new file mode 100644 index 0000000000..64000f2b73 --- /dev/null +++ b/gnu/packages/patches/emacs-helpful-fix-0.19-test.patch @@ -0,0 +1,23 @@ +Erik Šabič sent a pull request (patches 741b864 and 209971b) against 2f91e79, +which is not a release. +This is a diff between 0.19 and those 2 patches applied against 0.19. + +So, when 0.20 will be released, this patch can be removed. + +The procedure should be as simple as reverting the commit including +this file then calling `guix refresh emacs-helpful`. +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)