[PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT

diff --git a/ff/78811b0fe5110bfcd9a9519a5e719e4eb80ccc b/ff/78811b0fe5110bfcd9a9519a5e719e4eb80ccc
new file mode 100644 (file)
index 0000000..94da750
--- /dev/null
+++ b/ff/78811b0fe5110bfcd9a9519a5e719e4eb80ccc
@@ -0,0 +1,86 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 262B4431FB6\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 07:09:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id TRMeAqupX6sh for <notmuch@notmuchmail.org>;\r
+       Mon, 28 Oct 2013 07:09:38 -0700 (PDT)\r
+Received: from mail-we0-f180.google.com (mail-we0-f180.google.com\r
+       [74.125.82.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0EDC1431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 07:09:37 -0700 (PDT)\r
+Received: by mail-we0-f180.google.com with SMTP id q59so6521685wes.25\r
+       for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 07:09:35 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+       bh=UqhqoN+RWdzy/QIOYfh2308GistY3zohE4Gg1u5/erY=;\r
+       b=h5wERXtwmSghRU8S7xdQLdjwrkwe4WXqHj96xMiozD6didcPKGV/oQSzfAwFaYZLsH\r
+       ywBK2c+Ve8a3gUHJ0nOPIBdT66Bcl9JbrOJm1IrX98sO+02fn5yma5Q1SdTB12gPnPCy\r
+       Z+bi3ko7qnjs6Byu6JrERVyw+1jPey9Nuql86+LSsrfQ4a1anuDGVcne/0axUjeFyc88\r
+       4dpYJif59kfYp/PA9yZABGSzQHiasy9bAcf5EUPxUHNA6YAAGmc9NYIWVsfVQGKzGZpd\r
+       Z6E3QndHe/XLhA4ASnxeK1qMEO8OZTeinSx0SNisQBr5kE4B3HlJbyD3gqQY02cPxMC2\r
+       6CEA==\r
+X-Gm-Message-State:\r
+ ALoCoQnRrsyHNF7lMPy+3/VunbO3BMVtIXkHlCr9N8WwxUDGr/rwl8xk2GEQpFdQ7LpYx0p4rdij\r
+X-Received: by 10.180.189.80 with SMTP id gg16mr2323244wic.32.1382969374215;\r
+       Mon, 28 Oct 2013 07:09:34 -0700 (PDT)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPSA id ma3sm36217360wic.1.2013.10.28.07.09.32\r
+       for <multiple recipients>\r
+       (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+       Mon, 28 Oct 2013 07:09:33 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT\r
+Date: Mon, 28 Oct 2013 15:09:19 +0100\r
+Message-Id: <1382969359-8457-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.2.5\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 28 Oct 2013 14:09:44 -0000\r
+\r
+Minimal change to build notmuch against xapian that doesn't have\r
+compaction support.\r
+---\r
+ lib/database.cc |    4 +++-\r
+ 1 files changed, 3 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 06f1c0a..20e5ec2 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -944,7 +944,9 @@ DONE:\r
+ }\r
+ #else\r
+ notmuch_status_t\r
+-notmuch_database_compact_close (unused (notmuch_database_t *notmuch))\r
++notmuch_database_compact (unused (const char* path),\r
++                        unused (const char* backup_path),\r
++                        unused (notmuch_compact_status_cb_t status_cb))\r
+ {\r
+     fprintf (stderr, "notmuch was compiled against a xapian version lacking compaction support.\n");\r
+     return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;\r
+-- \r
+1.7.2.5\r
+\r