From: Markham <markham001@gmx.de>
Date: Tue, 21 Aug 2018 17:45:25 +0000 (+0200)
Subject: bump version mc-4.8.21
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=153a6423e82d285417cfdccaa96796bf68224133;p=bs-cst-neutrino-hd.git

bump version mc-4.8.21
---

diff --git a/archive-patches/mc-4.8.20.patch b/archive-patches/mc-4.8.20.patch
deleted file mode 100644
index 9c73fe6..0000000
--- a/archive-patches/mc-4.8.20.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/vfs/extfs/extfs.c
-+++ b/src/vfs/extfs/extfs.c
-@@ -1568,8 +1568,6 @@
-      * appear on screen. */
-     if (dir == NULL)
-     {
--        if (!silent)
--            fprintf (stderr, _("Warning: cannot open %s directory\n"), dirname);
-         g_free (dirname);
-         return FALSE;
-     }
---- a/src/vfs/sfs/sfs.c
-+++ b/src/vfs/sfs/sfs.c
-@@ -432,7 +432,6 @@
- 
-     if (cfg == NULL)
-     {
--        fprintf (stderr, _("%s: Warning: file %s not found\n"), "sfs_init()", mc_sfsini);
-         g_free (mc_sfsini);
-         return 0;
-     }
---- a/src/editor/syntax.c
-+++ b/src/editor/syntax.c
-@@ -1488,8 +1488,6 @@
-     if (r == -1)
-     {
-         edit_free_syntax_rules (edit);
--        message (D_ERROR, _("Load syntax file"),
--                 _("Cannot open file %s\n%s"), f, unix_error_string (errno));
-     }
-     else if (r != 0)
-     {
diff --git a/archive-patches/mc-4.8.21.patch b/archive-patches/mc-4.8.21.patch
new file mode 100644
index 0000000..9c73fe6
--- /dev/null
+++ b/archive-patches/mc-4.8.21.patch
@@ -0,0 +1,32 @@
+--- a/src/vfs/extfs/extfs.c
++++ b/src/vfs/extfs/extfs.c
+@@ -1568,8 +1568,6 @@
+      * appear on screen. */
+     if (dir == NULL)
+     {
+-        if (!silent)
+-            fprintf (stderr, _("Warning: cannot open %s directory\n"), dirname);
+         g_free (dirname);
+         return FALSE;
+     }
+--- a/src/vfs/sfs/sfs.c
++++ b/src/vfs/sfs/sfs.c
+@@ -432,7 +432,6 @@
+ 
+     if (cfg == NULL)
+     {
+-        fprintf (stderr, _("%s: Warning: file %s not found\n"), "sfs_init()", mc_sfsini);
+         g_free (mc_sfsini);
+         return 0;
+     }
+--- a/src/editor/syntax.c
++++ b/src/editor/syntax.c
+@@ -1488,8 +1488,6 @@
+     if (r == -1)
+     {
+         edit_free_syntax_rules (edit);
+-        message (D_ERROR, _("Load syntax file"),
+-                 _("Cannot open file %s\n%s"), f, unix_error_string (errno));
+     }
+     else if (r != 0)
+     {
diff --git a/make/versions.mk b/make/versions.mk
index 837ce35..e197581 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -143,7 +143,7 @@ LUASOCKET_VER = 2.0.2
 LUASOCKET_GIT = 5a17f79
 
 # Midnight Commander
-MC_VER = 4.8.20
+MC_VER = 4.8.21
 
 # mtd-utils for the host and target
 MTD_UTILS_VER = 1.5.2