diff options
Diffstat (limited to 'community/notmuch')
| -rw-r--r-- | community/notmuch/APKBUILD | 46 | ||||
| -rw-r--r-- | community/notmuch/fix-tests.patch | 25 |
2 files changed, 9 insertions, 62 deletions
diff --git a/community/notmuch/APKBUILD b/community/notmuch/APKBUILD index b527a81ff0..3ee15c87f3 100644 --- a/community/notmuch/APKBUILD +++ b/community/notmuch/APKBUILD @@ -2,22 +2,19 @@ # Maintainer: Stefan Wagner <stw@bit-strickerei.de> pkgname=notmuch pkgver=0.24.1 -pkgrel=1 +pkgrel=0 pkgdesc="E-Mail index, search and tagging" url="https://notmuchmail.org/" arch="all" license="GPL3" makedepends="gzip xapian-core-dev gmime-dev talloc-dev py-sphinx py-requests bash-completion" -checkdepends="sed coreutils diffutils bash tar gdb - gnupg mdocml grep" subpackages=" $pkgname-dev $pkgname-doc $pkgname-zsh-completion:zshcomp:noarch $pkgname-bash-completion:bashcomp:noarch" -source="https://notmuchmail.org/releases/$pkgname-$pkgver.tar.gz - fix-tests.patch" +source="https://notmuchmail.org/releases/$pkgname-$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -30,38 +27,14 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --bashcompletiondir=/usr/share/bash-completion/completions \ - --zshcompletiondir=/usr/share/zsh/site-functions - make PREFIX=/usr DESTDIR="$pkgdir" + --zshcompletiondir=/usr/share/zsh/site-functions \ + || return 1 + make PREFIX=/usr DESTDIR="$pkgdir" || return 1 } package() { make PREFIX=/usr DESTDIR="$pkgdir" \ - -C "$builddir" install -} - -check() { - cd "$builddir"/test - make test-binaries - - local test= - for test in T*.sh; do - name="$(basename "$test")" - case "${name%%.*}" in - # Requires dtach ↦ doesn't work on the builders - *emacs*) continue ;; - - # FIXME xapian fuckup - T050-new|T060-count|T150-tagging) continue ;; - - # FIXME gdb fuckup - T070-insert) continue ;; - - # FIXME uknown fuckup - T170-sexp|T350-crypto|T355-smime) continue ;; - esac - - ./${test} - done + -C "$builddir" install || return 1 } bashcomp() { @@ -71,7 +44,7 @@ bashcomp() { mkdir -p "$subpkgdir"/usr/share/bash-completion/completions/ mv "$pkgdir"/usr/share/bash-completion/completions/$pkgname \ - "$subpkgdir"/usr/share/bash-completion/completions/ + "$subpkgdir"/usr/share/bash-completion/completions/ || return 1 } zshcomp() { @@ -81,8 +54,7 @@ zshcomp() { mkdir -p "$subpkgdir"/usr/share/zsh/site-functions/ mv "$pkgdir"/usr/share/zsh/site-functions/_${pkgname} \ - "$subpkgdir"/usr/share/zsh/site-functions/ + "$subpkgdir"/usr/share/zsh/site-functions/ || return 1 } -sha512sums="e2014380de68de3e1a3fd3058a441c6771a92bfffe07c0bd2b374802dd8b2539eddbbb91074738f58f48452a936f2f9427fadca825a165c61a27fe0c3e1fe7fc notmuch-0.24.1.tar.gz -586b046d12c73c2f53451f3dfcfe1917aaba5557709ecf41ec8a4a3b5f174b8f1b641141d3059d67c67dad97a760e54285e8a683e3a2f0d17d4c0df6bc342a58 fix-tests.patch" +sha512sums="e2014380de68de3e1a3fd3058a441c6771a92bfffe07c0bd2b374802dd8b2539eddbbb91074738f58f48452a936f2f9427fadca825a165c61a27fe0c3e1fe7fc notmuch-0.24.1.tar.gz" diff --git a/community/notmuch/fix-tests.patch b/community/notmuch/fix-tests.patch deleted file mode 100644 index 489959cf4b..0000000000 --- a/community/notmuch/fix-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -upr notmuch-0.24.1.orig/test/T030-config.sh notmuch-0.24.1/test/T030-config.sh ---- notmuch-0.24.1.orig/test/T030-config.sh 2017-08-17 19:19:19.245017863 +0200 -+++ notmuch-0.24.1/test/T030-config.sh 2017-08-17 19:19:35.725123923 +0200 -@@ -45,8 +45,8 @@ test_expect_equal "$(notmuch config get - test_begin_subtest "List all items" - notmuch config list 2>&1 | notmuch_config_sanitize > OUTPUT - cat <<EOF > EXPECTED --Error opening database at MAIL_DIR/.notmuch: No such file or directory - database.path=MAIL_DIR -+Error opening database at MAIL_DIR/.notmuch: No such file or directory - user.name=Notmuch Test Suite - user.primary_email=test_suite@notmuchmail.org - user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org -diff -upr notmuch-0.24.1.orig/test/T650-regexp-query.sh notmuch-0.24.1/test/T650-regexp-query.sh ---- notmuch-0.24.1.orig/test/T650-regexp-query.sh 2017-08-17 20:27:35.577369368 +0200 -+++ notmuch-0.24.1/test/T650-regexp-query.sh 2017-08-17 20:28:06.570896484 +0200 -@@ -99,7 +99,7 @@ test_begin_subtest "regexp error reporti - notmuch search 'from:/unbalanced[/' 1>OUTPUT 2>&1 - cat <<EOF > EXPECTED - notmuch search: A Xapian exception occurred --A Xapian exception occurred parsing query: Invalid regular expression -+A Xapian exception occurred parsing query: Missing ']' - Query string was: from:/unbalanced[/ - EOF - test_expect_equal_file EXPECTED OUTPUT |