1
0
forked from pool/mutt
Dr. Werner Fink 2016-05-23 13:51:20 +00:00 committed by Git OBS Bridge
parent df25aa0a1e
commit 98e178c3d2
2 changed files with 27 additions and 0 deletions

24
COLS-workaround.dif Normal file
View File

@ -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,,[

View File

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