cleanup patches for 0.25

cleanup patches for 0.25

[David Bremner]

[PATCH 1/4] util: make g_mime_utils_header_decode_date_unix match
This I already pushed, as it seemed a bit urgent

[PATCH 3/4] emacs: convert remaining format-versions from 3 to 4

I don't really know why this wasn't done in the first place, but since the update from 3 to 4 is hassle free on the emacs side, may as well be consistent

[PATCH 4/4] debian: allow emacs25 as a build depends

Another thing I've been meaning to fix, now seems like a good time.

[PATCH 1/4] util: make g_mime_utils_header_decode_date_unix match prototype

[David Bremner]

The problem shows up on 32 bit architectures where sizeof(time_t) !=
sizeof(gint64).  Upcasting the 32 bit time_t to a 64 bit integer
should hopefully be safe.
---
 util/gmime-extra.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 */
-- 
2.11.0

[PATCH 2/4] debian: changelog stanza for 0.25~rc0-2

[David Bremner]

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

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
-- 
2.11.0

[PATCH 3/4] emacs: convert remaining format-versions from 3 to 4

[David Bremner]

This is needed for consistent beheviour between notmuch built against
gmime-2.6 and gmime-3.0 w.r.t. error reporting.
---
 emacs/notmuch-address.el | 2 +-
 emacs/notmuch-mua.el     | 2 +-
 emacs/notmuch-tree.el    | 2 +-
 emacs/notmuch.el         | 2 +-
 test/T310-emacs.sh       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 74a4584f..f937e708 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -317,7 +317,7 @@ execution, CALLBACK is called when harvesting finishes."
 			    (when config-query
 			      (format " and (%s)" config-query)))
 		  from-or-to-me-query))
-	 (args `("address" "--format=sexp" "--format-version=3"
+	 (args `("address" "--format=sexp" "--format-version=4"
 		 ,(if sent "--output=recipients" "--output=sender")
 		 "--deduplicate=address"
 		 ,query)))
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index ddfb9811..fd64b362 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -176,7 +176,7 @@ mutiple parts get a header."
   (unless (bolp) (insert "\n")))
 
 (defun notmuch-mua-reply (query-string &optional sender reply-all)
-  (let ((args '("reply" "--format=sexp" "--format-version=3"))
+  (let ((args '("reply" "--format=sexp" "--format-version=4"))
 	(process-crypto notmuch-show-process-crypto)
 	reply
 	original)
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 55212626..022525ae 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -917,7 +917,7 @@ the same as for the function notmuch-tree."
     (notmuch-tag-clear-cache)
     (let ((proc (notmuch-start-notmuch
 		 "notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel
-		 "show" "--body=false" "--format=sexp" "--format-version=3"
+		 "show" "--body=false" "--format=sexp" "--format-version=4"
 		 message-arg search-args))
 	  ;; Use a scratch buffer to accumulate partial output.
 	  ;; This buffer will be killed by the sentinel, which
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index bd503a11..0aeff560 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -994,7 +994,7 @@ the configured default sort order."
       (save-excursion
 	(let ((proc (notmuch-start-notmuch
 		     "notmuch-search" buffer #'notmuch-search-process-sentinel
-		     "search" "--format=sexp" "--format-version=3"
+		     "search" "--format=sexp" "--format-version=4"
 		     (if oldest-first
 			 "--sort=oldest-first"
 		       "--sort=newest-first")
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index c8a25de2..fde11790 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -1015,7 +1015,7 @@ YYY/notmuch_fail exited with status 1 (see *Notmuch errors* for more details)
 === ERROR ===
 [XXX]
 YYY/notmuch_fail exited with status 1
-command: YYY/notmuch_fail search --format\=sexp --format-version\=3 --sort\=newest-first tag\:inbox
+command: YYY/notmuch_fail search --format\=sexp --format-version\=4 --sort\=newest-first tag\:inbox
 exit status: 1"
 
 test_begin_subtest "Search handles subprocess warnings"
-- 
2.11.0

[PATCH 4/4] debian: allow emacs25 as a build depend

[David Bremner]

It's a bit crazy to require emacs 24 installed just to build, when it
isn't required to run.
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 4e1feba1..96807d49 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
  dh-elpa (>= 1.3),
  python-sphinx (>= 1.0),
  ruby, ruby-dev (>>1:1.9.3~),
+ emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
  gdb [!s390x !ia64 !armel !ppc64el !mips !mipsel !mips64el !kfreebsd-any],
-- 
2.11.0

Re: [PATCH 4/4] debian: allow emacs25 as a build depend

[David Bremner]

David Bremner <david@tethera.net> writes:

> It's a bit crazy to require emacs 24 installed just to build, when it
> isn't required to run.

pushed the remaining two patches