From ca05c21a3ab3e69ff60da41cb10cba2de84ed614 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 31 Jul 2019 14:47:12 +0200 Subject: [PATCH] app-antivirus/clamav: Fixed compilation with sys-libs/ncurses[tinfo] Fixed without excplicit permission due to maintainer timeout. Thanks-to: Jeroen Roovers Bug: https://bugs.gentoo.org/670729 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler --- app-antivirus/clamav/clamav-0.101.2-r1.ebuild | 3 +- .../clamav/files/clamav-0.101.2-tinfo.patch | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch diff --git a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild index 986cc1711ae1..372a1c6336b2 100644 --- a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild +++ b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild @@ -41,7 +41,8 @@ DOCS=( docs/UserManual.md docs/UserManual ) HTML_DOCS=( docs/html ) PATCHES=( - "${FILESDIR}/clamav-0.101.2-libxml2_pkgconfig.patch" #661328 + "${FILESDIR}/${PN}-0.101.2-libxml2_pkgconfig.patch" #661328 + "${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729 ) pkg_setup() { diff --git a/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch b/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch new file mode 100644 index 000000000000..66130be41882 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/670729 + +--- a/m4/reorganization/clamdtop.m4 ++++ b/m4/reorganization/clamdtop.m4 +@@ -4,12 +4,26 @@ + + if test "$enable_clamdtop" != "no"; then + ++PKG_CHECK_MODULES([CURSES], [ncursesw], ++ [CURSES_INCLUDE=""; ++ HAVE_LIBNCURSES=yes], ++ HAVE_LIBNCURSES=no]) ++ ++if test "X$HAVE_LIBNCURSES" != "Xyes"; then ++PKG_CHECK_MODULES([CURSES], [ncurses], ++ [CURSES_INCLUDE=""; ++ HAVE_LIBNCURSES=yes], ++ HAVE_LIBNCURSES=no]) ++fi ++ ++if test "X$HAVE_LIBNCURSES" != "Xyes"; then + AC_LIB_FIND([ncurses], [ncurses/ncurses.h], + AC_LANG_PROGRAM([#include ], + [initscr(); KEY_RESIZE;]), + [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; + CURSES_INCLUDE=""], + []) ++fi + + if test "X$HAVE_LIBNCURSES" != "Xyes"; then + HAVE_LIBNCURSES= -- 2.26.2