diff options
| -rw-r--r-- | package/mc/Makefile | 14 | ||||
| -rw-r--r-- | package/mc/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/mc/patches/patch-lib_tty_key_c | 18 | ||||
| -rw-r--r-- | package/mc/patches/patch-lib_tty_tty-ncurses_c | 27 |
4 files changed, 53 insertions, 17 deletions
diff --git a/package/mc/Makefile b/package/mc/Makefile index 267553653..a4931f94b 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -4,17 +4,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mc -PKG_VERSION:= 4.7.0.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= f48b2c8dd140aeb36f59d16a662f0779 +PKG_VERSION:= 4.8.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1a2d74b75ddbff0b0d6cdc04bf4a7d31 PKG_DESCR:= norton commander clone PKG_SECTION:= misc PKG_DEPENDS:= glib libncurses PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.midnight-commander.org/ -PKG_SITES:= http://openadk.org/distfiles/ +PKG_SITES:= http://ftp.midnight-commander.org/ PKG_NOPARALLEL:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -45,7 +47,7 @@ mc-install: ${INSTALL_DIR} ${IDIR_MC}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/ cd ${IDIR_MC}/usr/bin && ln -fs mc mcedit && ln -fs mc mcview - cd ${WRKINST}/etc/mc && ${CP} cedit.menu mc.ext \ - mc.lib mc.menu extfs ${IDIR_MC}/etc/mc/ + cd ${WRKINST}/etc/mc && ${CP} mcedit.menu mc.ext \ + mc.menu ${IDIR_MC}/etc/mc/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mc/patches/patch-Makefile_in b/package/mc/patches/patch-Makefile_in deleted file mode 100644 index db881370a..000000000 --- a/package/mc/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- mc-4.7.0.2.orig/Makefile.in 2010-02-02 16:24:55.000000000 +0100 -+++ mc-4.7.0.2/Makefile.in 2010-02-06 00:46:00.203084693 +0100 -@@ -308,7 +308,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.5 --SUBDIRS = intl po lib src doc contrib misc -+SUBDIRS = intl po lib src contrib misc - EXTRA_DIST = - dist_noinst_SCRIPTS = build-glib2.sh - dist_noinst_HEADERS = $(top_srcdir)/version.h diff --git a/package/mc/patches/patch-lib_tty_key_c b/package/mc/patches/patch-lib_tty_key_c new file mode 100644 index 000000000..342eb8657 --- /dev/null +++ b/package/mc/patches/patch-lib_tty_key_c @@ -0,0 +1,18 @@ +--- mc-4.8.11.orig/lib/tty/key.c 2013-11-29 19:27:07.000000000 +0100 ++++ mc-4.8.11/lib/tty/key.c 2014-02-11 20:02:34.000000000 +0100 +@@ -1946,6 +1946,7 @@ int + tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block) + { + int c; ++ static int flag = 0; /* Return value from select */ + #ifdef HAVE_LIBGPM + static struct Gpm_Event ev; /* Mouse event */ + #endif +@@ -1978,7 +1979,6 @@ tty_get_event (struct Gpm_Event *event, + while (pending_keys == NULL) + { + int nfd; +- static int flag = 0; /* Return value from select */ + fd_set select_set; + + FD_ZERO (&select_set); diff --git a/package/mc/patches/patch-lib_tty_tty-ncurses_c b/package/mc/patches/patch-lib_tty_tty-ncurses_c new file mode 100644 index 000000000..5058bd79e --- /dev/null +++ b/package/mc/patches/patch-lib_tty_tty-ncurses_c @@ -0,0 +1,27 @@ +--- mc-4.8.11.orig/lib/tty/tty-ncurses.c 2013-11-29 19:27:07.000000000 +0100 ++++ mc-4.8.11/lib/tty/tty-ncurses.c 2014-02-12 12:40:05.000000000 +0100 +@@ -65,7 +65,7 @@ + + /*** file scope macro definitions ****************************************************************/ + +-#if defined(_AIX) && !defined(CTRL) ++#if !defined(CTRL) + #define CTRL(x) ((x) & 0x1f) + #endif + +@@ -530,6 +530,7 @@ tty_print_anychar (int c) + if (mc_global.utf8_display || c > 255) + { + int res; ++ unsigned char str[UTF8_CHAR_LEN + 1]; + + res = g_unichar_to_utf8 (c, (char *) str); + if (res == 0) +@@ -540,7 +541,6 @@ tty_print_anychar (int c) + } + else + { +- unsigned char str[UTF8_CHAR_LEN + 1]; + const char *s; + + str[res] = '\0'; |