diff options
| author | TBK <tbk@jjtc.eu> | 2020-03-10 01:39:08 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-03-10 13:44:35 -0300 |
| commit | 274716af470a02fbc23ec7fb8a2ab7a66a5d0ec7 (patch) | |
| tree | 55fdf34ea235d23d97d29da69c6642bbed566ffd /community/notmuch | |
| parent | a946e89359d3c54fd20ec4ab27c9b962fee0762c (diff) | |
| download | aports-274716af470a02fbc23ec7fb8a2ab7a66a5d0ec7.tar.bz2 aports-274716af470a02fbc23ec7fb8a2ab7a66a5d0ec7.tar.xz | |
community/notmuch: upgrade to 0.29.3
Diffstat (limited to 'community/notmuch')
| -rw-r--r-- | community/notmuch/APKBUILD | 34 | ||||
| -rw-r--r-- | community/notmuch/fix-tests.patch | 27 |
2 files changed, 16 insertions, 45 deletions
diff --git a/community/notmuch/APKBUILD b/community/notmuch/APKBUILD index 2b285ea991..8f0ed7b70d 100644 --- a/community/notmuch/APKBUILD +++ b/community/notmuch/APKBUILD @@ -2,31 +2,30 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> # Maintainer: Stefan Wagner <stw@bit-strickerei.de> pkgname=notmuch -pkgver=0.28 -pkgrel=3 +pkgver=0.29.3 +pkgrel=0 pkgdesc="E-Mail index, search and tagging" url="https://notmuchmail.org/" arch="all" -license="GPL-3.0" -makedepends="gzip xapian-core-dev gmime-dev talloc-dev py3-sphinx - py3-requests python3-dev bash-completion" -checkdepends="sed coreutils diffutils bash tar mdocml grep perl" +license="GPL-3.0-or-later" +makedepends="bash-completion gmime-dev gzip perl py3-requests + py3-sphinx python3-dev talloc-dev xapian-core-dev" +checkdepends="bash coreutils dtach mdocml sed tar" subpackages=" - py3-$pkgname:py3 + py3-$pkgname:py3:noarch + $pkgname-doc $pkgname-dev $pkgname-libs $pkgname-emacs:emacs:noarch $pkgname-vim:vim:noarch $pkgname-zsh-completion:zshcomp:noarch $pkgname-bash-completion:bashcomp:noarch" -source="https://notmuchmail.org/releases/notmuch-$pkgver.tar.gz - fix-tests.patch - " +source="https://notmuchmail.org/releases/notmuch-$pkgver.tar.xz" build() { PYTHON=python3 ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + --build="$CBUILD" \ + --host="$CHOST" \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -35,7 +34,7 @@ build() { --zshcompletiondir=/usr/share/zsh/site-functions make PREFIX=/usr DESTDIR="$pkgdir" - cd "$builddir"/bindings/python + cd bindings/python python3 setup.py build } @@ -45,10 +44,10 @@ package() { } check() { - cd "$builddir"/test + cd test make test-binaries - local test= + local test for test in T*.sh; do name="$(basename "$test")" case "${name%%.*}" in @@ -102,7 +101,7 @@ zshcomp() { install_if="$pkgname=$pkgver-r$pkgrel zsh" mkdir -p "$subpkgdir"/usr/share/zsh/site-functions/ - mv "$pkgdir"/usr/share/zsh/site-functions/_${pkgname} \ + mv "$pkgdir"/usr/share/zsh/site-functions/_$pkgname \ "$subpkgdir"/usr/share/zsh/site-functions/ rm -rf "$pkgdir"/usr/share/zsh } @@ -115,5 +114,4 @@ py3() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="56c8e6b742990b5b1d5b8d12146cc9eb710c6b216c876fd3824cc88b9051fef8251f53809ba39cd2f0fbd5e4ccee9ddedc7a602e3584d8a158abe4f2a094242f notmuch-0.28.tar.gz -582484067b5899ec74f82c29b32b459670fc752365b9c09392b44538921aa6b106f56350d18d12cf51bfeac1a02b79c9026057111a7aa2016c75345e19e96da4 fix-tests.patch" +sha512sums="b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65 notmuch-0.29.3.tar.xz" diff --git a/community/notmuch/fix-tests.patch b/community/notmuch/fix-tests.patch deleted file mode 100644 index 92c2b854e4..0000000000 --- a/community/notmuch/fix-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur a/test/T030-config.sh b/test/T030-config.sh ---- a/test/T030-config.sh 2018-08-06 15:39:37.400772382 +0200 -+++ b/test/T030-config.sh 2018-08-06 15:39:45.434276833 +0200 -@@ -51,8 +51,8 @@ - fi - - 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 -Only in b/test: T030-config.sh.orig -diff -ur a/test/T650-regexp-query.sh b/test/T650-regexp-query.sh ---- a/test/T650-regexp-query.sh 2018-08-06 15:39:37.404105787 +0200 -+++ b/test/T650-regexp-query.sh 2018-08-06 15:39:45.434276833 +0200 -@@ -140,7 +140,7 @@ - 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 -Only in b/test: T650-regexp-query.sh.orig |