From f29a9f21b4ea37f7560a765be9db343b91e09f26 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Mon, 27 Apr 2020 11:36:11 -0400
Subject: [PATCH] neomutt: update to 20200424.

---
 .../neomutt/patches/00-bugfix-20200417.patch  | 39 -------------------
 srcpkgs/neomutt/template                      |  8 ++--
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/neomutt/patches/00-bugfix-20200417.patch

diff --git a/srcpkgs/neomutt/patches/00-bugfix-20200417.patch b/srcpkgs/neomutt/patches/00-bugfix-20200417.patch
deleted file mode 100644
index 1342dd6a1d6..00000000000
--- a/srcpkgs/neomutt/patches/00-bugfix-20200417.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-VOID PACKAGING NOTE: This was added to our release at upstream's request.
-Upstream released, found a bug, fixed it, and reached out to their downstream
-packagers to get this fix included.
-
-This is instead of breaking downstream packagers by moving the tag. We thank
-neomutt upstream for their attention to packaging this software.
-
-commit 9e7537caddb9c6adc720bb3322a7512cf51ab025 (HEAD -> master, origin/master, origin/HEAD)
-Author: Richard Russon <rich@flatcap.org>
-Date:   Fri Apr 17 15:36:58 2020 +0100
-
-    ensure OP_NULL is always first
-
-    A recent refactoring altered the ordering of the OPs when autocrypt was
-    enabled.  This mean that OP_NULL wasn't 0 any more.
-
-    Fixes: #2268
-
-diff --git a/opcodes.h b/opcodes.h
-index 701df71f8..3984d3a03 100644
---- neomutt-20200417/opcodes.h
-+++ neomutt-20200417/opcodes.h
-@@ -37,7 +37,6 @@
- #endif
-
- #define OPS_CORE(_fmt) \
--  _fmt(OP_NULL,                           N_("null operation")) \
-   _fmt(OP_ATTACH_COLLAPSE,                N_("toggle display of subparts")) \
-   _fmt(OP_ATTACH_VIEW_MAILCAP,            N_("force viewing of attachment using mailcap")) \
-   _fmt(OP_ATTACH_VIEW_TEXT,               N_("view attachment as text")) \
-@@ -317,6 +316,7 @@
-   _fmt(OP_COMPOSE_SMIME_MENU,             N_("show S/MIME options")) \
-
- #define OPS(_fmt) \
-+  _fmt(OP_NULL,                           N_("null operation")) \
-   OPS_AUTOCRYPT(_fmt) \
-   OPS_CORE(_fmt) \
-   OPS_SIDEBAR(_fmt) \
-
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 5bd35e489ba..f0cdaeb6150 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20200417
+version=20200424
 revision=1
 wrksrc="neomutt-${version}"
 create_wrksrc=true
@@ -22,9 +22,9 @@ license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/1ee274e9ae1330fb901eb7b8275b3079d7869222.tar.gz"
-checksum="6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48
+checksum="e708d04f057a788041acaced765861bcfbab50f287f8e83620447ec8eb5145df
  f7aeb9a70b213b1bbcdba629745fd345bde825c467453912f5cfd7f1d75418f5"
-python_version=2 #unverified
+python_version=3
 
 # fix:
 if [ "${XBPS_CROSS_BASE}" ]; then
@@ -75,4 +75,4 @@ post_check() {
 # It also added a need for a special directory for unit tests, refered here by
 # commit hash (due to a lack of versioning)
 # Currently a shebang for keybase is rewritten to python2. That should be
-# fixed.
+# fixed. In fact, it turns out to be a py3 only file. Fixed as of 20200424.