jlec 15/06/28 17:55:50 Modified: pidgin-2.10.11-tinfo.patch Log: Make the patch for with ncurses[-tinfo] (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Revision Changes Path 1.2 net-im/pidgin/files/pidgin-2.10.11-tinfo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch?r1=1.1&r2=1.2 Index: pidgin-2.10.11-tinfo.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pidgin-2.10.11-tinfo.patch 28 Jun 2015 17:14:13 -0000 1.1 +++ pidgin-2.10.11-tinfo.patch 28 Jun 2015 17:55:50 -0000 1.2 @@ -1,25 +1,24 @@ - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac -index 51471b1..16982cf 100644 +index 51471b1..81c57ff 100644 --- a/configure.ac +++ b/configure.ac -@@ -638,6 +638,8 @@ if test "x$enable_consoleui" = "xyes"; then +@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR], + [compile finch against the ncurses includes in DIR])], + [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""]) + if test "x$enable_consoleui" = "xyes"; then ++ PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [ ++ PKG_CHECK_MODULES([GNT], [ncurses panel], [], [ AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no]) AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_consoleui=no], [$GNT_LIBS]) -+ AC_CHECK_LIB(tinfow, termname, [GNT_LIBS="$GNT_LIBS -ltinfow"], -+ [enable_consoleui=no], [$GNT_LIBS]) +@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then + fi + fi + fi ++ ])]) + fi - if test "x$enable_consoleui" = "xyes"; then - dnl # Some distros put the headers in ncursesw/, some don't -@@ -690,6 +692,8 @@ if test "x$enable_consoleui" = "xyes"; then - AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no]) - AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], - [enable_consoleui=no], [$GNT_LIBS]) -+ AC_CHECK_LIB(tinfo, termname, [GNT_LIBS="$GNT_LIBS -ltinfo"], -+ [enable_consoleui=no], [$GNT_LIBS]) - AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.]) - if test x"$ac_ncurses_includes" != "x"; then - GNT_CFLAGS="-I$ac_ncurses_includes" + if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
