Fixed bug #427786 and bug #428568

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 123 insertions, 8 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/Manifest b/app-misc/mc/Manifest
index 920ddf634184..8b7cf3dc7f7a 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -9,19 +9,31 @@ AUX mc-4.8.3-fix-chown-crash.patch 649 SHA256 c0d73faaea8742d8c7f38d499a98ecce40
 AUX mc-4.8.3-fix-relative-symlink-creation-crash.patch 978 SHA256 76a25722091b5468066ebcb48b8b6146bc002ebd8ad3e29fffe6c4cfdf1c2e48 SHA512 ef8ab0bf84782a20c121ab938f2cb1463974f6357fa11505f3a354eeaa1cf71946c0b406e3e28f91d1df3167a20486ab20c4bcc75bdde7ba076b925195814ef1 WHIRLPOOL be83840fa0be10ccd9cc766506535e312dde5951a6468e29c22aaeb105063967cf46531913040acec9ebed9c2b14edf3f04d05d383ff57adfc12529518b988f8
 AUX mc-4.8.3-missing-do_panel_cd_stub_env.c 5456 SHA256 1ea801331225e268f9c458aa14fc654413c55e3f9b4d0f8e163ad8c40f5d10c3 SHA512 7b252f4280b20d6233feef2fa91b3b266d9a7e4ef15a68bd85b2fc808d42a040fcd9b591a92f07254a51bc451f8eb55d203ee414d2d4c11e1db589de0ffe37ec WHIRLPOOL e173a80f2cc277bc84b13370ead973dd8f57cbc6c61ee9efa8ba7e5340fec855ea1f575878373987f607c32bdc038be91c62ee6175bed488a990bc540a3f4b0c
 AUX mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch 2409 SHA256 3a1b4e333f8cdaf4264a70638396aabb64a05c220e192ec84e388c8054773aad SHA512 a1a106fc65e82cf2d4bbfb1b8da47533de39d05230a5808f0956e540ba222805f0308b77018df8f750efae63bd6f6e9d9da8d7d575bb4ae14db3e67c67745ae9 WHIRLPOOL ca1630173b22f41beec92497bed1b01b5c80808769fac835f8233107f84deff2f387df4b4e0ca584cda902c674a3df21c545ee083605194bcd41f961bb5c7061
