[arch-commits] Commit in neomutt/trunk (2270.patch PKGBUILD)

[Maxim Baz]

    Date: Friday, April 24, 2020 @ 16:54:25
  Author: maximbaz
Revision: 619325

upgpkg: neomutt 20200424-1

Modified:
  neomutt/trunk/PKGBUILD
Deleted:
  neomutt/trunk/2270.patch

------------+
 2270.patch |   33 ---------------------------------
 PKGBUILD   |    7 ++-----
 2 files changed, 2 insertions(+), 38 deletions(-)

Deleted: 2270.patch
===================================================================
--- 2270.patch	2020-04-24 16:50:40 UTC (rev 619324)
+++ 2270.patch	2020-04-24 16:54:25 UTC (rev 619325)
@@ -1,33 +0,0 @@
-From 9e7537caddb9c6adc720bb3322a7512cf51ab025 Mon Sep 17 00:00:00 2001
-From: Richard Russon <rich at flatcap.org>
-Date: Fri, 17 Apr 2020 15:36:58 +0100
-Subject: [PATCH] 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
----
- opcodes.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/opcodes.h b/opcodes.h
-index 701df71f86..3984d3a038 100644
---- a/opcodes.h
-+++ b/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) \

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-24 16:50:40 UTC (rev 619324)
+++ PKGBUILD	2020-04-24 16:54:25 UTC (rev 619325)
@@ -4,7 +4,7 @@
 # Contributor: Chris Salzberg <chris at dejimata.com>
 # Contributor: Leonidas Spyropoulos <artafinde at gmail.com>
 pkgname=neomutt
-pkgver=20200417
+pkgver=20200424
 pkgrel=1
 pkgdesc='A version of mutt with added features'
 url='https://neomutt.org/'
@@ -20,17 +20,14 @@
 _github='https://github.com/neomutt/neomutt'
 source=("$pkgname-$pkgver.tar.gz::$_github/archive/$pkgver.tar.gz"
         "$pkgname-$pkgver.tar.gz.sig::$_github/releases/download/$pkgver/$pkgver.tar.gz.sig"
-        "2270.patch"
         "default-ca-certificates.patch")
-sha256sums=('6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48'
+sha256sums=('e708d04f057a788041acaced765861bcfbab50f287f8e83620447ec8eb5145df'
             'SKIP'
-            '014b02fe80e9b8bed6dba5230c3b62f34bc5b6b82326f27236f375620e059a80'
             '571716b8979e9b43328416c3c56eff228b6c58355d7c080b8987ea89c6360776')
 validpgpkeys=('86C2397270DD7A561263CA4E5FAF0A6EE7371805') # Richard Russon (flatcap) <rich at flatcap.org>
 
 prepare() {
     cd "$pkgname-$pkgver"
-    patch -Np1 -i "$srcdir/2270.patch"
     patch -Np1 -i "$srcdir/default-ca-certificates.patch"
 }