Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

mc:

 * bump version to [https://www.midnight-commander.org/wiki/NEWS-4.8.11 4.8.11]


git-svn-id: file:///var/svn/freetz/trunk@11379 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
commit b67a82beab0be0365ec8bae76e193f7282d8a646 1 parent d7d70d6
er13 authored
View
2  CHANGELOG
@@ -74,7 +74,7 @@ Latest changes:
* libusb1 1.0.17
* libxml 2.9.1
* lighttpd 1.4.33
- * mc 4.8.10
+ * mc 4.8.11
* minidlna 1.1.1
* mpfr 3.1.2-p3
* nano 2.3.1
View
2  make/mc/Config.in
@@ -1,5 +1,5 @@
config FREETZ_PACKAGE_MC
- bool "Midnight Commander (mc) 4.8.10 (binary only)"
+ bool "Midnight Commander (mc) 4.8.11 (binary only)"
select FREETZ_SHARE_terminfo
select FREETZ_LIB_libiconv if FREETZ_TARGET_UCLIBC_0_9_28
select FREETZ_LIB_libglib_2
View
4 make/mc/mc.mk
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 4.8.10)
+$(call PKG_INIT_BIN, 4.8.11)
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz
-$(PKG)_SOURCE_MD5:=3d9c3777bb5c6e656792c1ef30f483b4
+$(PKG)_SOURCE_MD5:=1a2d74b75ddbff0b0d6cdc04bf4a7d31
$(PKG)_SITE:=ftp://ftp.midnight-commander.org/pub/midnightcommander
$(PKG)_BINARY:=$($(PKG)_DIR)/src/mc
View
42 make/mc/patches/000-changeset_d870aedad1907773f8586fe818a89e6b5178b849.upstream.patch
@@ -0,0 +1,42 @@
+
+https://www.midnight-commander.org/ticket/3114
+https://www.midnight-commander.org/changeset/d870aedad1907773f8586fe818a89e6b5178b849
+
+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;
+
View
2  make/mc/patches/010-rpath.patch
@@ -1,6 +1,6 @@
--- configure
+++ configure
-@@ -22165,8 +22165,8 @@
+@@ -22265,8 +22265,8 @@
shlibext="$acl_cv_shlibext"
hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
View
2  make/mc/patches/020-nomacro_examples.patch
@@ -10,7 +10,7 @@
--- misc/Makefile.in
+++ misc/Makefile.in
-@@ -417,7 +417,7 @@
+@@ -466,7 +466,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
View
12 make/mc/patches/020-noman_nolang.patch
@@ -11,7 +11,7 @@
endif
--- doc/hlp/Makefile.in
+++ doc/hlp/Makefile.in
-@@ -410,7 +410,8 @@
+@@ -459,7 +459,8 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -34,7 +34,7 @@
endif
--- doc/man/Makefile.in
+++ doc/man/Makefile.in
-@@ -412,7 +412,8 @@
+@@ -460,7 +460,8 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -44,7 +44,7 @@
@USE_NLS_TRUE@SUBDIRS = $(DOC_LINGUAS)
man_MANS = mc.1 mcedit.1 mcview.1
CLEANFILES = $(man_MANS)
-@@ -722,7 +723,8 @@
+@@ -730,7 +731,8 @@
for dir in "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
@@ -68,7 +68,7 @@
edit.indent.rc
--- misc/Makefile.in
+++ misc/Makefile.in
-@@ -427,8 +427,7 @@
+@@ -476,8 +476,7 @@
mc.keymap \
mc.default.keymap \
mc.emacs.keymap \
@@ -91,7 +91,7 @@
EXTFS_CONST = bpp changesetfs gitfs+ patchsetfs rpm trpm u7z
--- src/vfs/extfs/helpers/Makefile.in
+++ src/vfs/extfs/helpers/Makefile.in
-@@ -389,7 +389,7 @@
+@@ -418,7 +418,7 @@
EXTFSCONFFILES = sfs.ini
# Files to install and distribute other than extfs scripts
@@ -113,7 +113,7 @@
fish_SCRIPTS = ls mkdir fexists unlink chown chmod rmdir ln mv hardlink get send append info utime
--- src/vfs/fish/helpers/Makefile.in
+++ src/vfs/fish/helpers/Makefile.in
-@@ -376,7 +376,7 @@
+@@ -405,7 +405,7 @@
fishdir = $(libexecdir)/@PACKAGE@/fish
# Files to install and distribute other than fish scripts
View
6 make/mc/patches/030-bash_inputrc.patch
@@ -1,6 +1,6 @@
--- src/subshell.c
+++ src/subshell.c
-@@ -266,11 +266,14 @@
+@@ -268,11 +268,14 @@
putenv (g_strdup (sid_str));
}
@@ -15,7 +15,7 @@
if (access (init_file, R_OK) == -1)
{
g_free (init_file);
-@@ -285,9 +288,9 @@
+@@ -287,9 +290,9 @@
char *input_file = mc_config_get_full_path ("inputrc");
if (access (input_file, R_OK) == 0)
{
@@ -27,7 +27,7 @@
}
g_free (input_file);
}
-@@ -350,6 +353,7 @@
+@@ -352,6 +355,7 @@
/* If we get this far, everything failed miserably */
g_free (init_file);
View
18 make/mc/patches/040-ash_as_subshell.patch
@@ -1,6 +1,6 @@
--- lib/global.h
+++ lib/global.h
-@@ -246,6 +246,7 @@ typedef struct
+@@ -248,6 +248,7 @@ typedef struct
/* The user's shell */
char *shell;
@@ -86,7 +86,7 @@
TCSH,
ZSH,
FISH
-@@ -280,8 +282,9 @@ init_subshell_child (const char *pty_nam
+@@ -282,8 +284,9 @@ init_subshell_child (const char *pty_nam
init_file = g_strdup (".bashrc");
}
@@ -98,7 +98,7 @@
/* Allow alternative readline settings for MC */
{
-@@ -297,7 +300,26 @@ init_subshell_child (const char *pty_nam
+@@ -299,7 +302,26 @@ init_subshell_child (const char *pty_nam
break;
@@ -126,7 +126,7 @@
case TCSH:
case ZSH:
case FISH:
-@@ -335,19 +357,17 @@ init_subshell_child (const char *pty_nam
+@@ -337,19 +359,17 @@ init_subshell_child (const char *pty_nam
execl (mc_global.tty.shell, "bash", "-rcfile", init_file, (char *) NULL);
break;
@@ -150,7 +150,7 @@
break;
}
-@@ -773,7 +793,8 @@ init_subshell (void)
+@@ -776,7 +796,8 @@ init_subshell (void)
{
/* This must be remembered across calls to init_subshell() */
static char pty_name[BUF_SMALL];
@@ -160,7 +160,7 @@
switch (check_sid ())
{
-@@ -789,21 +810,36 @@ init_subshell (void)
+@@ -792,21 +813,36 @@ init_subshell (void)
/* Take the current (hopefully pristine) tty mode and make */
/* a raw mode based on it now, before we do anything else with it */
init_raw_mode ();
@@ -205,7 +205,7 @@
else
{
mc_global.tty.use_subshell = FALSE;
-@@ -854,7 +890,7 @@ init_subshell (void)
+@@ -857,7 +893,7 @@ init_subshell (void)
return;
}
}
@@ -214,7 +214,7 @@
{
perror (__FILE__ ": couldn't create pipe");
mc_global.tty.use_subshell = FALSE;
-@@ -882,29 +918,113 @@ init_subshell (void)
+@@ -885,29 +921,113 @@ init_subshell (void)
init_subshell_child (pty_name);
}
@@ -335,7 +335,7 @@
break;
}
-@@ -1110,6 +1230,13 @@ subshell_name_quote (const char *s)
+@@ -1114,6 +1234,13 @@ subshell_name_quote (const char *s)
quote_cmd_start = "(printf \"%b\" '";
quote_cmd_end = "')";
}
View
4 make/mc/patches/050-ash_as_subshell_additional.patch
@@ -23,7 +23,7 @@
{ /* 0. */
--- doc/man/mc.1.in
+++ doc/man/mc.1.in
-@@ -2442,7 +2442,7 @@
+@@ -2443,7 +2443,7 @@
.\"NODE " The subshell support"
.SH " The subshell support"
The subshell support is a compile time option, that works with the
@@ -32,7 +32,7 @@
.PP
When the subshell code is activated the Midnight Commander will
spawn a concurrent copy of your shell (the one defined in the
-@@ -2454,28 +2454,34 @@
+@@ -2455,28 +2455,34 @@
environment variables, use shell functions and define aliases that are
valid until you quit the Midnight Commander.
.PP
Please sign in to comment.
Something went wrong with that request. Please try again.