notmuch: update to 0.31.

srcpkgs/notmuch/patches/0002-configure-check-for-pytest-with-python-m-pytest.patch

@@ -1,37 +0,0 @@
-From c5164d1c0f5ba108ace05146218bf3810d590d5b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Mon, 27 Jul 2020 16:42:02 +0700
-Subject: [PATCH] configure: check for pytest with python -m pytest
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On different distro, pytest is suffixed with different patterns.
-
-On the other hand, `python3-pytest' could be invoked correctly,
-via `python3 -m pytest', the latter is used by our tests, now.
-
-Switch to `$python -m pytest` to fix address all incompatible naming.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 6c77960f..459e0cae 100755
---- a/configure
-+++ b/configure
-@@ -811,7 +811,7 @@ if [ $have_python3 -eq 1 ]; then
-     printf "Checking for python3 pytest (>= 3.0)... "
-     conf=$(mktemp)
-     printf "[pytest]\nminversion=3.0\n" > $conf
--    if pytest-3 -c $conf --version >/dev/null 2>&1; then
-+    if "$python" -m pytest -c $conf --version >/dev/null 2>&1; then
-         printf "Yes.\n"
-         have_python3_pytest=1
-     else
--- 
-2.28.0.rc2.21.g5c06d60fc5
-

srcpkgs/notmuch/patches/0003-configure-drop-check-for-default-xapian-backend.patch

@@ -1,108 +0,0 @@
-From b7c8661b9a34d048120753fdf27cd288e34e5308 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Mon, 27 Jul 2020 20:11:00 +0700
-Subject: [PATCH] configure: drop check for default xapian backend
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting from xapian 1.3.5, xapian switched default backend to glass.
-
-From 00cdfe10 (build: drop support for xapian versions less than 1.4,
-2020-04-22), we only support xapian 1.4.0+. Effectively, we don't need
-to check for default xapian backend anymore.
-
-Let's drop it.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- configure                  | 23 -----------------------
- test/T360-symbol-hiding.sh |  4 ++--
- test/test-lib.sh           | 11 +----------
- 3 files changed, 3 insertions(+), 35 deletions(-)
-
-diff --git a/configure b/configure
-index 459e0cae..7dae745c 100755
---- a/configure
-+++ b/configure
-@@ -456,26 +456,6 @@ if [ ${have_xapian} = "0" ]; then
-     errors=$((errors + 1))
- fi
- 
--if [ ${have_xapian} = "1" ]; then
--    default_xapian_backend=""
--    printf "Testing default Xapian backend... "
--    cat >_default_backend.cc <<EOF
--#include <xapian.h>
--int main(int argc, char** argv) {
--   Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
--}
--EOF
--    ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
--    ./_default_backend
--    if [ -f test.db/iamglass ]; then
--	default_xapian_backend=glass
--    else
--	default_xapian_backend=chert
--    fi
--    printf "%s\n" "${default_xapian_backend}";
--    rm -rf test.db _default_backend _default_backend.cc
--fi
--
- GMIME_MINVER=3.0.3
- 
- printf "Checking for GMime development files (>= $GMIME_MINVER)... "
-@@ -1507,9 +1487,6 @@ NOTMUCH_SRCDIR='${NOTMUCH_SRCDIR}'
- # Whether to have Xapian retry lock
- NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK=${WITH_RETRY_LOCK}
- 
--# Which backend will Xapian use by default?
--NOTMUCH_DEFAULT_XAPIAN_BACKEND=${default_xapian_backend}
--
- # Whether GMime can verify X.509 certificate validity
- NOTMUCH_GMIME_X509_CERT_VALIDITY=${gmime_x509_cert_validity}
- 
-diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
-index 43921cb4..eb438a7a 100755
---- a/test/T360-symbol-hiding.sh
-+++ b/test/T360-symbol-hiding.sh
-@@ -14,11 +14,11 @@ test_description='exception symbol hiding'
- test_begin_subtest 'running test' run_test
- mkdir -p ${PWD}/fakedb/.notmuch
- $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent 2>&1 \
--	| notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,${NOTMUCH_DEFAULT_XAPIAN_BACKEND},backend,g" > OUTPUT
-+	| notmuch_dir_sanitize | sed -e "s,\`,\',g" > OUTPUT
- 
- cat <<EOF > EXPECTED
- A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian'
--caught No backend database found at path 'CWD/nonexistent'
-+caught No glass database found at path 'CWD/nonexistent'
- EOF
- test_expect_equal_file EXPECTED OUTPUT
- 
-diff --git a/test/test-lib.sh b/test/test-lib.sh
-index 7424881e..dc63ff1a 100644
---- a/test/test-lib.sh
-+++ b/test/test-lib.sh
-@@ -1255,16 +1255,7 @@ ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
- rm -f y
- 
- # convert variable from configure to more convenient form
--case "$NOTMUCH_DEFAULT_XAPIAN_BACKEND" in
--    glass)
--	db_ending=glass
--    ;;
--    chert)
--	db_ending=DB
--    ;;
--    *)
--	error "Unknown Xapian backend $NOTMUCH_DEFAULT_XAPIAN_BACKEND"
--esac
-+db_ending=glass
- # declare prerequisites for external binaries used in tests
- test_declare_external_prereq dtach
- test_declare_external_prereq emacs
--- 
-2.28.0.rc2.21.g5c06d60fc5
-

