From patchwork Thu May 5 12:24:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Eklund X-Patchwork-Id: 39119 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 21AD627BBEB; Thu, 5 May 2022 13:25:15 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 E06DC27BBEA for ; Thu, 5 May 2022 13:25:13 +0100 (BST) Received: from localhost ([::1]:52256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmaXh-0004tr-0J for patchwork@mira.cbaines.net; Thu, 05 May 2022 08:25:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmaXX-0004rX-8y for guix-patches@gnu.org; Thu, 05 May 2022 08:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nmaXW-0001Ya-VU for guix-patches@gnu.org; Thu, 05 May 2022 08:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nmaXW-0006ff-Q5 for guix-patches@gnu.org; Thu, 05 May 2022 08:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55271] [PATCH] gnu: Fix emacs-git-email Resent-From: Niklas Eklund Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 May 2022 12:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55271 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55271@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165175348625606 (code B ref -1); Thu, 05 May 2022 12:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 May 2022 12:24:46 +0000 Received: from localhost ([127.0.0.1]:44652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nmaXF-0006ew-RB for submit@debbugs.gnu.org; Thu, 05 May 2022 08:24:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:60776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nmaXE-0006ep-EZ for submit@debbugs.gnu.org; Thu, 05 May 2022 08:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmaX9-0004UF-Mk for guix-patches@gnu.org; Thu, 05 May 2022 08:24:41 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmaX0-0001TZ-4h for guix-patches@gnu.org; Thu, 05 May 2022 08:24:39 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 84EE2240107 for ; Thu, 5 May 2022 14:24:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1651753443; bh=ewgrGOF3YFyqTnkUnhZufTt9W0tKEVZfQFno++1kefE=; h=From:To:Subject:Date:From; b=o9M/XhVObA6Kr7EQoCYVgoDYlvKMf+Xfm3B51fqbNERILcM/Cph/TW23a2YNGiVLq kTx4N4WxwfrnUAr66gl9lIWIBOZtYfmuwjnbPLBxUkjL8fwOm3UHi06Isd4/vP5cY7 yoK/rmLoF6v+0e0sJ0/m5N0dnbaEXMxCDp30Vvbpv2akp6OVufLmjE6W190yW4du+a Nb007KiVau9NPWtDg0gJ+jk9YDgRYkY7FwZdTGp1ysqEUdeWLiqr3xbw43qOooC4Xy vFG6/lLXgzmNgyhMQ3iZ178lsJCjoGtpdQ4U5dqtc7Q8zI3+nU0RoCO3V7KT+mmt6L buJzCuPNBqhIA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4KvCYG67PLz9rxH for ; Thu, 5 May 2022 14:24:02 +0200 (CEST) From: Niklas Eklund Date: Thu, 05 May 2022 12:24:01 +0000 Message-ID: <87ilqkqiam.fsf@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=niklas.eklund@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" X-getmail-retrieved-from-mailbox: Patches Hi, the emacs-git-email package unfortunately doesn't build due to an error in the upstream repository. This patch patches the package so it build properly. Best regards, Niklas Eklund From 03f1d320cb34b830af7d2536f08ceb73c17791ac Mon Sep 17 00:00:00 2001 From: Niklas Eklund Date: Thu, 5 May 2022 13:10:56 +0200 Subject: [PATCH] gnu: emacs-git-email: Fixes build of package. The git-email-mu4e.el contains unbalanced parens upstream. This commit patches the source code to avoid failures when building emacs-git-email. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 2 ++ ...fix-missing-parens-in-git-email-mu4e.patch | 27 +++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 gnu/packages/patches/emacs-fix-missing-parens-in-git-email-mu4e.patch diff --git a/gnu/local.mk b/gnu/local.mk index 44d20de57d..cc9fae4b3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1027,6 +1027,7 @@ dist_patch_DATA = \ %D%/packages/patches/elm-compiler-fix-map-key.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ %D%/packages/patches/emacs-exec-path.patch \ + %D%/packages/patches/emacs-fix-missing-parens-in-git-email-mu4e.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a928ac72f1..1e83abcf9d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15759,6 +15759,8 @@ (define-public emacs-git-email (uri (git-reference (url "https://git.sr.ht/~yoctocell/git-email") (commit commit))) + (patches + (search-patches "emacs-fix-missing-parens-in-git-email-mu4e.patch")) (file-name (git-file-name name version)) (sha256 (base32 "1lk1yds7idgawnair8l3s72rgjmh80qmy4kl5wrnqvpmjrmdgvnx")))) diff --git a/gnu/packages/patches/emacs-fix-missing-parens-in-git-email-mu4e.patch b/gnu/packages/patches/emacs-fix-missing-parens-in-git-email-mu4e.patch new file mode 100644 index 0000000000..051e2bf1eb --- /dev/null +++ b/gnu/packages/patches/emacs-fix-missing-parens-in-git-email-mu4e.patch @@ -0,0 +1,27 @@ +From 820ad7eb2e919e3f880bec22bd4f737fa55c4d22 Mon Sep 17 00:00:00 2001 +From: Niklas Eklund +Date: Thu, 5 May 2022 12:43:49 +0200 +Subject: [PATCH] Fix missing parens in git-email-mu4e.el + +The incorrect number of parens in this file lead to Emacs failing to +parse the file. +--- + git-email-mu4e.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/git-email-mu4e.el b/git-email-mu4e.el +index d5b8770..9220bf9 100644 +--- a/git-email-mu4e.el ++++ b/git-email-mu4e.el +@@ -51,7 +51,7 @@ from Lisp, enable the mode if ARG is omitted or nil." + ;; built in context feature. + (seq-filter (lambda (header) + (not (eq (car header) 'from))) +- headers) ++ headers)))) + (setq git-email-compose-email-function 'message-mail))) + + (provide 'git-email-mu4e) +-- +2.34.0 + -- 2.34.0