| 1 |
jlec 15/06/28 17:55:50 |
| 2 |
|
| 3 |
Modified: pidgin-2.10.11-tinfo.patch |
| 4 |
Log: |
| 5 |
Make the patch for with ncurses[-tinfo] |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-im/pidgin/files/pidgin-2.10.11-tinfo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch?rev=1.2&view=markup |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: pidgin-2.10.11-tinfo.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- pidgin-2.10.11-tinfo.patch 28 Jun 2015 17:14:13 -0000 1.1 |
| 23 |
+++ pidgin-2.10.11-tinfo.patch 28 Jun 2015 17:55:50 -0000 1.2 |
| 24 |
@@ -1,25 +1,24 @@ |
| 25 |
- configure.ac | 4 ++++ |
| 26 |
- 1 file changed, 4 insertions(+) |
| 27 |
+ configure.ac | 3 +++ |
| 28 |
+ 1 file changed, 3 insertions(+) |
| 29 |
|
| 30 |
diff --git a/configure.ac b/configure.ac |
| 31 |
-index 51471b1..16982cf 100644 |
| 32 |
+index 51471b1..81c57ff 100644 |
| 33 |
--- a/configure.ac |
| 34 |
+++ b/configure.ac |
| 35 |
-@@ -638,6 +638,8 @@ if test "x$enable_consoleui" = "xyes"; then |
| 36 |
+@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR], |
| 37 |
+ [compile finch against the ncurses includes in DIR])], |
| 38 |
+ [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""]) |
| 39 |
+ if test "x$enable_consoleui" = "xyes"; then |
| 40 |
++ PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [ |
| 41 |
++ PKG_CHECK_MODULES([GNT], [ncurses panel], [], [ |
| 42 |
AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no]) |
| 43 |
AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], |
| 44 |
[enable_consoleui=no], [$GNT_LIBS]) |
| 45 |
-+ AC_CHECK_LIB(tinfow, termname, [GNT_LIBS="$GNT_LIBS -ltinfow"], |
| 46 |
-+ [enable_consoleui=no], [$GNT_LIBS]) |
| 47 |
+@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then |
| 48 |
+ fi |
| 49 |
+ fi |
| 50 |
+ fi |
| 51 |
++ ])]) |
| 52 |
+ fi |
| 53 |
|
| 54 |
- if test "x$enable_consoleui" = "xyes"; then |
| 55 |
- dnl # Some distros put the headers in ncursesw/, some don't |
| 56 |
-@@ -690,6 +692,8 @@ if test "x$enable_consoleui" = "xyes"; then |
| 57 |
- AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no]) |
| 58 |
- AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], |
| 59 |
- [enable_consoleui=no], [$GNT_LIBS]) |
| 60 |
-+ AC_CHECK_LIB(tinfo, termname, [GNT_LIBS="$GNT_LIBS -ltinfo"], |
| 61 |
-+ [enable_consoleui=no], [$GNT_LIBS]) |
| 62 |
- AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.]) |
| 63 |
- if test x"$ac_ncurses_includes" != "x"; then |
| 64 |
- GNT_CFLAGS="-I$ac_ncurses_includes" |
| 65 |
+ if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then |
Archives