diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-10-28 20:54:26 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-10-28 20:54:26 +0000 |
| commit | 62da07b6ee150ecdbcd40b316d1cd936b18676e5 (patch) | |
| tree | 58e8df9c4a37e05be1451ad6301b52d814b826d2 /app-admin/conky | |
| parent | Add missing DEPEND on yelp-tools (#517462 by John Bowler), drop old (diff) | |
| download | gentoo-2-62da07b6ee150ecdbcd40b316d1cd936b18676e5.tar.gz gentoo-2-62da07b6ee150ecdbcd40b316d1cd936b18676e5.tar.bz2 gentoo-2-62da07b6ee150ecdbcd40b316d1cd936b18676e5.zip | |
Fix building against sys-libs/ncurses[tinfo] (bug #498026).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.9.0-r3.ebuild | 13 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.9.0-tinfo.patch | 22 |
3 files changed, 35 insertions, 6 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 06439eb14003..14f7a9d52028 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/conky # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.222 2014/03/24 16:59:58 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.223 2014/10/28 20:54:26 jer Exp $ + + 28 Oct 2014; Jeroen Roovers <jer@gentoo.org> conky-1.9.0-r3.ebuild, + +files/conky-1.9.0-tinfo.patch: + Fix building against sys-libs/ncurses[tinfo] (bug #498026). 24 Mar 2014; Daniel Pielmeier <billie@gentoo.org> -conky-1.9.0-r2.ebuild: Remove old. diff --git a/app-admin/conky/conky-1.9.0-r3.ebuild b/app-admin/conky/conky-1.9.0-r3.ebuild index 06cbc99e8fc7..7135be4ba65b 100644 --- a/app-admin/conky/conky-1.9.0-r3.ebuild +++ b/app-admin/conky/conky-1.9.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r3.ebuild,v 1.10 2014/03/24 15:12:42 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r3.ebuild,v 1.11 2014/10/28 20:54:26 jer Exp $ EAPI=5 @@ -59,17 +59,20 @@ DEPEND=" " src_prepare() { - epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \ + epatch \ + "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \ "${FILESDIR}/${P}-ncurses.patch" \ "${FILESDIR}/${P}-lines-fix.patch" \ "${FILESDIR}/${P}-update-when-message-count-decreases.patch" \ "${FILESDIR}/${P}-apcupsd.patch" \ "${FILESDIR}/${P}-default-graph-size.patch" \ - "${FILESDIR}/${P}-diskio-dmmajor.patch" + "${FILESDIR}/${P}-diskio-dmmajor.patch" \ + "${FILESDIR}/${P}-tinfo.patch" # Allow user patches #478482 - # Only run autotools if user patched something - epatch_user && eautoreconf || elibtoolize + epatch_user + + eautoreconf } src_configure() { diff --git a/app-admin/conky/files/conky-1.9.0-tinfo.patch b/app-admin/conky/files/conky-1.9.0-tinfo.patch new file mode 100644 index 000000000000..0018a726f3ff --- /dev/null +++ b/app-admin/conky/files/conky-1.9.0-tinfo.patch @@ -0,0 +1,22 @@ +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -134,7 +134,7 @@ + + AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes) + if test x$want_ncurses = xyes; then +- conky_LIBS="$conky_LIBS -lncurses" ++ PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found])) + AC_DEFINE(NCURSES, 1, [Define for ncurses support]) + AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found])) + fi +--- a/configure.ac ++++ b/configure.ac +@@ -134,7 +134,7 @@ + + AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes) + if test x$want_ncurses = xyes; then +- conky_LIBS="$conky_LIBS -lncurses" ++ PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found])) + AC_DEFINE(NCURSES, 1, [Define for ncurses support]) + AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found])) + fi |