From 13ed08c8c0301092e58caddd4c03643b0bfb6954 Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Sat, 5 Apr 2014 15:08:22 +0200 Subject: mc: update to 4.8.12 --- mc/.md5sum | 3 +-- mc/Pkgfile | 7 ++----- mc/mc-4.8.11-ncurses_build_fix.patch | 40 ------------------------------------ 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 mc/mc-4.8.11-ncurses_build_fix.patch (limited to 'mc') diff --git a/mc/.md5sum b/mc/.md5sum index 364559a00..2b33c852f 100644 --- a/mc/.md5sum +++ b/mc/.md5sum @@ -1,2 +1 @@ -92941707f85de8e5aab118adf003ffe2 mc-4.8.11-ncurses_build_fix.patch -1a2d74b75ddbff0b0d6cdc04bf4a7d31 mc-4.8.11.tar.xz +7ecccc03df060cd0ca1414a5a14e6649 mc-4.8.12.tar.xz diff --git a/mc/Pkgfile b/mc/Pkgfile index bccc12f6e..75055a3f9 100644 --- a/mc/Pkgfile +++ b/mc/Pkgfile @@ -4,16 +4,13 @@ # Depends on: ncurses glib name=mc -version=4.8.11 +version=4.8.12 release=1 -source=(http://ftp.osuosl.org/pub/midnightcommander/$name-$version.tar.xz - $name-$version-ncurses_build_fix.patch) +source=(http://ftp.osuosl.org/pub/midnightcommander/$name-$version.tar.xz) 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 deleted file mode 100644 index 1819d337d..000000000 --- a/mc/mc-4.8.11-ncurses_build_fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -# 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; - -- cgit v1.2.3