From c9b90cb2888cab29f1d1bc56022f5f45bef17742 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 20 May 2016 15:15:40 +0000
Subject: [PATCH 1/4] boo#980830

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=124
---
 mutt.changes | 5 +++++
 mutt.spec    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/mutt.changes b/mutt.changes
index be05d1d..d7d457c 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 20 15:14:52 UTC 2016 - werner@suse.de
+
+- Enable some of the new patches like sidebar (boo#980830) 
+
 -------------------------------------------------------------------
 Thu May 12 13:50:14 UTC 2016 - werner@suse.de
 
diff --git a/mutt.spec b/mutt.spec
index 66eb929..25cb6f4 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -200,6 +200,9 @@ chmod 755 $KRB5CFGPATH
 	--enable-nfs-fix \
 	--enable-mailtool \
 	--enable-compressed \
+	--enable-sidebar \
+	--enable-notmuch  \
+	--enable-hcache \
 	--disable-external-dotlock \
 	--with-ssl=%{_prefix} \
 	--with-sasl=%{_prefix} \

From df25aa0a1e8945508b59d1db9f45547bf4b444e8 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 20 May 2016 15:19:52 +0000
Subject: [PATCH 2/4] boo#980830

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=125
---
 mutt.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mutt.spec b/mutt.spec
index 25cb6f4..45d27c0 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -43,6 +43,7 @@ BuildRequires:  libxml2
 BuildRequires:  libxslt
 BuildRequires:  lynx
 BuildRequires:  ncurses-devel
+BuildRequires:  notmuch-devel
 BuildRequires:  postfix
 BuildRequires:  sgml-skel
 BuildRequires:  update-desktop-files

From 98e178c3d24781c499be17ee991d613078d87481 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 23 May 2016 13:51:20 +0000
Subject: [PATCH 3/4] .

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=126
---
 COLS-workaround.dif | 24 ++++++++++++++++++++++++
 mutt.spec           |  3 +++
 2 files changed, 27 insertions(+)
 create mode 100644 COLS-workaround.dif

diff --git a/COLS-workaround.dif b/COLS-workaround.dif
new file mode 100644
index 0000000..702781b
--- /dev/null
+++ b/COLS-workaround.dif
@@ -0,0 +1,24 @@
+Current neomutt sidebar patch does change COLS which does
+not work with threadsafe ncurses6
+
+---
+ configure.ac |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- configure.ac
++++ configure.ac	2016-05-23 13:43:40.810914709 +0000
+@@ -305,6 +305,14 @@ main ()
+                 if test x$mutt_cv_curses != x/usr; then
+                         LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib"
+                         CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
++                fi
++                if test -d /usr/include/ncurses5 ; then
++                        if test -d /usr/lib64/ncurses5 ; then
++                            LDFLAGS="$LDFLAGS -L/usr/lib64/ncurses5"
++                        else
++                            LDFLAGS="$LDFLAGS -L/usr/lib/ncurses5"
++                        fi
++                        CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses5"
+                 fi])
+ 
+ 	AC_CHECK_FUNC(initscr,,[
diff --git a/mutt.spec b/mutt.spec
index 45d27c0..04b54b7 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -108,6 +108,8 @@ Patch16:        mutt-1.5.23-cariage-return.path
 Patch18:        mutt-1.5.21-mailcap.diff
 # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup()
 Patch19:        bsc907453-CVE-2014-9116-jessie.patch
+# PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream
+Patch20:        COLS-workaround.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir %{_sysconfdir}
 
@@ -138,6 +140,7 @@ patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch
 %patch16 -p0 -b .crlf
 %patch18 -p0 -b .mailcap
 %patch19 -p0 -b .cvw2014.9116
+%patch20 -p0 -b .cols
 rm -vf README*.orig
 rm -vf PATCHES*.orig
 

From be21305d3c12b9d282bdcbf3fad06482a40d82a9 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 23 May 2016 13:57:44 +0000
Subject: [PATCH 4/4] .

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=127
---
 mutt.changes | 2 ++
 mutt.spec    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/mutt.changes b/mutt.changes
index d7d457c..d6622c4 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -2,6 +2,8 @@
 Fri May 20 15:14:52 UTC 2016 - werner@suse.de
 
 - Enable some of the new patches like sidebar (boo#980830) 
+- Add patch COLS-workaround.dif which should become removed once
+  the sidebar patch does not modify COLS anymore
 
 -------------------------------------------------------------------
 Thu May 12 13:50:14 UTC 2016 - werner@suse.de
diff --git a/mutt.spec b/mutt.spec
index 04b54b7..5c79a0b 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -43,7 +43,9 @@ BuildRequires:  libxml2
 BuildRequires:  libxslt
 BuildRequires:  lynx
 BuildRequires:  ncurses-devel
+%if 0%{?is_opensuse}
 BuildRequires:  notmuch-devel
+%endif
 BuildRequires:  postfix
 BuildRequires:  sgml-skel
 BuildRequires:  update-desktop-files
@@ -205,7 +207,9 @@ chmod 755 $KRB5CFGPATH
 	--enable-mailtool \
 	--enable-compressed \
 	--enable-sidebar \
+%if 0%{?is_opensuse}
 	--enable-notmuch  \
+%endif
 	--enable-hcache \
 	--disable-external-dotlock \
 	--with-ssl=%{_prefix} \