diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2016-10-15 20:18:32 +0100 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2016-10-15 20:18:48 +0100 |
commit | 926540f8775a045100134ac33a5af23752551964 (patch) | |
tree | 403ee5c51ebfa60b514ffa9739d26a01f671f5ed /net-mail | |
parent | www-servers/nginx: Adjust dependencies/slot operators (diff) | |
download | gentoo-926540f8775a045100134ac33a5af23752551964.tar.gz gentoo-926540f8775a045100134ac33a5af23752551964.tar.bz2 gentoo-926540f8775a045100134ac33a5af23752551964.zip |
net-mail/notmuch: Backport fixes to 0.23
Fix Emacs 25.1 compatibility issue. Restore colours for unread and
flagged tags accidentally swapped in 0.23.
Package-Manager: portage-2.3.2
Diffstat (limited to 'net-mail')
3 files changed, 283 insertions, 0 deletions
diff --git a/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch b/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch new file mode 100644 index 000000000000..0c053736be65 --- /dev/null +++ b/net-mail/notmuch/files/0.23-0001-emacs-id-buttonization.patch @@ -0,0 +1,43 @@ +From b913a28f65e32380a84da735e0524f8d5c127f93 Mon Sep 17 00:00:00 2001 +From: David Bremner <david@tethera.net> +Date: Sun, 9 Oct 2016 19:30:44 -0300 +Subject: [PATCH 1/3] emacs/show: force notmuch-show-buttonise-links to act on + lines + +This seems to fix a problem with emacs 25 creating partial buttons by +calling n-s-b-l with a region that does not include the whole button. +I'm not 100% sure it's legit to act outside the region passed by +jit-lock, but goto-address-fontify-region (where I borrowed the code +from) already does this, so this patch to not make things worse. +--- + emacs/notmuch-show.el | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 641398d..e7d16f8 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1174,13 +1174,15 @@ This also turns id:\"<message id>\"-parts and mid: links into + buttons for a corresponding notmuch search." + (goto-address-fontify-region start end) + (save-excursion +- (let (links) +- (goto-char start) +- (while (re-search-forward notmuch-id-regexp end t) ++ (let (links ++ (beg-line (progn (goto-char start) (line-beginning-position))) ++ (end-line (progn (goto-char end) (line-end-position)))) ++ (goto-char beg-line) ++ (while (re-search-forward notmuch-id-regexp end-line t) + (push (list (match-beginning 0) (match-end 0) + (match-string-no-properties 0)) links)) +- (goto-char start) +- (while (re-search-forward notmuch-mid-regexp end t) ++ (goto-char beg-line) ++ (while (re-search-forward notmuch-mid-regexp end-line t) + (let* ((mid-cid (match-string-no-properties 1)) + (mid (save-match-data + (string-match "^[^/]*" mid-cid) +-- +2.10.1 + diff --git a/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch b/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch new file mode 100644 index 000000000000..39651cb7c127 --- /dev/null +++ b/net-mail/notmuch/files/0.23-0002-emacs-search-face-bugfix.patch @@ -0,0 +1,36 @@ +From e64f1ec1db49406d4834b09d8c4b2aec83ba66cb Mon Sep 17 00:00:00 2001 +From: Mark Walters <markwalters1009@gmail.com> +Date: Wed, 12 Oct 2016 08:39:21 +0100 +Subject: [PATCH 2/3] emacs: search face bugfix + +In commit 2a7b11b064233afc4feead876fa396e3c18a6b91 the default faces +for unread and flagged were accidentally swapped. This swaps them back. +--- + emacs/notmuch.el | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 8e14692..48c33fd 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -313,7 +313,7 @@ there will be called at other points of notmuch execution." + + (defface notmuch-search-flagged-face + '((t +- (:weight bold))) ++ (:foreground "blue"))) + "Face used in search mode face for flagged threads. + + This face is the default value for the \"flagged\" tag in +@@ -323,7 +323,7 @@ This face is the default value for the \"flagged\" tag in + + (defface notmuch-search-unread-face + '((t +- (:foreground "blue"))) ++ (:weight bold))) + "Face used in search mode for unread threads. + + This face is the default value for the \"unread\" tag in +-- +2.10.1 + diff --git a/net-mail/notmuch/notmuch-0.23-r1.ebuild b/net-mail/notmuch/notmuch-0.23-r1.ebuild new file mode 100644 index 000000000000..2f4c8d46d579 --- /dev/null +++ b/net-mail/notmuch/notmuch-0.23-r1.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \ + distutils-r1 toolchain-funcs + +DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" +HOMEPAGE="http://notmuchmail.org/" +SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz + test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )" + +LICENSE="GPL-3" +# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is +# meant to be binary backward compatible. +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~x86" +REQUIRED_USE=" + nmbug? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( crypt emacs python valgrind ) + " +IUSE="crypt doc emacs mutt nmbug python test valgrind" + +CDEPEND=" + >=app-shells/bash-completion-1.9 + >=dev-libs/glib-2.22:2 + >=dev-libs/gmime-2.6.20-r2:2.6 + >=dev-libs/xapian-1.2.7-r2:= + dev-python/sphinx[${PYTHON_USEDEP}] + >=sys-libs/zlib-1.2.5.2 + sys-libs/talloc + crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] ) + emacs? ( >=virtual/emacs-23 ) + python? ( ${PYTHON_DEPS} ) + " +DEPEND="${CDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2] + >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb + crypt? ( app-crypt/gnupg dev-libs/openssl ) ) + valgrind? ( dev-util/valgrind ) + " +RDEPEND="${CDEPEND} + crypt? ( app-crypt/gnupg ) + nmbug? ( dev-vcs/git ) + mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools + dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu + virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long + virtual/perl-Pod-Parser ) + " + +DOCS=( AUTHORS NEWS README ) +PATCHES=( + "${FILESDIR}/${PV}-0001-emacs-id-buttonization.patch" + "${FILESDIR}/${PV}-0002-emacs-search-face-bugfix.patch" + ) +SITEFILE="50${PN}-gentoo.el" +MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" + +bindings() { + local ret=0 + + if use $1; then + pushd bindings/$1 || die + shift + "$@" + ret=$? + popd || die + fi + + return $ret +} + +pkg_pretend() { + if has_version '<net-mail/notmuch-0.18'; then + ewarn + ewarn "There are few not backward compatible changes between" + ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file" + ewarn "(0.18 section) for details before first use!" + ewarn + fi +} + +pkg_setup() { + if use emacs; then + elisp-need-emacs 23 || die "Emacs version too low" + fi +} + +src_unpack() { + unpack "${P}".tar.gz + if use test; then + mkdir -p "${S}"/test/test-databases || die + cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die + fi +} + +src_prepare() { + default + + bindings python distutils-r1_src_prepare + bindings python mv README README-python || die + mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die + + rm -f Makefile.config # assure that new Makefile.config will be generated + + if use test; then + append-cflags -g + append-cxxflags -g + fi +} + +src_configure() { + local myeconfargs=( + --bashcompletiondir="$(get_bashcompdir)" + --emacslispdir="${EPREFIX}/${SITELISP}/${PN}" + --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}" + --without-ruby + --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" + $(use_with emacs) + $(use_with doc api-docs) + ) + tc-export CC CXX + econf "${myeconfargs[@]}" +} + +src_compile() { + V=1 default + bindings python distutils-r1_src_compile + + if use mutt; then + pushd contrib/notmuch-mutt || die + emake notmuch-mutt.1 + popd || die + fi + + if use doc; then + pydocs() { + pushd docs || die + emake html + rm -r html/_sources || die + rm html/{objects.inv,.buildinfo} || die + mkdir -p ../html && mv html ../html/python || die + popd || die + } + LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs + fi +} + +src_test() { + pax-mark -m notmuch + LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default + pax-mark -ze notmuch +} + +src_install() { + default + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + fi + + if use nmbug; then + dobin devel/nmbug/nmbug + dobin devel/nmbug/notmuch-report + fi + + if use mutt; then + pushd contrib/notmuch-mutt || die + dobin notmuch-mutt + doman notmuch-mutt.1 + insinto /etc/mutt + doins notmuch-mutt.rc + dodoc README-mutt + popd || die + fi + + DOCS="" bindings python distutils-r1_src_install + use doc && bindings python dodoc -r html +} + +pkg_preinst() { + if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then + elog "To enable notmuch support in mutt, add the following line into" + elog "your mutt config file, please:" + elog "" + elog " source /etc/mutt/notmuch-mutt.rc" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |