[PATCH] fixup! cli/lib: remove support for GMime 2.4

diff --git a/e9/32996d298a2cc8bbe832ed1e4e5ebbac22a859 b/e9/32996d298a2cc8bbe832ed1e4e5ebbac22a859
new file mode 100644 (file)
index 0000000..ec372e7
--- /dev/null
+++ b/e9/32996d298a2cc8bbe832ed1e4e5ebbac22a859
@@ -0,0 +1,93 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 5BC006DE0B26\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Aug 2015 08:51:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.129\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.129 tagged_above=-999 required=5 tests=[AWL=0.119, \r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id eUyXdAOhHQua for <notmuch@notmuchmail.org>;\r
+ Sun, 16 Aug 2015 08:51:42 -0700 (PDT)\r
+Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 6B0056DE01D3\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Aug 2015 08:51:42 -0700 (PDT)\r
+Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1ZR0D6-0003HT-1n; Sun, 16 Aug 2015 15:51:00 +0000\r
+Received: (nullmailer pid 27059 invoked by uid 1000); Sun, 16 Aug 2015\r
+ 15:50:51 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: [PATCH] fixup! cli/lib: remove support for GMime 2.4\r
+Date: Sun, 16 Aug 2015 17:50:44 +0200\r
+Message-Id: <1439740244-27017-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.5.0\r
+In-Reply-To: <1439739201-11068-1-git-send-email-david@tethera.net>\r
+References: <1439739201-11068-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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: Sun, 16 Aug 2015 15:51:44 -0000\r
+\r
+---\r
+ notmuch-client.h | 18 +-----------------\r
+ 1 file changed, 1 insertion(+), 17 deletions(-)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 78680aa..1f82656 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -30,16 +30,7 @@\r
+ \r
+ #include <gmime/gmime.h>\r
+ \r
+-/* GMIME_CHECK_VERSION in gmime 2.4 is not usable from the\r
+- * preprocessor (it calls a runtime function). But since\r
+- * GMIME_MAJOR_VERSION and friends were added in gmime 2.6, we can use\r
+- * these to check the version number. */\r
+-#ifdef GMIME_MAJOR_VERSION\r
+-#define GMIME_ATLEAST_26\r
+ typedef GMimeCryptoContext notmuch_crypto_context_t;\r
+-#else\r
+-typedef GMimeCipherContext notmuch_crypto_context_t;\r
+-#endif\r
+ \r
+ #include "notmuch.h"\r
+ \r
+@@ -394,17 +385,10 @@ struct mime_node {\r
+ \r
+     /* True if signature verification on this part was attempted. */\r
+     notmuch_bool_t verify_attempted;\r
+-#ifdef GMIME_ATLEAST_26\r
++\r
+     /* The list of signatures for signed or encrypted containers. If\r
+      * there are no signatures, this will be NULL. */\r
+     GMimeSignatureList* sig_list;\r
+-#else\r
+-    /* For signed or encrypted containers, the validity of the\r
+-     * signature.  May be NULL if signature verification failed.  If\r
+-     * there are simply no signatures, this will be non-NULL with an\r
+-     * empty signers list. */\r
+-    const GMimeSignatureValidity *sig_validity;\r
+-#endif\r
+ \r
+     /* Internal: Context inherited from the root iterator. */\r
+     struct mime_node_context *ctx;\r
+-- \r
+2.5.0\r
+\r