debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

require xapian >= 1.2.6

Browse source 
It seems that no-one tried to compile without Xapian compact support
since March of 2015, since that's when I introduced a syntax error in
that branch of the ifdef.

Given the choice of maintaining this underused branch of code, or
bumping the Xapian dependency to a version from 2011, it seems
reasonable to do the latter.
This commit is contained in:
David Bremner 2016-10-04 21:35:23 -03:00
parent dbf6142789
commit af8903df34
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure vendored
View file

@ -394,6 +394,7 @@ EOF
printf "Yes.\n" printf "Yes.\n"
else else
printf "No.\n" printf "No.\n"
errors=$((errors + 1))
fi fi
rm -f _compact.o _compact.cc rm -f _compact.o _compact.cc
@ -683,8 +684,8 @@ EOF
if [ $have_python -eq 0 ]; then if [ $have_python -eq 0 ]; then
echo " python interpreter" echo " python interpreter"
fi fi
if [ $have_xapian -eq 0 ]; then if [ $have_xapian -eq 0 -o $have_xapian_compact -eq 0 ]; then
echo " Xapian library (including development files such as headers)" echo " Xapian library (>= version 1.2.6, including development files such as headers)"
echo " https://xapian.org/" echo " https://xapian.org/"
fi fi
if [ $have_zlib -eq 0 ]; then if [ $have_zlib -eq 0 ]; then

12
lib/database.cc
View file

@ -1143,7 +1143,6 @@ notmuch_database_close (notmuch_database_t *notmuch)
return status; return status;
} }
#if HAVE_XAPIAN_COMPACT
static int static int
unlink_cb (const char *path, unlink_cb (const char *path,
unused (const struct stat *sb), unused (const struct stat *sb),
@ -1327,17 +1326,6 @@ notmuch_database_compact (const char *path,
return ret; return ret;
} }
#else
notmuch_status_t
notmuch_database_compact (unused (const char *path),
unused (const char *backup_path),
unused (notmuch_compact_status_cb_t status_cb),
unused (void *closure))
{
_notmuch_database_log (notmuch, "notmuch was compiled against a xapian version lacking compaction support.\n");
return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
}
#endif
notmuch_status_t notmuch_status_t
notmuch_database_destroy (notmuch_database_t *notmuch) notmuch_database_destroy (notmuch_database_t *notmuch)