+AUX mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch 1790 SHA256 5df43bdc2d1063204ce52a80998b05bc82037d157a9b3ecc90f48e00c8d0b433 SHA512 59ff7c5969c4a4db6268944ec8bd34f96e17cbe9d140ccd52abbf4a54ac5b276e71a529a7624492d8709dd48805fe453646c5515fb31d0dd791ccd4fd8195092 WHIRLPOOL e7f694a2b260fdc8f05cd55fde2e363ad610467a3fc1020a30a455d230781ea32e0dd9e8466b9164408fcc5ba336f161df0e8ebe0025af6029a15b0ed68194eb
+AUX mc-4.8.4-Ticket-2858-htmlview-segfault.patch 1079 SHA256 ba7cce62af883504b82fc0489ea290b5a325d89d97a5c15d66f587ddefaf8ace SHA512 9f0bfb62d1783a2e3379245d43dfd22f82928fb188c79a0fbf1bd19c0a553b13b120b6c925db1cf70d3050148877a2ddd1d4540446b15a0b7e7c2134d752ab1d WHIRLPOOL c75dec958f43d7c6c5ebd9f08258bf7698f2afdd9af18e95b54aad8576dd1cfdfb8b803d6363ffe1345d3dd8d49f6533c0908fff4b6ec9602ac780ed80347c2e
 DIST mc-4.8.1.tar.xz 2057960 SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7d62c681283c1b0a8b672 SHA512 39158429c78e959700411e4b3c714552cad4e8badedcf9c391e4807f27f35753dcf911427b4319ea22be03c7cf7b1a3ff494e6c1b8f90389e5d518f1bb9cfa1c WHIRLPOOL e34e6dad86fbc4a4d2f727094ddfbbc7a346161b04944f6ec65bc2c27770ece5c3c8f9d46aef021a007dc3b8b4eceb2b34b9c6d6e266a9c431969043d838f7d3
 DIST mc-4.8.3.tar.xz 2042276 SHA256 bd2855116f6dc9acf5b45d2794beeba3ddfb2e71cd9ac3b692dd6629019e42a3 SHA512 db52c53b7325974fb8f5b6077ea6e802b05f2993492d486607745d0dde1dc77a305865c86c0afcd3b39b9f0abbc8ad50a45e279a4072a1481b7969aaf2032843 WHIRLPOOL 9263d9dfd35b12ea379c8ea0f0e966ccc2ad86bf292324615735db92a324487dea2c27666a8be350971991cbdbccf402549b6a904bdd2f35a208d90a1d387556
 DIST mc-4.8.4.tar.xz 2114996 SHA256 b4be11c27857ec0c0896a7cd42dd1782a03d1e4c82c83f86b5cc880f6970863e SHA512 b0827f5a88dd65a12a15dc207ab2e97d5ed40c38921ad17c22a8316a62122238bb69077100744cc2fea20b6a202812bc8e38183546fe3ef63924017269a024c7 WHIRLPOOL 65aaf0a95911eade82a00513e71ca00d13c914412f9de33269e4b216df4e64025e42a20808cc265ef5fac3388a0ec832f3a3c64aadba82f1a725b9a92d070eb0
 EBUILD mc-4.8.1-r1.ebuild 2405 SHA256 a0b04c7ad1d21ecdbe77b9eb4040803e13c3e0f6d7e0662063b001ca26cb69c9 SHA512 8b8a70f7b93bd171433cdc9422fe965173fe3cfad58a73626531e16b50460a91bd52c652736e808302c18343cf16423fc1b60e51e3217ed462823f545a84db79 WHIRLPOOL 215b143b9957684ad1f65abaf9318df911f5572d2a80eb66a0acd5a0d4ff30f0c0d16f8b5db2b9bbad252acb75a9e4cfcb8bb035a87c88afcb0c36f1f174edc8
 EBUILD mc-4.8.3-r2.ebuild 2352 SHA256 9b5efa00bd2b1ddd58c4536ddf8d0052ac262a7785f3a4db5c3170ee43519997 SHA512 09287c79c1aa74fe7988183b493664454e8ae557c94d9dff940555aacc6281f2116ff98e4573db278e9820b1bc970049e3dad8917d6785908e98599b2ae1d5a8 WHIRLPOOL 1ca0ea41a718014893a354fa017a2176b9fe8708a2983a5f2f360725d8012999919b5cd8aaed083564699d9db009dba4028bbfb3208f42d629f7a52d97ec4adf
-EBUILD mc-4.8.4-r1.ebuild 2616 SHA256 792249bd642d06ec35cd6900e9488d7a72a3b3cece06cec5ee329dbcaf3a4298 SHA512 08f9459fd70e00660bc012159cf36eacd3f478cc9326fa9d8447f831ebffc99d244fc3e43f167786fd0d9df0fdb748fe403dc741a656abc683bb9a804f9ad199 WHIRLPOOL 22f15de5e0728b735a9e4b952e26f40582c511100db29c67770e43b7da50e509189bc10e88dd2f2e5e12383f67913182b2eec840b1068b2d272d8e587c2c9976
+EBUILD mc-4.8.4-r2.ebuild 2745 SHA256 5f92048dd422b61251fd647f384b823870435fe187c22da88c74b35abd407774 SHA512 25756a21c5fb5966065cfeea3eed24f1d9cc1d6da51051cb7c9613e118b325d7652a4440ace73815f64fe7504b7850fece233785c67edaed5e2dc66b8310e57f WHIRLPOOL 0a06f6b67b7d9363308216387916b0b9102ad44ea9f02fcc8360afeca9aff764cf28bafa9f70b1970cae093d911ef08fe27810d904335ab2fb74912611b65a9d
 EBUILD mc-9999.ebuild 2979 SHA256 174ee6aa6cc3a5b05038e1fd1e663b8f103b2b5f57af80f08396fc6bd141a75c SHA512 8f0e50804e7711a69a9a30c5864432095495b362c84f54bb83e91217ca6c9fbea0dd3d002b43665de6e85aa4bf1b60e77f31b4abb0fc25abe71dc38a3eea2cb8 WHIRLPOOL 81c9a6fe141c2ac32e18a3d3292793d0e93949d3d8e8106c9b98bb3d8bb444affbc0f9fec38ada7e90c08b32fc43babfb2e3a0ec2ea46353568120ffe9845935
