From aa78df5a9cbb14774ab8a8be62678622715cf3cc Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 15 Jan 2020 00:42:43 +0100 Subject: [PATCH] notmuch: emacs is cross, not arch controlled, + texinfo on host --- srcpkgs/notmuch/template | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template index 976ceef17e..c5cc7daf6c 100644 --- a/srcpkgs/notmuch/template +++ b/srcpkgs/notmuch/template @@ -2,7 +2,7 @@ pkgname=notmuch version=0.29.3 revision=2 -hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel" +hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel texinfo" makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel" short_desc="Thread-based email index, search, and tagging" maintainer="Jan S. " @@ -14,20 +14,14 @@ checksum=d5f704b9a72395e43303de9b1f4d8e14dd27bf3646fdbb374bb3dbb7d150dc35 subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3" patch_args=-Np1 -case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*|ppc64*) - hostmakedepends+=" desktop-file-utils" - makedepends+=" emacs" - subpackages+=" notmuch-emacs" - _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch - --emacsetcdir=/usr/share/emacs/site-lisp/notmuch" - ;; - *) _args="--without-emacs";; -esac - if [ ! "$CROSS_BUILD" ]; then - makedepends+=" ruby-devel" - subpackages+=" notmuch-ruby" + hostmakedepends+=" desktop-file-utils" + makedepends+=" ruby-devel emacs" + subpackages+=" notmuch-ruby notmuch-emacs" + _args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch + --emacsetcdir=/usr/share/emacs/site-lisp/notmuch" +else + _args="--without-emacs" fi do_configure() {