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