fix build with gcc 10

diff --git a/cyrus-imapd-gcc10.patch b/cyrus-imapd-gcc10.patch
new file mode 100644 (file)
index 0000000..a385968
--- /dev/null
+++ b/cyrus-imapd-gcc10.patch
@@ -0,0 +1,37 @@
+From 817449994d4acae0023c34ab045649c38a6d37eb Mon Sep 17 00:00:00 2001
+From: Bron Gondwana <brong@fastmail.fm>
+Date: Sun, 15 Jul 2018 03:34:46 +1000
+Subject: [PATCH] conversations: move open_conversationsdb to conversations.c
+
+Thanks Chris Newman
+---
+ imap/conversations.c | 2 ++
+ imap/conversations.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/imap/conversations.c b/imap/conversations.c
+index 620486afc..5c96eb1bb 100644
+--- a/imap/conversations.c
++++ b/imap/conversations.c
+@@ -100,6 +100,8 @@
+ 
+ #define CONVERSATIONS_VERSION 0
+ 
++struct conversations_open *open_conversations;
++
+ static conv_status_t NULLSTATUS = { 0, 0, 0};
+ 
+ static char *convdir = NULL;
+diff --git a/imap/conversations.h b/imap/conversations.h
+index 179969f0a..cd77df856 100644
+--- a/imap/conversations.h
++++ b/imap/conversations.h
+@@ -78,7 +78,7 @@ struct conversations_open {
+     struct conversations_open *next;
+ };
+ 
+-struct conversations_open *open_conversations;
++extern struct conversations_open *open_conversations;
+ 
+ typedef struct conversation conversation_t;
+ typedef struct conv_folder  conv_folder_t;

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 1b015bb007366a3484bc2a22045e26c7d239b72d..c9c83477f33e1d05257792769d7e0d321c9de1c0 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -40,6 +40,7 @@ Patch1:               link.patch
 Patch2:                %{name}-clamav-0.101.patch
 Patch3:                %{name}-icu.patch
 Patch4:                %{name}-libcap.patch
+Patch5:                %{name}-gcc10.patch
 URL:           http://www.cyrusimap.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake
@@ -207,6 +208,7 @@ Perlowy interfejs do biblioteki cyrus-imapd.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE4} %{SOURCE5} .