From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yEF1NXdwlGLp9AAAbAwnHQ (envelope-from ) for ; Mon, 30 May 2022 09:21:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id GC6KNHdwlGISXAAAG6o9tA (envelope-from ) for ; Mon, 30 May 2022 09:21:27 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5D101433BA for ; Mon, 30 May 2022 09:21:27 +0200 (CEST) Received: from localhost ([::1]:56258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvZiQ-0000ZE-0E for larch@yhetil.org; Mon, 30 May 2022 03:21:26 -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> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653895287; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kbl/cwE7CALLJdG11CbTB5MHEFTPnxkoP4HP6x3kAZY=; b=XG6Hfz8+fkLKnLP39gYBUs+7vASnt1FcdT0AxxI7DcguqYAU82iFkuGdkNy8wIYDrQPFD/ M+oA4pjNMHm8PfiHo05gv1WrLdPqFI9bbqBdzSWDgK7s8jM1SQ7F+fxhH3bdcDDM3uMGBH ZAFFN2yJRhl1WQy4z5OcKxZqH/jEoXaB0EkDl3jN18pfm07nfamxkMZGEaLYpNi1DNvqB7 Qf3xTRlDf2Kx9MNPE5uiJzx072gmg0FZWY/mWaKvdmc7YrnvRokO2H42R73B0Klnn3MQVH opXVCf2Dd792wGUZw6rjLkDl+3aAeInlAmnlKvofCjll/cTAXPWv4HXvY+8TAA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653895287; a=rsa-sha256; cv=none; b=kATtKhr63KzOidaecrZfElcF6luv1b51ByqjhB9/xlhP+VFuPk5nMiLN/j39IWa7CYCJns /q/9YD9xkzidNxeNPCphokgwTieZiX6lOh7c+YftpbPJJw9gOGZu8c0A0Ed3Dz/Dr36Sbn 47SPNn1guP9Ze89wm9XA3vj8HLExNPs6HFV7IvS/NLkb1R1gkBAC/Za32TrcY5h6Bfilrp uWelqZhLdb5Mr4rbnRcVWk76h0Ui93NJsD4gG3hb6r5cAKk+af/mUytEcHGpNSt2ct2mTu a7tD+0JZjljCTqI6vMFLlbPYfYa9eEsjz9oq6XIJmhxvraQL5FX22agsBq38jA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailoo.org header.s=mailo header.b=TVXigIsM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mailoo.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailoo.org header.s=mailo header.b=TVXigIsM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mailoo.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 5D101433BA X-Spam-Score: 5.97 X-Migadu-Scanner: scn1.migadu.com X-TUID: wsYzXUFbs6bt Includes fixe for test from Erik =C5=A0abi=C4=8D 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 =3D \ %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 =C5=A0abi=C4=8D sent a pull request (patches 741b864 and 209971b) ag= ainst 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'.")))) +=20 + (defun test-foo-no-docstring () + nil) --=20 2.36.0