diff options
| author | Juergen Daubert <jue@jue.li> | 2013-12-05 13:29:08 +0100 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2013-12-05 13:29:08 +0100 |
| commit | 12c80bd99e59e8c8b0dbc6d3469855639c0d6030 (patch) | |
| tree | 8047fe4306399264176125618a0d19f3ce9ebe26 /mc | |
| parent | 99a6f0cb01cc8c7541ab2dae3b0e3c1e9f91af53 (diff) | |
| download | opt-12c80bd99e59e8c8b0dbc6d3469855639c0d6030.tar.gz opt-12c80bd99e59e8c8b0dbc6d3469855639c0d6030.tar.xz | |
mc: update to 4.8.11
Diffstat (limited to 'mc')
| -rw-r--r-- | mc/.md5sum | 3 | ||||
| -rw-r--r-- | mc/Pkgfile | 7 | ||||
| -rw-r--r-- | mc/mc-4.8.11-ncurses_build_fix.patch | 40 |
3 files changed, 47 insertions, 3 deletions
diff --git a/mc/.md5sum b/mc/.md5sum index 01013b217..364559a00 100644 --- a/mc/.md5sum +++ b/mc/.md5sum @@ -1 +1,2 @@ -3d9c3777bb5c6e656792c1ef30f483b4 mc-4.8.10.tar.xz +92941707f85de8e5aab118adf003ffe2 mc-4.8.11-ncurses_build_fix.patch +1a2d74b75ddbff0b0d6cdc04bf4a7d31 mc-4.8.11.tar.xz diff --git a/mc/Pkgfile b/mc/Pkgfile index e04d0e1d9..bccc12f6e 100644 --- a/mc/Pkgfile +++ b/mc/Pkgfile @@ -4,13 +4,16 @@ # Depends on: ncurses glib name=mc -version=4.8.10 +version=4.8.11 release=1 -source=(http://ftp.osuosl.org/pub/midnightcommander/$name-$version.tar.xz) +source=(http://ftp.osuosl.org/pub/midnightcommander/$name-$version.tar.xz + $name-$version-ncurses_build_fix.patch) build () { cd $name-$version + patch -p0 -i $SRC/$name-$version-ncurses_build_fix.patch + ./configure --prefix=/usr \ --mandir=/usr/man \ --libexecdir=/usr/lib \ diff --git a/mc/mc-4.8.11-ncurses_build_fix.patch b/mc/mc-4.8.11-ncurses_build_fix.patch new file mode 100644 index 000000000..1819d337d --- /dev/null +++ b/mc/mc-4.8.11-ncurses_build_fix.patch @@ -0,0 +1,40 @@ +# http://www.midnight-commander.org/ticket/3114 + +Index: lib/tty/key.c +=================================================================== +--- lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f) ++++ 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; + +Index: lib/tty/tty-ncurses.c +=================================================================== +--- lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c) ++++ 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; + |