-MISC ChangeLog 38785 SHA256 d6d16cb66a3291e9a03de3f13e2a77a428161259d7f95f80e687839c1e11a097 SHA512 f578092629b5c43a0cc710504085cb440693cabcbb3b9ff74946b21210f1036d2b0fe555a9b51c7b03782543d44f77edef000aedef8947e3cf812287b0de91f2 WHIRLPOOL 84c6a6319626dcab1c5d3414a8b9649da838f37fcf3824074588a22810bef4c9f1a53351598cf76d17c915473c848ece1afd319e1c41c5923ab0658b7bad4f1d
+MISC ChangeLog 39179 SHA256 f54acc7c62ca0761c8793d4587a61fab01f5723818ac8660d7f1b82a733fb41b SHA512 b3d2b1b7f6a5c5adcf921f3c74e9618dd5f06551f1cbf3534d6648dd2a78976df8003f1d9f9bfffcb6bfdd3881098b0c1ffa67960c361510d8c427fe6687d4f5 WHIRLPOOL e33de1752cfddc91e8fec57b997459120491941a1f6cfd742bd29a6252e54d86f35b0e0fb1da4f66186954dfe7916bb3856ea9afe15f2c221836567547d6b758
 MISC metadata.xml 846 SHA256 2ce5d9e8575133f3b3ef99fabbb133b0eeccf26ff346970dd034b16dd7b05fe9 SHA512 522568197614833eea1a6322b8b96f5f70f3c27d0aed734b7271d46f27852a97d6e20fa1bc3fa028c2fccb97d4b87d177f87dea1ac3d5f7d5d5330c84a39e68c WHIRLPOOL c6cee8edfb33b4160c143769f9581b90198eab76a5d324eb65795b4513609f49cd50661f4680a705be8458ef883eab5e8d491e7008c352a6359378eeff30850d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAK01IACgkQcaHudmEf86rVEQCfcoTSnPWgCkyI6MOSs/2R84aH
-0y0An1hS7RapvRb+RXsED4TehPucOeQq
-=FcqI
+iQIcBAEBCAAGBQJQFoV5AAoJEPiazRVxLXTF0cEP+QFY67NKl/1632dqpFMZ1nlD
+fzKCwL3fcIfUmzABiV23ZlXUuXwFugthKY79aeMSODv2wCauICAZ4Tre/otXDWBz
+CiOTHzVloQhP5Bp7+0VV0VrdLZKstJb+WMTkxVBBIrNf2oady/AhNnnDQh8gWBhP
+tCaDqm5JerbrvZstQ8Td6IDQqindZrcMuUzt1hHffLRVWpUrfQOCKMk3zgaYP+f8
+MggR6JWLN18djxgf4yAs5FffKPJ+s07hXEIUZc+hZyljJfLNntLmpMkSTxMSlsva
+nKCnLG+m/FRhx44i5710RZmJldiMpohg/Geav66+lX1DkWiQeza3pWVIZxBBZLO3
+bjy7x8VU9WOTDRbE6lh/XzeMoSOApIW2Du5B5lUfCMuqTqHaGd+QaMB25a3ZG0c+
+Lq/Jl/vQieXzRwht0xSATKBmPzAazTAIIMUPX9IhRVHHsh2sfJsZlM0BiSP1g/xe
+eaD/AECY7onv8RkZCw+Zbn0CLbxOHVsyUfSo3T6BIjVqfDewFBw50ApJy9TKJUFd
+TcxLmI088xfjb/sSVci6uYsdFZZzpz3l2J9g+Y6xb8Ad1H4H6B8jNy2FUvLwjW6X
+UbcxjiPZwHXtz5ZNjBno5qZ9rjnf0uOMV/WKRCB/yOEPRD2SCjct5f22eT/9Uqsq
+J45KJqU5y8bWjCKap+Dj
+=WcoR
 -----END PGP SIGNATURE-----
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}