debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 13:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source 
minimal mset fix, for 0.26.2
This commit is contained in:
David Bremner 2018-04-26 22:47:40 -03:00
commit 388edce0b7
5 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -4,6 +4,12 @@ Notmuch 0.26.2 (UNRELEASED)
Library Changes Library Changes
--------------- ---------------
Work around Xapian bug with `get_mset(0,0, x)`.
This causes aborts in `_notmuch_query_count_documents` on
e.g. Fedora 28. The underlying bug is fixed in Xapian commit
f92e2a936c1592, and will be fixed in Xapian 1.4.6.
Make thread indexing more robust against reference loops Make thread indexing more robust against reference loops
Choose a thread root by date in case of reference loops. Fix a Choose a thread root by date in case of reference loops. Fix a

2
bindings/python/notmuch/version.py
View file

@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version # this file should be kept in sync with ../../../version
__VERSION__ = '0.26.1' __VERSION__ = '0.26.2'
SOVERSION = '5' SOVERSION = '5'

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
notmuch (0.26.2-1) UNRELEASED; urgency=medium
* Break reference loops when indexing, fixes INTERNAL_ERROR in "notmuch show"
* Don't call get_mset(0,0,X), fixes crash on some gcc8 using distros
-- David Bremner <bremner@debian.org> Thu, 26 Apr 2018 22:41:37 -0300
notmuch (0.26.1-1) unstable; urgency=medium notmuch (0.26.1-1) unstable; urgency=medium
* Bump LIBRARY_MINOR_VERSION to 1, for new functions in 0.26 * Bump LIBRARY_MINOR_VERSION to 1, for new functions in 0.26

4
lib/query.cc
View file

@ -652,9 +652,9 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign
/* /*
* Set the checkatleast parameter to the number of documents * Set the checkatleast parameter to the number of documents
* in the database to make get_matches_estimated() exact. * in the database to make get_matches_estimated() exact.
* Set the max parameter to 0 to avoid fetching documents we will discard. * Set the max parameter to 1 to avoid fetching documents we will discard.
*/ */
mset = enquire.get_mset (0, 0, mset = enquire.get_mset (0, 1,
notmuch->xapian_db->get_doccount ()); notmuch->xapian_db->get_doccount ());
count = mset.get_matches_estimated(); count = mset.get_matches_estimated();

2
version
View file

@ -1 +1 @@
0.26.1 0.26.2