From: David Bremner <david@tethera.net>
Date: Mon, 17 Jul 2017 12:20:10 +0000 (-0300)
Subject: Merge tag 'debian/0.25_rc0-2'
X-Git-Tag: 0.25_rc1~14
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051;hp=470f74d4018f1c98d905b07d493eb2698c576181;p=notmuch

Merge tag 'debian/0.25_rc0-2'

merge 32 bit compilation fix
---

diff --git a/debian/changelog b/debian/changelog
index f02f2132..c74e53c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.25~rc0-2) experimental; urgency=medium
+
+  * Fix compilation on 32 bit architectures (time_t vs. gint64)
+
+ -- David Bremner <bremner@debian.org>  Mon, 17 Jul 2017 08:49:32 -0300
+
 notmuch (0.25~rc0-1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/util/gmime-extra.c b/util/gmime-extra.c
index ed53e0ab..901d4d56 100644
--- a/util/gmime-extra.c
+++ b/util/gmime-extra.c
@@ -100,9 +100,9 @@ g_mime_signature_status_error (GMimeSignatureError error) {
     return (error != GMIME_SIGNATURE_ERROR_NONE);
 }
 
-time_t
+gint64
 g_mime_utils_header_decode_date_unix (const char *date) {
-    return g_mime_utils_header_decode_date (date, NULL);
+    return (gint64) g_mime_utils_header_decode_date (date, NULL);
 }
 
 #else /* GMime >= 3.0 */