From patchwork Wed Nov 6 18:37:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suhail Singh X-Patchwork-Id: 70377 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 9F67E27BBEA; Wed, 13 Nov 2024 18:14:26 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 D857127BBE2 for ; Wed, 13 Nov 2024 18:14:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBHsT-0002hi-6M; Wed, 13 Nov 2024 13:14:05 -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 1tBHsR-0002hF-9v for guix-patches@gnu.org; Wed, 13 Nov 2024 13:14:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tBHsQ-0001Li-VD for guix-patches@gnu.org; Wed, 13 Nov 2024 13:14:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=Fg0EcqOu85lU1gOFLkgl62eXzXHj3F1mV3hjvjU+ZA4=; b=HDq5yE6W6cQhtODMulFl6YhZvFmFZCHDlS0ZEho8Z46udaafhtMIPAjYa4XgtdVE4FaRZW1Arh2KLrhe/Q9HBGBJeu9A/tZxLFXO5UGUWf0FYysd6aNiJaiMjtznf0K+qDlUHFsttTL8uAnpT7gNjg3+4/rLLfL/JBN5YmcsWMd4E7B3j/Kx7xC4bGwjoCLvTpJo6ohG9nvkeq8BRxNpCFp5VkFbMOX2STswnOTErQhwbPplba6XWZa5FwW4C+95AWzIIiPbx0iY0JyReL5ooSGN8yH67IVl82ZH5CYjMRkA6it/dYlCwb8jkM2FRBr1tpWE//I1WYppDERBEeMUGA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBHsP-0003j6-Ub; Wed, 13 Nov 2024 13:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74231] [PATCH v2] gnu: emacs-git-email: Update to 0.6.0. References: <578f2ae3ba7cc4838ffdbc0929e6d3a5c8a6a9cc.1730918803.git.suhail@bayesians.ca> In-Reply-To: <578f2ae3ba7cc4838ffdbc0929e6d3a5c8a6a9cc.1730918803.git.suhail@bayesians.ca> Resent-From: "Suhail Singh" Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 18:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74231@debbugs.gnu.org Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 74231-submit@debbugs.gnu.org id=B74231.173152158614227 (code B ref 74231); Wed, 13 Nov 2024 18:14:01 +0000 Received: (at 74231) by debbugs.gnu.org; 13 Nov 2024 18:13:06 +0000 Received: from localhost ([127.0.0.1]:43548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBHrW-0003hO-1s for submit@debbugs.gnu.org; Wed, 13 Nov 2024 13:13:06 -0500 Received: from mail-qv1-f65.google.com ([209.85.219.65]:59731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBHrT-0003hG-SJ for 74231@debbugs.gnu.org; Wed, 13 Nov 2024 13:13:04 -0500 Received: by mail-qv1-f65.google.com with SMTP id 6a1803df08f44-6cbe3e99680so38252506d6.3 for <74231@debbugs.gnu.org>; Wed, 13 Nov 2024 10:13:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731521523; x=1732126323; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Fg0EcqOu85lU1gOFLkgl62eXzXHj3F1mV3hjvjU+ZA4=; b=GIeBnY+OpJNd8axjC55/pwBz+zohe0caLhVagexhGs8HKX1cZMi4dSexfhRnyj6Vi0 n21eNWgLXCDVY7GRI6ycD4yXwW+qg5FaqGGd7/IM0bwiE9CEHkjWx6BLWea4uBlBop52 IOEFHKwHxjnYow5NSwLLKViUk+Xh+a8YLIMfjmUdeKay/wylzUDKeuw64Jr/r9GMnOIX 7+sqen5C2ZpVysNZ+MHVBZwp4um4QRxNaeRSR2OPidaHQot0YmnD4HsW45zzkVP6nJ+8 isM0tuhuyu1mvsQrb02vFWnG91JlaPbUtqGhoCaecyI3WmPLb5EQK/lBDaH2hyshoFDk ywww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731521523; x=1732126323; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Fg0EcqOu85lU1gOFLkgl62eXzXHj3F1mV3hjvjU+ZA4=; b=CVzK/MBN5Zac4tpbmW8pR12ZPHXBbe7XmbkeMiE1Poej6d8ndQhCzP+AXGARaCW+JH SFbZ/hn76zFVJh0o4dFIkH2pr6SZn8FSEOyg7jWXV6IYXJP+jLQlLoITIwY/SlNS5k3M TipNVfUh6BULm+54dbHsOwnI3RoEldjSSlCk8sUjH8LXF1O6RQritTcwGh5TncxWHaXG W3fPC+L6MfLgUiHyOSH8AIghcmgv45dejeRxTLtU1hFVfypHPYKMzy/uhlR9VMPxIcUF ubs0osC8C/TtSAlrt3lXZeCLkF3nWnoOc6ItOCf00f+L4aiVyxzOeXxaxj1iDOLgZlHF zsXg== X-Gm-Message-State: AOJu0YzIrNfips+Lt6tV3sjIokskM/5mD6rB1nCVC88AC/AJBa649huB Lp2hAF9MSRL/W7jQTLN83BcIEg5eu6iDxWFTBL3gj97qIZGEitlF9yCuk91t X-Google-Smtp-Source: AGHT+IGQilAATeGIcneVl6jrzpU99PIl7dHEbY2Ig1CQOOq28MjYy/LXSZtFANxGVxLWgb4JyZ74Zg== X-Received: by 2002:a0c:f410:0:b0:6cd:feec:32eb with SMTP id 6a1803df08f44-6d39e197c53mr289849686d6.22.1731521523010; Wed, 13 Nov 2024 10:12:03 -0800 (PST) Received: from gnus ([70.26.179.129]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d3961def9asm87479756d6.20.2024.11.13.10.12.02 for <74231@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2024 10:12:02 -0800 (PST) From: "Suhail Singh" Date: Wed, 6 Nov 2024 13:37:51 -0500 Message-Id: <4dda52df4c7e1da9c03cdf6d97c224b777c8fa59.1731521500.git.suhail@bayesians.ca> 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-git-email): Update to 0.6.0 on actively maintained fork. Update homepage. Add emacs-piem as a build-time dependency. Don't propagate mu, emacs-magit, and emacs-notmuch since they are optional. * gnu/local.mk (dist_patch_DATA): Delete emacs-git-email-missing-parens.patch, since it's no longer needed. * gnu/packages/patches/emacs-git-email-missing-parens.patch: Delete unnecessary patch. Change-Id: I47f5aa12cfa676772e281a45cdc9ec3bb3eae544 --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 63 ++++++++----------- .../emacs-git-email-missing-parens.patch | 27 -------- 3 files changed, 25 insertions(+), 66 deletions(-) delete mode 100644 gnu/packages/patches/emacs-git-email-missing-parens.patch base-commit: 07cd046c209f192032b425d2ee44f6025bff63a1 diff --git a/gnu/local.mk b/gnu/local.mk index 1f48fddc9e..88b3bc8ffb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1188,7 +1188,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-disable-jit-compilation.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ - %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-helpful-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.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 b3517b7bd9..b8eb4b6b1a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22186,44 +22186,31 @@ (define-public emacs-gitpatch (license license:gpl3+))) (define-public emacs-git-email - ;; Use latest commit since latest tagged release is missing important - ;; changes. - (let ((commit "b5ebade3a48dc0ce0c85699f25800808233c73be") - (revision "0")) - (package - (name "emacs-git-email") - (version (git-version "0.2.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~yoctocell/git-email") - (commit commit))) - (patches - (search-patches "emacs-git-email-missing-parens.patch")) - (file-name (git-file-name name version)) - (sha256 - (base32 "1lk1yds7idgawnair8l3s72rgjmh80qmy4kl5wrnqvpmjrmdgvnx")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; piem is not yet packaged in Guix. - (add-after 'unpack 'remove-piem - (lambda _ - (delete-file "git-email-piem.el"))) - (add-before 'install 'makeinfo - (lambda _ - (invoke "makeinfo" "doc/git-email.texi")))))) - (native-inputs - (list texinfo)) - (propagated-inputs - (list mu emacs-magit emacs-notmuch)) - (license license:gpl3+) - (home-page "https://sr.ht/~yoctocell/git-email") - (synopsis "Format and send Git patches in Emacs") - (description "This package provides utilities for formatting and -sending Git patches via Email, without leaving Emacs.")))) + (package + (name "emacs-git-email") + (version "0.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/suhail/git-email") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cx6a4dxvdggnjn95a9fhcidd1140srpzw9lx9hi65kancnyjsci")))) + (build-system emacs-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'install 'makeinfo + (lambda _ + (invoke "makeinfo" "doc/git-email.texi")))))) + (inputs (list mu emacs-magit emacs-notmuch emacs-piem)) + (native-inputs (list texinfo)) + (license license:gpl3+) + (home-page "https://suhail.codeberg.page/git-email") + (synopsis "Format and send Git patches in Emacs") + (description "This package provides utilities for formatting and +sending Git patches via Email, without leaving Emacs."))) (define-public emacs-erc-hl-nicks (package diff --git a/gnu/packages/patches/emacs-git-email-missing-parens.patch b/gnu/packages/patches/emacs-git-email-missing-parens.patch deleted file mode 100644 index 051e2bf1eb..0000000000 --- a/gnu/packages/patches/emacs-git-email-missing-parens.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 -