[arch-commits] Commit in neomutt/repos/community-x86_64 (5 files)

Maxim Baz maximbaz at archlinux.org
Sat Dec 7 10:40:40 UTC 2019


    Date: Saturday, December 7, 2019 @ 10:40:40
  Author: maximbaz
Revision: 536260

archrelease: copy trunk to community-x86_64

Added:
  neomutt/repos/community-x86_64/PKGBUILD
    (from rev 536259, neomutt/trunk/PKGBUILD)
  neomutt/repos/community-x86_64/default-ca-certificates.patch
    (from rev 536259, neomutt/trunk/default-ca-certificates.patch)
Deleted:
  neomutt/repos/community-x86_64/PKGBUILD
  neomutt/repos/community-x86_64/default-ca-certificates.patch
  neomutt/repos/community-x86_64/fix-vfolder-segfault.patch

-------------------------------+
 PKGBUILD                      |  117 +++++++++++++++++++---------------------
 default-ca-certificates.patch |   24 ++++----
 fix-vfolder-segfault.patch    |   39 -------------
 3 files changed, 69 insertions(+), 111 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-07 10:40:35 UTC (rev 536259)
+++ PKGBUILD	2019-12-07 10:40:40 UTC (rev 536260)
@@ -1,60 +0,0 @@
-# Maintainer: Alad Wenter <alad at archlinux.org>
-# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
-# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
-# Contributor: Chris Salzberg <chris at dejimata.com>
-# Contributor: Leonidas Spyropoulos <artafinde at gmail.com>
-pkgname=neomutt
-pkgver=20191129
-pkgrel=3
-pkgdesc='A version of mutt with added features'
-url='https://neomutt.org/'
-license=('GPL')
-arch=('x86_64')
-depends=('glibc' 'gpgme' 'lua' 'notmuch-runtime' 'krb5' 'gnutls'
-         'libsasl' 'ncurses' 'libidn2' 'lmdb' 'gdbm' 'kyotocabinet')
-optdepends=('python: keybase.py'
-            'ca-certificates: default CA certificates')
-makedepends=('git' 'gnupg' 'libxslt' 'docbook-xsl' 'w3m')
-_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"
-        "fix-vfolder-segfault.patch"
-        "default-ca-certificates.patch")
-sha256sums=('c339e17b676d0a9a8db6dd1c9acac3db4b217c6b19050e5a1eec99b1b0b59a2f'
-            'SKIP'
-            'fa6e03ea6ef031804bf4175c4ad0b9089fdb2552bc8271255e93d457c54adfe0'
-            '410a364ae8249c969fc321f0f50ecb4603e9443bd73b31f58c8487e6b8b510e0')
-validpgpkeys=('86C2397270DD7A561263CA4E5FAF0A6EE7371805') # Richard Russon (flatcap) <rich at flatcap.org>
-
-prepare() {
-    cd "$pkgname-$pkgver"
-    patch -Np1 -i "$srcdir/fix-vfolder-segfault.patch"
-    patch -Np1 -i "$srcdir/default-ca-certificates.patch"
-}
-
-build() {
-    cd "$pkgname-$pkgver"
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --libexecdir=/usr/lib \
-        --gpgme \
-        --lua \
-        --notmuch \
-        --gss \
-        --gnutls \
-        --sasl \
-        --with-ui=ncurses \
-        --with-idn2=/usr \
-        --disable-idn \
-        --idn2 \
-        --lmdb \
-        --kyotocabinet \
-        --gdbm
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}

