From 28e71399e96e0688d46bfffebcbb188859fcb9b1 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Mon, 28 Oct 2013 17:31:44 +0200
Subject: [PATCH] Re: [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT

---
 4a/137bd568f33d12933d306fc67ad6a8915e9d0b | 86 +++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 4a/137bd568f33d12933d306fc67ad6a8915e9d0b

diff --git a/4a/137bd568f33d12933d306fc67ad6a8915e9d0b b/4a/137bd568f33d12933d306fc67ad6a8915e9d0b
new file mode 100644
index 000000000..a73718a09
--- /dev/null
+++ b/4a/137bd568f33d12933d306fc67ad6a8915e9d0b
@@ -0,0 +1,86 @@
+Return-Path: <tomi.ollila@iki.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 18CFC431FB6
+	for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 08:32:04 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id NahT4mCvb1oT for <notmuch@notmuchmail.org>;
+	Mon, 28 Oct 2013 08:31:55 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id A33BE431FAF
+	for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 08:31:55 -0700 (PDT)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id 988581000B2;
+	Mon, 28 Oct 2013 17:31:44 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
+Subject: Re: [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT
+In-Reply-To: <1382969359-8457-1-git-send-email-jani@nikula.org>
+References: <1382969359-8457-1-git-send-email-jani@nikula.org>
+User-Agent: Notmuch/0.16+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Mon, 28 Oct 2013 17:31:44 +0200
+Message-ID: <m2sivls97j.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Mon, 28 Oct 2013 15:32:04 -0000
+
+On Mon, Oct 28 2013, Jani Nikula <jani@nikula.org> wrote:
+
+> Minimal change to build notmuch against xapian that doesn't have
+> compaction support.
+> ---
+
+LGTM.
+
+Tomi
+
+
+>  lib/database.cc |    4 +++-
+>  1 files changed, 3 insertions(+), 1 deletions(-)
+>
+> diff --git a/lib/database.cc b/lib/database.cc
+> index 06f1c0a..20e5ec2 100644
+> --- a/lib/database.cc
+> +++ b/lib/database.cc
+> @@ -944,7 +944,9 @@ DONE:
+>  }
+>  #else
+>  notmuch_status_t
+> -notmuch_database_compact_close (unused (notmuch_database_t *notmuch))
+> +notmuch_database_compact (unused (const char* path),
+> +			  unused (const char* backup_path),
+> +			  unused (notmuch_compact_status_cb_t status_cb))
+>  {
+>      fprintf (stderr, "notmuch was compiled against a xapian version lacking compaction support.\n");
+>      return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
+> -- 
+> 1.7.2.5
+>
+> _______________________________________________
+> notmuch mailing list
+> notmuch@notmuchmail.org
+> http://notmuchmail.org/mailman/listinfo/notmuch
-- 
2.26.2