This is not ideal, but the new API is not available in Xapian 1.2.x, and
it seems to soon to depend on Xapian >= 1.4
---
configure | 1 +
lib/database-private.h | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/configure b/configure
index cc6746c..27b3b45 100755
--- a/configure
+++ b/configure
@@ -1141,6 +1141,7 @@ COMMON_CONFIGURE_CFLAGS = \\
-DSTD_GETPWUID=\$(STD_GETPWUID) \\
-DSTD_ASCTIME=\$(STD_ASCTIME) \\
-DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT) \\
+ -DSILENCE_XAPIAN_DEPRECATION_WARNINGS \\
-DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\
-DHAVE_XAPIAN_DB_RETRY_LOCK=\$(HAVE_XAPIAN_DB_RETRY_LOCK) \\
-DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)
diff --git a/lib/database-private.h b/lib/database-private.h
index ca71a92..ccc1e9a 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -32,6 +32,10 @@
#include "notmuch-private.h"
+#ifdef SILENCE_XAPIAN_DEPRECATION_WARNINGS
+#define XAPIAN_DEPRECATED(D) D
+#endif
+
#include <xapian.h>
#pragma GCC visibility push(hidden)
--
2.9.3
_______________________________________________
notmuch mailing list
[email protected]
https://notmuchmail.org/mailman/listinfo/notmuch