srcpkgs/notmuch/patches/0004-T355-specify-hash-algorithm-explicitly.patch

@@ -1,39 +0,0 @@
-From 808c43834e9e42be56f0fe1f61da5787784dc0e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Mon, 27 Jul 2020 22:05:46 +0700
-Subject: [PATCH] T355: specify hash algorithm explicitly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On some systems (notably, the one shipped with LibreSSL),
-default fingerprint digest algorithm is SHA256.
-
-On other systems, users can change default digest algorithm by changing
-default_md in /etc/ssl/default_md.
-
-Let's ask openssl to provide us specific algorithm to make the test
-more deterministic.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- test/T355-smime.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/T355-smime.sh b/test/T355-smime.sh
-index f8cec62c..8b2b52be 100755
---- a/test/T355-smime.sh
-+++ b/test/T355-smime.sh
-@@ -6,7 +6,7 @@ test_description='S/MIME signature verification and decryption'
- test_require_external_prereq openssl
- test_require_external_prereq gpgsm
- 
--FINGERPRINT=$(openssl x509 -fingerprint -in "$NOTMUCH_SRCDIR/test/smime/key+cert.pem" -noout | sed -e 's/^.*=//' -e s/://g)
-+FINGERPRINT=$(openssl x509 -sha1 -fingerprint -in "$NOTMUCH_SRCDIR/test/smime/key+cert.pem" -noout | sed -e 's/^.*=//' -e s/://g)
- 
- add_gpgsm_home
- 
--- 
-2.28.0.rc2.21.g5c06d60fc5
-

srcpkgs/notmuch/template

@@ -1,6 +1,6 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.30
+version=0.31
 revision=1
 hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
 makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://notmuchmail.org"
 distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
  https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="5e3baa6fe11d65c67e26ae488be11b320bae04e336acc9c64621f7e3449096fa
+checksum="571fa0e1539c86612b1f2b2c80a398e08ecfef52e27ef7e48cf8e3b84fa18394
  4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
 skip_extraction="database-v1.tar.xz"
 
@@ -54,8 +54,15 @@ do_check() {
 	PATH=$XBPS_WRAPPERDIR:$PATH
 	cp $XBPS_SRCDISTDIR/notmuch-$version/database-v1.tar.xz \
 		test/test-databases
-	# 2 tests is failing on musl
+	case "$XBPS_TARGET_LIBC" in
-	# glibc is clean
+	musl)
+		# Seem like gpgconf's problem,
+		# mutt on musl also have problems with smime
+		export NOTMUCH_SKIP_TESTS="smime.3 smime.5" ;;
+	*)
+		# This test run under gdb is problematic
+		export NOTMUCH_SKIP_TESTS="count.14" ;;
+	esac
 	make test
 }
 
@@ -91,7 +98,6 @@ libnotmuch-devel_package() {
 }
 
 notmuch-emacs_package() {
-	archs=noarch
 	short_desc+=" - Emacs interface"
 	depends="${sourcepkg}-${version}_${revision} virtual?emacs"
 	pkg_install() {
@@ -104,7 +110,6 @@ notmuch-emacs_package() {
 }
 
 notmuch-mutt_package() {
-	archs=noarch
 	short_desc+=" - Mutt interface"
 	depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
 	 perl-String-ShellQuote perl-Term-ReadLine-Gnu perl-File-Which"
@@ -115,7 +120,6 @@ notmuch-mutt_package() {
 }
 
 notmuch-python3_package() {
-	archs=noarch
 	depends="libnotmuch-${version}_${revision}"
 	short_desc+=" - Python 3 bindings"
 	pkg_install() {

srcpkgs/notmuch/update

@@ -0,0 +1 @@
+ignore="*rc*"