Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/conky/files: conky-1.9.0-tinfo.patch
Date: Tue, 28 Oct 2014 20:54:31
Message-Id: 20141028205426.25CAC8F50@oystercatcher.gentoo.org
1 jer 14/10/28 20:54:26
2
3 Added: conky-1.9.0-tinfo.patch
4 Log:
5 Fix building against sys-libs/ncurses[tinfo] (bug #498026).
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.1 app-admin/conky/files/conky-1.9.0-tinfo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.9.0-tinfo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.9.0-tinfo.patch?rev=1.1&content-type=text/plain
14
15 Index: conky-1.9.0-tinfo.patch
16 ===================================================================
17 --- a/configure.ac.in
18 +++ b/configure.ac.in
19 @@ -134,7 +134,7 @@
20
21 AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
22 if test x$want_ncurses = xyes; then
23 - conky_LIBS="$conky_LIBS -lncurses"
24 + PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
25 AC_DEFINE(NCURSES, 1, [Define for ncurses support])
26 AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
27 fi
28 --- a/configure.ac
29 +++ b/configure.ac
30 @@ -134,7 +134,7 @@
31
32 AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
33 if test x$want_ncurses = xyes; then
34 - conky_LIBS="$conky_LIBS -lncurses"
35 + PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
36 AC_DEFINE(NCURSES, 1, [Define for ncurses support])
37 AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
38 fi