Fixed bug #427786 and bug #428568

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

4 files changed, 106 insertions, 3 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 0d439265012a..b9f1d96295bf 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.261 2012/07/21 15:59:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.262 2012/07/30 13:00:36 polynomial-c Exp $
+
+*mc-4.8.4-r2 (30 Jul 2012)
+
+  30 Jul 2012; Lars Wendler <polynomial-c@gentoo.org> -mc-4.8.4-r1.ebuild,
+  +mc-4.8.4-r2.ebuild,
+  +files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch,
+  +files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch:
+  non-maintainer commit: Fixed fileposition no longer remembered by mcedit (bug
+  #427786). Fixed segfault when viewing html files (bug #428568).
 
 *mc-4.8.4-r1 (21 Jul 2012)
 
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch
new file mode 100644
index 000000000000..a67352d2a6c1
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch
@@ -0,0 +1,56 @@
+https://www.midnight-commander.org/ticket/2853
+https://www.midnight-commander.org/changeset/972beef6ea2392ab30d755e3421b3dd0b4e2a3df
+
+Index: src/args.c
+===================================================================
+--- src/args.c	(revision 23c95d36ac4465627fbc9183e083a8320df77fcf)
++++ src/args.c	(revision 972beef6ea2392ab30d755e3421b3dd0b4e2a3df)
+@@ -546,5 +546,5 @@
+             else
+             {
+-                arg = mcedit_arg_vpath_new (tmp_vpath, 1);
++                arg = mcedit_arg_vpath_new (tmp_vpath, 0);
+                 vfs_path_free (fname_vpath);
+             }
+@@ -553,5 +553,5 @@
+         }
+         else
+-            arg = mcedit_arg_new (tmp, 1);
++            arg = mcedit_arg_new (tmp, 0);
+ 
+         flist = g_list_prepend (flist, arg);
+@@ -559,12 +559,9 @@
+ 
+     if (flist == NULL)
+-        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 1));
++        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 0));
+     else if (first_line_number != -1)
+     {
+         /* overwrite line number for first file */
+         GList *l;
+-
+-        if (first_line_number == 0)
+-            first_line_number = 1;
+ 
+         l = g_list_last (flist);
+@@ -820,5 +817,5 @@
+  *
+  * @param file_name   file name
+- * @param line_number line number
++ * @param line_number line number. If value is 0, try to restore saved position.
+  * @return mcedit_arg_t object
+  */
+@@ -835,5 +832,5 @@
+  *
+  * @param file_vpath  file path object
+- * @param line_number line number
++ * @param line_number line number. If value is 0, try to restore saved position.
+  * @return mcedit_arg_t object
+  */
+@@ -846,6 +843,4 @@
+     arg = g_new (mcedit_arg_t, 1);
+     arg->file_vpath = file_vpath;
+-    if (line_number == 0)
+-        line_number = 1;
+     arg->line_number = line_number;
+ 
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch
new file mode 100644
index 000000000000..748f39c6b13f
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch
@@ -0,0 +1,36 @@
+https://www.midnight-commander.org/ticket/2858
+https://www.midnight-commander.org/changeset/e2f30017a04b5dc557f9d8dd2e281526eba3c97f
+
+Index: src/filemanager/usermenu.c
+===================================================================
+--- src/filemanager/usermenu.c	(revision 409e8ab5fd4c42fd122d42d3d13a455eb6aba96f)
++++ src/filemanager/usermenu.c	(revision e2f30017a04b5dc557f9d8dd2e281526eba3c97f)
+@@ -749,6 +749,7 @@
+         return g_strdup ("%");
+ 
+-    if (mc_global.mc_run_mode == MC_RUN_FULL)
+-    {
++    switch (mc_global.mc_run_mode)
++    {
++    case MC_RUN_FULL:
+         if (g_ascii_islower ((gchar) c))
+             panel = current_panel;
+@@ -760,9 +761,16 @@
+         }
+         fname = g_strdup (panel->dir.list[panel->selected].fname);
+-    }
++        break;
++
+ #ifdef USE_INTERNAL_EDIT
+-    else if (mc_global.mc_run_mode == MC_RUN_EDITOR)
++    case MC_RUN_EDITOR:
+         fname = edit_get_file_name (edit_widget);
++        break;
+ #endif
++
++    default:
++        /* other modes don't use formats */
++        return g_strdup ("");
++    }
+ 
+     if (do_quote)
diff --git a/app-misc/mc/mc-4.8.4-r1.ebuild b/app-misc/mc/mc-4.8.4-r2.ebuild
index eceb319faa57..85dab4d3beda 100644
--- a/app-misc/mc/mc-4.8.4-r1.ebuild
+++ b/app-misc/mc/mc-4.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.4-r1.ebuild,v 1.1 2012/07/21 15:59:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.4-r2.ebuild,v 1.1 2012/07/30 13:00:36 polynomial-c Exp $
 
 EAPI=4
 
@@ -51,7 +51,9 @@ done
 src_prepare() {
 	strip-linguas ${LANGS}
 
-	epatch "${FILESDIR}"/${P}-Ticket-2851-fixes-of-ext.d-scripts.patch
+	epatch "${FILESDIR}"/${P}-Ticket-2851-fixes-of-ext.d-scripts.patch \
+		"${FILESDIR}"/${P}-Ticket-2853-fileposition-in-mcedit.patch \
+		"${FILESDIR}"/${P}-Ticket-2858-htmlview-segfault.patch
 }
 
 S=${WORKDIR}/${MY_P}