diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2015-10-18 17:10:07 +0200 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2015-10-18 17:10:32 +0200 |
| commit | 58f05ae177a527756922e9e3cf3ebbdb64a6c9a3 (patch) | |
| tree | f6247291d2852048965fa481910e1d87c3a9e942 /media-sound/ncmpc | |
| parent | net-p2p/pybitmessage: add maintainer (diff) | |
| download | gentoo-58f05ae177a527756922e9e3cf3ebbdb64a6c9a3.tar.gz gentoo-58f05ae177a527756922e9e3cf3ebbdb64a6c9a3.tar.bz2 gentoo-58f05ae177a527756922e9e3cf3ebbdb64a6c9a3.zip | |
media-sound/ncmpc: link against ncursesw instead of ncurses (bug #554256)
Diffstat (limited to 'media-sound/ncmpc')
| -rw-r--r-- | media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch | 16 | ||||
| -rw-r--r-- | media-sound/ncmpc/ncmpc-0.24-r2.ebuild (renamed from media-sound/ncmpc/ncmpc-0.24-r1.ebuild) | 9 |
2 files changed, 14 insertions, 11 deletions
diff --git a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch index 40ee0066e3d3..5c11e7682b59 100644 --- a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch +++ b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch @@ -1,6 +1,8 @@ +diff --git a/configure.ac b/configure.ac +index 2d79f35..b82dd49 100644 --- a/configure.ac +++ b/configure.ac -@@ -17,11 +17,8 @@ +@@ -17,11 +17,8 @@ AC_CONFIG_MACRO_DIR([m4]) dnl Check for programs AC_PROG_CC_C99 AC_PROG_INSTALL @@ -13,19 +15,19 @@ dnl ======================================================= dnl initialize variables -@@ -83,6 +80,19 @@ +@@ -83,6 +80,19 @@ mingw32* | windows*) esac AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1]) -+dnl ncurses ++dnl ncursesw + -+PKG_CHECK_MODULES([ncurses], [ncurses],[ -+ LIBS="$LIBS $ncurses_LIBS" ++PKG_CHECK_MODULES([ncursesw], [ncursesw],[ ++ LIBS="$LIBS $ncursesw_LIBS" + ax_cv_curses_color=yes + ax_cv_curses_mouse=yes + ax_cv_curses_enhanced=yes + AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is present]) -+ AC_SUBST([CURSES_LIB],[$ncurses_LIBS]) ++ AC_SUBST([CURSES_LIB],[$ncursesw_LIBS]) + ], + [AC_MSG_ERROR([No curses support detected.])]) + @@ -33,7 +35,7 @@ dnl multi-byte character support AC_ARG_ENABLE([multibyte], -@@ -207,12 +217,6 @@ +@@ -207,12 +217,6 @@ AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes) dnl Optional - curses getmouse support diff --git a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild index 1e6e9f90e66f..533e1df3a801 100644 --- a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild +++ b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild @@ -16,9 +16,8 @@ IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics RDEPEND=">=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.3 - sys-libs/ncurses - lirc? ( app-misc/lirc ) - nls? ( sys-libs/ncurses[unicode] )" + sys-libs/ncurses[unicode] + lirc? ( app-misc/lirc )" DEPEND="${RDEPEND} app-arch/xz-utils virtual/pkgconfig" @@ -26,7 +25,9 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample ) src_prepare() { - epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch + # default ax_with_curses.m4 produces automagic dependency on ncursesw + # also, ncursesw is required for colors (bug #554245), so we force it here + epatch "${FILESDIR}"/${PN}-0.24-tinfo2.patch cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die |