From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 GJA0D0dRhWIDzwAAbAwnHQ (envelope-from ) for ; Wed, 18 May 2022 22:04:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aP9CD0dRhWJd2wAA9RJhRA (envelope-from ) for ; Wed, 18 May 2022 22:04:23 +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 B3B8ABAB2 for ; Wed, 18 May 2022 22:04:21 +0200 (CEST) Received: from localhost ([::1]:49794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrPu8-0002ob-Jw for larch@yhetil.org; Wed, 18 May 2022 16:04:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrPtq-0002n7-L7 for bug-guix@gnu.org; Wed, 18 May 2022 16:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrPtq-0004Vw-Bc for bug-guix@gnu.org; Wed, 18 May 2022 16:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrPtq-00033H-89 for bug-guix@gnu.org; Wed, 18 May 2022 16:04:02 -0400 Subject: bug#55501: [PACTH] emacs-evil fails compilation by emacs-28.1, but upstream has newer commits which should compile Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-To: bug-guix@gnu.org Resent-Date: Wed, 18 May 2022 20:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 55501 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Maze , 55501-done@debbugs.gnu.org Mail-Followup-To: 55501@debbugs.gnu.org, liliana.prikler@gmail.com, maze@pkbd.org Received: via spool by 55501-done@debbugs.gnu.org id=D55501.165290420811687 (code D ref 55501); Wed, 18 May 2022 20:04:02 +0000 Received: (at 55501-done) by debbugs.gnu.org; 18 May 2022 20:03:28 +0000 Received: from localhost ([127.0.0.1]:33692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrPtH-00032Q-LL for submit@debbugs.gnu.org; Wed, 18 May 2022 16:03:27 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:39567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrPtG-00032C-9H for 55501-done@debbugs.gnu.org; Wed, 18 May 2022 16:03:27 -0400 Received: by mail-ej1-f67.google.com with SMTP id tk15so5859040ejc.6 for <55501-done@debbugs.gnu.org>; Wed, 18 May 2022 13:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=4AKSMZnuj7tbY5rFDfkgzeKFHcn9uDx3f8fxZMzEYU8=; b=NWsn355RnPJWqk0Liu1+gJF1MKPkkTDcpR54SEKnvYyudUBYF2jJVACgTjdIwjQudP 0vgnr4DgXR+/Jr1Hv6GQXwyPL9g0j9AlXLTIvrwtfJvwrZ8A1L12S1yuzIeGbRXWt3go wk6RD6yEiiOa1bUDxWFJX1g0H+pG2KmJfkxV/8mbfSkKLtW2c82rX5IKAyT0Mta97Pv2 DRhMBh+P13DPG7btUqdEQo68EWb0kEeFF/DxI+HFsKb99A4VhyPYFw7qbEovQ4ruvRWt 1oU8f90RrMG2Haa3IukZfU/QHqtcZekew4GQEMOZOGyMdUP8UNnWMHdS6fHTdEZD68LR Rz4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=4AKSMZnuj7tbY5rFDfkgzeKFHcn9uDx3f8fxZMzEYU8=; b=dLkkDIIBP6UxiGxNkqkKxLGnt0c4f1Etj2kdVs5s1JPOpvcf2Vg1TouNL9TI/TVxoe 4acJWFbpLQAT7NulyfPkze5OeNoPKC3nsXi94lR28Z8ypAGoly0Ld3mSRh1pswIXSf4q dDUtSDeoKudQH2YhHF7jCGDHUfuYAM/6UVievoeiZZDqeIl5B764ei93XeNYxhL7SbJA zTbSlb8txRjUfUZxc0w80Hybc5EDmoGY5PYKFwIgRiUPylqWjX+w5f7LUiIkUKM13LaO h7VV0QsYWu8dT+79HrasMLMi0ECaZIUhxGirZQNWv4UcOKwXNh3595ObgRAQWWWsVPVr sUjg== X-Gm-Message-State: AOAM531YLdlf/QFtl2iR3+u1SfGYGvgZnUBzdvxKI2mNA8/RlrH41nMQ zLsSopHsoVeoPXb+9XZSjvOHsc3qWO0= X-Google-Smtp-Source: ABdhPJzHjbnEztrUUH2dzzTstZIGrz9UIdsyiA719b79LdJdcXWOItJ6PigsI7UTIzzeVFnZPd6lkw== X-Received: by 2002:a17:907:6096:b0:6f7:afe7:83e1 with SMTP id ht22-20020a170907609600b006f7afe783e1mr1080966ejc.469.1652904199565; Wed, 18 May 2022 13:03:19 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qx16-20020a170907b59000b006f3ef214e60sm1281110ejc.198.2022.05.18.13.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 13:03:18 -0700 (PDT) Message-ID: <36f632250140da08fd78723cab47c41e80076612.camel@gmail.com> From: Liliana Marie Prikler Date: Wed, 18 May 2022 22:03:17 +0200 In-Reply-To: <20220518172526.z4p37ze36mn6svlb@ubik.pkbd.org> References: <20220518055859.37vzr3fwlindwwnd@ubik.pkbd.org> <20220518172526.z4p37ze36mn6svlb@ubik.pkbd.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" 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=1652904261; 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-to: 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=4AKSMZnuj7tbY5rFDfkgzeKFHcn9uDx3f8fxZMzEYU8=; b=DmMs6uleMWZumci7jPuhCY0+x8aqMfXf0Q7buvzQ4UTtKMl65267O17HCnknP74nUOIoSG RwnESkzrwbReFQjtKX3vXXjPg2Qp78FauE40MjltY8d3mw/JqcMJNpcmay0X9RjcUaNxVW 8irHsrUvF/WE99bSAxqgX8WL04TdbiL55VEREyEz+HUQG9N4HwdxMoHZq+H+64MZTyEhMP +qRjh9PWsgnn99381iR4O9wpaRxXOI6GvAEnAMiElufAQ1ixipQ1KIzz+kcYoLOoVbanAg ZFwJWtqq/4GrML/BNG/RU268JU2cSZiKY2lIfqbjMgPneNIBZi2PA3HEBXD7Qg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652904261; a=rsa-sha256; cv=none; b=R/a7BYFGHjcUHB92H3OTaLx28fDglJ9eLS1kpNkeimu0jEtLsOAq09dWrwvCyuID3o63kO Mtj3SqjtynuT/rj+T3qrCKO/TI5zh+HcbzVY33DwRIbbU7nx9o4P+HEtLw5feHs4tjesYI 8APK2PUwJtufI+QV+Mi7w7rlYZbGoYeNh6IPKOBudoQFVkfbUuC6Cr8dAYLEyf+4/mZJGL P6G78wkahON5W9CuR7gaJFLh8uXev8sKeyBWl63fAwxEt6TUchgV5ENV3OnQ9YCDgdw3wR 9l83oQeRoq7wfkV6h8uDNNrpcdvmF6MnDTbS10e0mTPdowaUsgoPzgtPAzsbrw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=NWsn355R; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=NWsn355R; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B3B8ABAB2 X-Spam-Score: 5.96 X-Migadu-Scanner: scn1.migadu.com X-TUID: OZdILHsnj3v/ Applied with some cosmetic changes in commit message and patch itself. Am Donnerstag, dem 19.05.2022 um 01:25 +0800 schrieb Maze: > Below a patch for emacs-evil. > > Since upstream declared the new version 1.15.0 in a commit message > without creating a tag, I have to git-reference to a commit. I tried > to reproduce the way it's done on other emacs extensions. > > Other than this, it should be just bumping the upstream version so > that it gets byte compiled succesfully with emacs 28. > > I tested that it builds and installs on a private channel local to my > machine. For the record, this should go below the --- line. Use git format- patch instead of manually annotating a git diff. > * gnu/packages/emacs-xyz.scm >   Bump emacs-evil to versions 1.15.0 >   So that it can be built by emacs-28 >  1 file changed, 33 insertions(+), 36 deletions(-) YMMV but I adapted this to the actual ChangeLog format. > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index c43fa5a..9423441 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -12073,41 +12073,44 @@ news items, openrc and runscripts.") >      (license license:gpl2+))) >   >  (define-public emacs-evil > -  (package > -    (name "emacs-evil") > -    (version "1.14.2") > -    (source > -     (origin > -       (method git-fetch) > -       (uri (git-reference > -             (url "https://github.com/emacs-evil/evil") > -             (commit version))) > -       (file-name (git-file-name name version)) > -       (sha256 > -        (base32 > -         "1mhm1hd6gzxc2vvihh1w1j8f30xp0ssqcxnp8fx22niz04fk5df8")))) > -    (arguments > -     (list > -      #:phases > -      #~(modify-phases %standard-phases > -          (add-before 'check 'fix-test-helpers > -            (lambda _ > -              (substitute* "evil-test-helpers.el" > -                (("\\(undo-tree-mode 1\\)") "")))) > -          (add-before 'install 'make-info > -            (lambda _ > -              (with-directory-excursion "doc/build/texinfo" > -                (invoke "makeinfo" "--no-split" > -                        "-o" "evil.info" "evil.texi"))))))) > -    (build-system emacs-build-system) > -    (native-inputs (list texinfo)) > -    (home-page "https://github.com/emacs-evil/evil") > -    (synopsis "Extensible Vi layer for Emacs") > -    (description > -     "Evil is an extensible vi layer for Emacs.  It emulates the > +  (let ((commit "008a6cdb12f15e748979a7d1c2f26c34c84dedbf") > +        (version "1.15.0") ; not tagged upstream, but see commit > message > +        (revision "0")) > +    (package > +      (name "emacs-evil") > +      (version (git-version version revision commit)) Made it so that version is not inadvertently let-bound. Expanded comment. Cheers