Copied: neomutt/repos/community-x86_64/PKGBUILD (from rev 536259, neomutt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-07 10:40:40 UTC (rev 536260)
@@ -0,0 +1,57 @@
+# Maintainer: Alad Wenter <alad at archlinux.org>
+# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+# Contributor: Chris Salzberg <chris at dejimata.com>
+# Contributor: Leonidas Spyropoulos <artafinde at gmail.com>
+pkgname=neomutt
+pkgver=20191207
+pkgrel=1
+pkgdesc='A version of mutt with added features'
+url='https://neomutt.org/'
+license=('GPL')
+arch=('x86_64')
+depends=('glibc' 'gpgme' 'lua' 'notmuch-runtime' 'krb5' 'gnutls'
+         'libsasl' 'ncurses' 'libidn2' 'lmdb' 'gdbm' 'kyotocabinet')
+optdepends=('python: keybase.py'
+            'ca-certificates: default CA certificates')
+makedepends=('git' 'gnupg' 'libxslt' 'docbook-xsl' 'w3m')
+_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"
+        "default-ca-certificates.patch")
+sha256sums=('1618873bd43915d437c5957f19ec2c4ecef6954a5aa647009b98f574ec63410e'
+            'SKIP'
+            '410a364ae8249c969fc321f0f50ecb4603e9443bd73b31f58c8487e6b8b510e0')
+validpgpkeys=('86C2397270DD7A561263CA4E5FAF0A6EE7371805') # Richard Russon (flatcap) <rich at flatcap.org>
+
+prepare() {
+    cd "$pkgname-$pkgver"
+    patch -Np1 -i "$srcdir/default-ca-certificates.patch"
+}
+
+build() {
+    cd "$pkgname-$pkgver"
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib \
+        --gpgme \
+        --lua \
+        --notmuch \
+        --gss \
+        --gnutls \
+        --sasl \
+        --with-ui=ncurses \
+        --with-idn2=/usr \
+        --disable-idn \
+        --idn2 \
+        --lmdb \
+        --kyotocabinet \
+        --gdbm
+    make
+}
+
+package() {
+    cd "$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+}

Deleted: default-ca-certificates.patch
===================================================================
--- default-ca-certificates.patch	2019-12-07 10:40:35 UTC (rev 536259)
+++ default-ca-certificates.patch	2019-12-07 10:40:40 UTC (rev 536260)
@@ -1,12 +0,0 @@
---- a/doc/neomuttrc.head
-+++ b/doc/neomuttrc.head.new
-@@ -48,6 +48,9 @@ bind browser y exit
- # be undone with unmime_lookup.
- mime_lookup application/octet-stream
-
-+# System-wide CA file managed by the ca-certificates package
-+set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
-+
- ##
- ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
- ##

Copied: neomutt/repos/community-x86_64/default-ca-certificates.patch (from rev 536259, neomutt/trunk/default-ca-certificates.patch)
===================================================================
--- default-ca-certificates.patch	                        (rev 0)
+++ default-ca-certificates.patch	2019-12-07 10:40:40 UTC (rev 536260)
@@ -0,0 +1,12 @@
+--- a/doc/neomuttrc.head
++++ b/doc/neomuttrc.head.new
+@@ -48,6 +48,9 @@ bind browser y exit
+ # be undone with unmime_lookup.
+ mime_lookup application/octet-stream
+
++# System-wide CA file managed by the ca-certificates package
++set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
++
+ ##
+ ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
+ ##

Deleted: fix-vfolder-segfault.patch
===================================================================
--- fix-vfolder-segfault.patch	2019-12-07 10:40:35 UTC (rev 536259)
+++ fix-vfolder-segfault.patch	2019-12-07 10:40:40 UTC (rev 536260)
@@ -1,39 +0,0 @@
-From e22f6a1ad4f83942a7ea2240337b99a2ee9a3e89 Mon Sep 17 00:00:00 2001
-From: Richard Russon <rich at flatcap.org>
-Date: Mon, 2 Dec 2019 13:02:49 +0000
-Subject: [PATCH] fix: crash resizing notmuch mailbox
-
-Fixes: #2014
----
- mx.c                   | 2 +-
- notmuch/mutt_notmuch.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mx.c b/mx.c
-index 4a5c1c55b..1e13fd78a 100644
---- a/mx.c
-+++ b/mx.c
-@@ -1181,7 +1181,7 @@ void mx_alloc_memory(struct Mailbox *m)
-     m->emails = mutt_mem_calloc(m->email_max, sizeof(struct Email *));
-     m->v2r = mutt_mem_calloc(m->email_max, sizeof(int));
-   }
--  for (int i = m->msg_count; i < m->email_max; i++)
-+  for (int i = m->email_max - 25; i < m->email_max; i++)
-   {
-     m->emails[i] = NULL;
-     m->v2r[i] = -1;
-diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
-index 1078d4432..2c98d07c4 100644
---- a/notmuch/mutt_notmuch.c
-+++ b/notmuch/mutt_notmuch.c
-@@ -1980,8 +1980,8 @@ static int nm_mbox_check_stats(struct Mailbox *m, int flags)
- 
-   /* all emails */
-   m->msg_count = count_query(db, db_query, limit);
--  m->email_max = MAX(m->email_max, m->msg_count);
--  mx_alloc_memory(m);
-+  while (m->email_max < m->msg_count)
-+    mx_alloc_memory(m);
- 
-   // holder variable for extending query to unread/flagged
-   char *qstr = NULL;


More information about the arch-commits mailing list