From f033b014b5463204aabba698dfb7506a3301da4d Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 28 Oct 2013 15:09:19 +0100 Subject: [PATCH] [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT --- ff/78811b0fe5110bfcd9a9519a5e719e4eb80ccc | 86 +++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 ff/78811b0fe5110bfcd9a9519a5e719e4eb80ccc diff --git a/ff/78811b0fe5110bfcd9a9519a5e719e4eb80ccc b/ff/78811b0fe5110bfcd9a9519a5e719e4eb80ccc new file mode 100644 index 000000000..94da75065 --- /dev/null +++ b/ff/78811b0fe5110bfcd9a9519a5e719e4eb80ccc @@ -0,0 +1,86 @@ +Return-Path: +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 262B4431FB6 + for ; Mon, 28 Oct 2013 07:09:44 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 TRMeAqupX6sh for ; + Mon, 28 Oct 2013 07:09:38 -0700 (PDT) +Received: from mail-we0-f180.google.com (mail-we0-f180.google.com + [74.125.82.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 0EDC1431FAF + for ; Mon, 28 Oct 2013 07:09:37 -0700 (PDT) +Received: by mail-we0-f180.google.com with SMTP id q59so6521685wes.25 + for ; Mon, 28 Oct 2013 07:09:35 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id; + bh=UqhqoN+RWdzy/QIOYfh2308GistY3zohE4Gg1u5/erY=; + b=h5wERXtwmSghRU8S7xdQLdjwrkwe4WXqHj96xMiozD6didcPKGV/oQSzfAwFaYZLsH + ywBK2c+Ve8a3gUHJ0nOPIBdT66Bcl9JbrOJm1IrX98sO+02fn5yma5Q1SdTB12gPnPCy + Z+bi3ko7qnjs6Byu6JrERVyw+1jPey9Nuql86+LSsrfQ4a1anuDGVcne/0axUjeFyc88 + 4dpYJif59kfYp/PA9yZABGSzQHiasy9bAcf5EUPxUHNA6YAAGmc9NYIWVsfVQGKzGZpd + Z6E3QndHe/XLhA4ASnxeK1qMEO8OZTeinSx0SNisQBr5kE4B3HlJbyD3gqQY02cPxMC2 + 6CEA== +X-Gm-Message-State: + ALoCoQnRrsyHNF7lMPy+3/VunbO3BMVtIXkHlCr9N8WwxUDGr/rwl8xk2GEQpFdQ7LpYx0p4rdij +X-Received: by 10.180.189.80 with SMTP id gg16mr2323244wic.32.1382969374215; + Mon, 28 Oct 2013 07:09:34 -0700 (PDT) +Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3]) + by mx.google.com with ESMTPSA id ma3sm36217360wic.1.2013.10.28.07.09.32 + for + (version=TLSv1.1 cipher=RC4-SHA bits=128/128); + Mon, 28 Oct 2013 07:09:33 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH] lib: fix build on !HAVE_XAPIAN_COMPACT +Date: Mon, 28 Oct 2013 15:09:19 +0100 +Message-Id: <1382969359-8457-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 1.7.2.5 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 28 Oct 2013 14:09:44 -0000 + +Minimal change to build notmuch against xapian that doesn't have +compaction support. +--- + 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 + -- 2.26.2