[PATCH] Make notmuch build and work with GMime 2.6

diff --git a/3a/39e302b96ba1f2b7d62516ed237624f6d9a86f b/3a/39e302b96ba1f2b7d62516ed237624f6d9a86f
new file mode 100644 (file)
index 0000000..ed8199e
--- /dev/null
+++ b/3a/39e302b96ba1f2b7d62516ed237624f6d9a86f
@@ -0,0 +1,75 @@
+Return-Path: <aperez@kaze.ara-ara.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 A15D8429E3B\r
+       for <notmuch@notmuchmail.org>; Mon, 16 Jan 2012 18:25:14 -0800 (PST)\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 30izoUpxn5NU for <notmuch@notmuchmail.org>;\r
+       Mon, 16 Jan 2012 18:25:14 -0800 (PST)\r
+Received: from smtp4.mundo-r.com (smtp4.mundo-r.com [212.51.32.151])\r
+       by olra.theworths.org (Postfix) with ESMTP id E6ED3429E35\r
+       for <notmuch@notmuchmail.org>; Mon, 16 Jan 2012 18:25:13 -0800 (PST)\r
+X-IronPort-Anti-Spam-Filtered: true\r
+X-IronPort-Anti-Spam-Result: ApwEAFnbFE9bdWOb/2dsb2JhbABErDCCEYJPFV5KiDOWPZ9UiWABBQgFBBEFAQYBAQYBBSwBAgEBAgMBAgEBAQECB0kMZIFwAgYBTIMcBJURkkM\r
+X-IronPort-AV: E=Sophos;i="4.71,521,1320620400"; d="scan'208";a="856064773"\r
+Received: from 155.99.117.91.static.mundo-r.com (HELO fanzine.igalia.com)\r
+       ([91.117.99.155])\r
+       by smtp4.mundo-r.com with ESMTP; 17 Jan 2012 03:25:10 +0100\r
+Received: from dsl-hkibrasgw3-fe7cfb00-20.dhcp.inet.fi ([84.251.124.20]\r
+       helo=kaze.ara-ara.org) by fanzine.igalia.com with esmtpsa \r
+       (Cipher TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim) id 1RmyjV-0008JU-PH\r
+       for <notmuch@notmuchmail.org>; Tue, 17 Jan 2012 03:25:09 +0100\r
+Received: (nullmailer pid 25211 invoked by uid 1000);\r
+       Tue, 17 Jan 2012 02:26:48 -0000\r
+From: Adrian Perez <aperez@igalia.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Make notmuch build and work with GMime 2.6\r
+Date: Tue, 17 Jan 2012 04:26:47 +0200\r
+Message-Id: <1326767208-25174-1-git-send-email-aperez@igalia.com>\r
+X-Mailer: git-send-email 1.7.8.3\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: Tue, 17 Jan 2012 02:25:14 -0000\r
+\r
+Hello to all,\r
+\r
+I have made a patch that enables to build notmuch with gmime 2.6 and it has\r
+been working for me for a while. I'm no notmuch/gmime expert, so feedback is\r
+welcome to polish it before merging -- supposing that there is the will to\r
+support gmime 2.6, BTW.\r
+\r
+Regards,\r
+\r
+-Adrian\r
+\r
+\r
+Adrian Perez (1):\r
+  Update notmuch to use the GMime 2.6 API\r
+\r
+ mime-node.c      |   20 ++++++++------\r
+ notmuch-client.h |    8 +++---\r
+ notmuch-reply.c  |    4 +--\r
+ notmuch-show.c   |   75 +++++++++++++++++++++++++----------------------------\r
+ 4 files changed, 51 insertions(+), 56 deletions(-)\r
+\r
+-- \r
+1.7.8.3\r
+\r