Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/mc/files: mc-4.8.11-ncurses_build_fix.patch
Date: Tue, 03 Dec 2013 07:51:04
Message-Id: 20131203075101.75A532004B@flycatcher.gentoo.org
1 polynomial-c 13/12/03 07:51:01
2
3 Added: mc-4.8.11-ncurses_build_fix.patch
4 Log:
5 Fixed building with ncurses
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
8
9 Revision Changes Path
10 1.1 app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch?rev=1.1&content-type=text/plain
14
15 Index: mc-4.8.11-ncurses_build_fix.patch
16 ===================================================================
17 Index: lib/tty/key.c
18 ===================================================================
19 --- lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
20 +++ lib/tty/key.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
21 @@ -1947,4 +1947,5 @@
22 {
23 int c;
24 + static int flag = 0; /* Return value from select */
25 #ifdef HAVE_LIBGPM
26 static struct Gpm_Event ev; /* Mouse event */
27 @@ -1979,5 +1980,4 @@
28 {
29 int nfd;
30 - static int flag = 0; /* Return value from select */
31 fd_set select_set;
32
33 Index: lib/tty/tty-ncurses.c
34 ===================================================================
35 --- lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c)
36 +++ lib/tty/tty-ncurses.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
37 @@ -50,4 +50,5 @@
38 #include "tty.h"
39 #include "color-internal.h"
40 +#include "key.h"
41 #include "mouse.h"
42 #include "win.h"
43 @@ -531,4 +532,5 @@
44 {
45 int res;
46 + unsigned char str[UTF8_CHAR_LEN + 1];
47
48 res = g_unichar_to_utf8 (c, (char *) str);
49 @@ -541,5 +543,4 @@
50 else
51 {
52 - unsigned char str[UTF8_CHAR_LEN + 1];
53 const char *s;