From: hschang <chang@dev3>
Date: Wed, 2 Jul 2014 05:01:02 +0000 (+0900)
Subject: [mc] update to 4.8.12
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=b35a866e1adb64dda7b16a6c61316d5834f1cef5

[mc] update to 4.8.12
---

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-extfs-dir.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-extfs-dir.patch
deleted file mode 100644
index aebb31e..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-extfs-dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [Configuration]
-
-Don't show "Warning: cannot open /usr/libexec/mc/extfs.d directory",
-because it's packaged separately.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
---- mc-4.8.1/src/vfs/extfs/extfs.c.orig	2012-05-10 15:50:04.633833530 +0200
-+++ mc-4.8.1/src/vfs/extfs/extfs.c	2012-05-10 15:50:20.349833289 +0200
-@@ -1558,8 +1558,6 @@
-      * appear on screen. */
-     if (dir == NULL)
-     {
--        if (!silent)
--            fprintf (stderr, _("Warning: cannot open %s directory\n"), dirname);
-         g_free (dirname);
-         return FALSE;
-     }
diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-hints.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-hints.patch
deleted file mode 100644
index a0ccdcd..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-hints.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-Fixes a text drawing issue if hints are unavailable.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
---- mc-4.8.1/src/filemanager/midnight.c.orig	2012-05-10 15:30:56.645804130 +0200
-+++ mc-4.8.1/src/filemanager/midnight.c	2012-05-10 15:31:27.601804920 +0200
-@@ -1587,7 +1587,7 @@
-     {
-         char text[BUF_SMALL];
- 
--        g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s\n"), VERSION);
-+        g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s"), VERSION);
-         set_hintbar (text);
-     }
- }
diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-sfs-ini.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-sfs-ini.patch
deleted file mode 100644
index fd5afd3..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-sfs-ini.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [Configuration]
-
-Don't show "sfs_init(): Warning: file /etc/mc/sfs.ini not found",
-because it's packaged separately.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
---- mc-4.8.1/src/vfs/sfs/sfs.c.orig	2012-05-10 15:48:05.405830465 +0200
-+++ mc-4.8.1/src/vfs/sfs/sfs.c	2012-05-10 15:48:24.389830919 +0200
-@@ -419,7 +419,6 @@
- 
-     if (cfg == NULL)
-     {
--        fprintf (stderr, _("%s: Warning: file %s not found\n"), "sfs_init()", mc_sfsini);
-         g_free (mc_sfsini);
-         return 0;
-     }
diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-syntax-file.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-syntax-file.patch
deleted file mode 100644
index ee0ee46..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-syntax-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [Configuration]
-
-Don't show an error message if the syntax file can't
-be opened, because it's packaged separately.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
---- mc-4.8.1/src/editor/syntax.c.orig	2011-12-12 10:15:38.000000000 +0100
-+++ mc-4.8.1/src/editor/syntax.c	2012-05-10 15:07:56.517768788 +0200
-@@ -1522,8 +1522,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/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-extfs-dir.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-extfs-dir.patch
new file mode 100644
index 0000000..aebb31e
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-extfs-dir.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Inappropriate [Configuration]
+
+Don't show "Warning: cannot open /usr/libexec/mc/extfs.d directory",
+because it's packaged separately.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
+--- mc-4.8.1/src/vfs/extfs/extfs.c.orig	2012-05-10 15:50:04.633833530 +0200
++++ mc-4.8.1/src/vfs/extfs/extfs.c	2012-05-10 15:50:20.349833289 +0200
+@@ -1558,8 +1558,6 @@
+      * appear on screen. */
+     if (dir == NULL)
+     {
+-        if (!silent)
+-            fprintf (stderr, _("Warning: cannot open %s directory\n"), dirname);
+         g_free (dirname);
+         return FALSE;
+     }
diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-hints.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-hints.patch
new file mode 100644
index 0000000..a0ccdcd
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-hints.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+Fixes a text drawing issue if hints are unavailable.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
+--- mc-4.8.1/src/filemanager/midnight.c.orig	2012-05-10 15:30:56.645804130 +0200
++++ mc-4.8.1/src/filemanager/midnight.c	2012-05-10 15:31:27.601804920 +0200
+@@ -1587,7 +1587,7 @@
+     {
+         char text[BUF_SMALL];
+ 
+-        g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s\n"), VERSION);
++        g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s"), VERSION);
+         set_hintbar (text);
+     }
+ }
diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-sfs-ini.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-sfs-ini.patch
new file mode 100644
index 0000000..fd5afd3
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-sfs-ini.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inappropriate [Configuration]
+
+Don't show "sfs_init(): Warning: file /etc/mc/sfs.ini not found",
+because it's packaged separately.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
+--- mc-4.8.1/src/vfs/sfs/sfs.c.orig	2012-05-10 15:48:05.405830465 +0200
++++ mc-4.8.1/src/vfs/sfs/sfs.c	2012-05-10 15:48:24.389830919 +0200
+@@ -419,7 +419,6 @@
+ 
+     if (cfg == NULL)
+     {
+-        fprintf (stderr, _("%s: Warning: file %s not found\n"), "sfs_init()", mc_sfsini);
+         g_free (mc_sfsini);
+         return 0;
+     }
diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-syntax-file.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-syntax-file.patch
new file mode 100644
index 0000000..ee0ee46
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-syntax-file.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Inappropriate [Configuration]
+
+Don't show an error message if the syntax file can't
+be opened, because it's packaged separately.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
+--- mc-4.8.1/src/editor/syntax.c.orig	2011-12-12 10:15:38.000000000 +0100
++++ mc-4.8.1/src/editor/syntax.c	2012-05-10 15:07:56.517768788 +0200
+@@ -1522,8 +1522,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/meta-openvuplus/recipes-extended/mc/mc_4.8.1.bbappend b/meta-openvuplus/recipes-extended/mc/mc_4.8.1.bbappend
deleted file mode 100644
index 73b41c6..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc_4.8.1.bbappend
+++ /dev/null
@@ -1,26 +0,0 @@
-PR .= "-vuplus0"
-
-SRC_URI += "file://optional-extfs-dir.patch \
-            file://optional-hints.patch \
-            file://optional-sfs-ini.patch \
-            file://optional-syntax-file.patch"
-
-PACKAGES += "${PN}-full"
-
-RDEPENDS_${PN} = ""
-RDEPENDS_${PN}-full = "ncurses-terminfo"
-
-RSUGGESTS_${PN} = "${PN}-full"
-
-FILES_${PN} = " \
-        ${bindir}/* \
-        ${sysconfdir}/mc/filehighlight.ini \
-        ${sysconfdir}/mc/*.ext \
-        ${sysconfdir}/mc/*.keymap \
-        ${sysconfdir}/mc/*.menu \
-        ${datadir}/${BPN}/mc.* \
-        ${datadir}/${BPN}/skins/default.ini \
-"
-FILES_${PN}-full = "${libexecdir}/* ${sysconfdir} ${datadir}/${BPN}"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
diff --git a/meta-openvuplus/recipes-extended/mc/mc_4.8.12.bbappend b/meta-openvuplus/recipes-extended/mc/mc_4.8.12.bbappend
new file mode 100644
index 0000000..73b41c6
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc_4.8.12.bbappend
@@ -0,0 +1,26 @@
+PR .= "-vuplus0"
+
+SRC_URI += "file://optional-extfs-dir.patch \
+            file://optional-hints.patch \
+            file://optional-sfs-ini.patch \
+            file://optional-syntax-file.patch"
+
+PACKAGES += "${PN}-full"
+
+RDEPENDS_${PN} = ""
+RDEPENDS_${PN}-full = "ncurses-terminfo"
+
+RSUGGESTS_${PN} = "${PN}-full"
+
+FILES_${PN} = " \
+        ${bindir}/* \
+        ${sysconfdir}/mc/filehighlight.ini \
+        ${sysconfdir}/mc/*.ext \
+        ${sysconfdir}/mc/*.keymap \
+        ${sysconfdir}/mc/*.menu \
+        ${datadir}/${BPN}/mc.* \
+        ${datadir}/${BPN}/skins/default.ini \
+"
+FILES_${PN}-full = "${libexecdir}/* ${sysconfdir} ${datadir}/${BPN}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"