colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notmuch-addrlookup: fix build with notmuch 0.25 (#27691)

Browse Source
This commit is contained in:
Adam Růžička 2017-08-30 18:43:27 +02:00 committed by Franz Pletz
parent 3d107c15bd
commit 55a123a49d
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch Normal file
View File

@ -0,0 +1,44 @@
From a736c0dfd22cd4ab0da86c30a664c91843df1b98 Mon Sep 17 00:00:00 2001
From: Adam Ruzicka <a.ruzicka@outlook.com>
Date: Sat, 29 Jul 2017 12:16:29 +0200
Subject: [PATCH] notmuch-0.25 compatibility fix
---
notmuch-addrlookup.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c
index c5cf5b4..a95ded0 100644
--- a/notmuch-addrlookup.c
+++ b/notmuch-addrlookup.c
@@ -171,6 +171,13 @@ create_queries (notmuch_database_t *db,
count += tmp;
if (notmuch_query_count_messages_st (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
count += tmp;
+#elif LIBNOTMUCH_MAJOR_VERSION >= 5
+ unsigned int count = 0;
+ unsigned int tmp;
+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
+ count += tmp;
+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
+ count += tmp;
#else
unsigned int count = notmuch_query_count_messages (queries[0])
+ notmuch_query_count_messages (queries[1]);
@@ -233,6 +240,13 @@ run_queries (notmuch_database_t *db,
#if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3
if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS)
continue;
+#elif LIBNOTMUCH_MAJOR_VERSION >= 5
+ unsigned int count = 0;
+ unsigned int tmp;
+ if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
+ count += tmp;
+ if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
+ count += tmp;
#else
if (!(messages = notmuch_query_search_messages (queries[i])))
continue;
--
2.13.3

3
pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
View File

@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig glib notmuch ];
# Required until notmuch-addrlookup can be compiled against notmuch >= 0.25
patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ];
installPhase = ''
mkdir -p "$out/bin"
cp notmuch-addrlookup "$out/bin"