summary refs log tree commit diff
path: root/gnu/packages/patches/mc-fix-ncurses-build.patch
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2014-03-25 15:51:32 -0500
committerEric Bavier <bavier@member.fsf.org>2014-03-26 10:50:01 -0500
commit5da64c7d5d9b3a1d57ada581b31e524d6088ee95 (patch)
tree02cd1d3fa0524991019517ec2a7b9e93b48c30c1 /gnu/packages/patches/mc-fix-ncurses-build.patch
parente9c14f37a8029e1a30593ed3c908486c16b8410e (diff)
downloadguix-5da64c7d5d9b3a1d57ada581b31e524d6088ee95.tar.gz
gnu: Add mc
* gnu/packages/mc.scm: New file
* gnu/packages/patches/mc-fix-ncurses-build.patch: New patch
* gnu-system.am (GNU_SYSTEM_MODULES): Add mc.scm.
(dist_patch_DATA): Add patch
Diffstat (limited to 'gnu/packages/patches/mc-fix-ncurses-build.patch')
-rw-r--r--gnu/packages/patches/mc-fix-ncurses-build.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/gnu/packages/patches/mc-fix-ncurses-build.patch b/gnu/packages/patches/mc-fix-ncurses-build.patch
new file mode 100644
index 0000000000..c583c92e10
--- /dev/null
+++ b/gnu/packages/patches/mc-fix-ncurses-build.patch
@@ -0,0 +1,37 @@
+Patch cherry-picked from resolution of
+http://www.midnight-commander.org/ticket/3114
+
+--- a/lib/tty/key.c	(revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
++++ b/lib/tty/key.c	(revision d870aedad1907773f8586fe818a89e6b5178b849)
+@@ -1947,4 +1947,5 @@
+ {
+     int c;
++    int flag = 0;               /* Return value from select */
+ #ifdef HAVE_LIBGPM
+     static struct Gpm_Event ev; /* Mouse event */
+@@ -1979,5 +1980,4 @@
+     {
+         int nfd;
+-        static int flag = 0;    /* Return value from select */
+         fd_set select_set;
+ 
+--- a/lib/tty/tty-ncurses.c	(revision bb65b467900ea9eb1f7867c059fd26fac86c747c)
++++ b/lib/tty/tty-ncurses.c	(revision d870aedad1907773f8586fe818a89e6b5178b849)
+@@ -50,4 +50,5 @@
+ #include "tty.h"
+ #include "color-internal.h"
++#include "key.h"
+ #include "mouse.h"
+ #include "win.h"
+@@ -531,4 +532,5 @@
+     {
+         int res;
++        unsigned char str[UTF8_CHAR_LEN + 1];
+ 
+         res = g_unichar_to_utf8 (c, (char *) str);
+@@ -541,5 +543,4 @@
+         else
+         {
+-            unsigned char str[UTF8_CHAR_LEN + 1];
+             const char *s;
+