Merge tag 'debian/0.25_rc0-2'

merge 32 bit compilation fix

diff --git a/debian/changelog b/debian/changelog
index f02f21328996c6d393d95fda3f11f7ffe1be6894..c74e53c276340daac8ede30a0b3605e19747cf88 100644 (file)
--- 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 ed53e0ab2a1efbede90b83d46f72932e62cb8884..901d4d5671baf741461e831356132effc6c07dc6 100644 (file)
--- 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 */