added patches: chown dialog segfault fix (mc ticket 2264), mcedit quit dialog -> change default to cancel (mc ticket 2265). fixes bug #327573

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 111 insertions, 1 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index f7f52c7d5b1b..c6b0433f73b4 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.201 2010/07/05 21:21:27 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.202 2010/07/09 08:16:06 wired Exp $
+
+*mc-4.7.3-r1 (09 Jul 2010)
+
+  09 Jul 2010; Alex Alexander <wired@gentoo.org> +mc-4.7.3-r1.ebuild,
+  +files/mc-4.7.3_advanced_chown_segfault_fix.patch,
+  +files/mc-4.7.3_mcedit_quit_dialog_default.patch:
+  added patches: chown dialog segfault fix (mc ticket 2264), mcedit quit
+  dialog -> change default to cancel (mc ticket 2265). fixes bug #327573
 
 *mc-4.7.3 (05 Jul 2010)
 *mc-4.7.0.7 (05 Jul 2010)
diff --git a/app-misc/mc/files/mc-4.7.3_advanced_chown_segfault_fix.patch b/app-misc/mc/files/mc-4.7.3_advanced_chown_segfault_fix.patch
new file mode 100644
index 000000000000..7def57036b53
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.3_advanced_chown_segfault_fix.patch
@@ -0,0 +1,11 @@
+Index: src/achown.c
+===================================================================
+--- src/achown.c (revision 74651f2e9f112eacc07ed9d1281e27ce6a4be9d4)
++++ src/achown.c (revision ce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5)
+@@ -499,5 +499,5 @@
+ 		break;
+ 	    flag_pos = f_pos * 3 + i;	/* (strchr(ch_perm,parm)-ch_perm); */
+-	    if (((WButton *) h->current)->text.start[(flag_pos % 3)] ==
++	    if (((WButton *) h->current->data)->text.start[(flag_pos % 3)] ==
+ 		'-')
+ 		ch_flags[flag_pos] = '+';
diff --git a/app-misc/mc/files/mc-4.7.3_mcedit_quit_dialog_default.patch b/app-misc/mc/files/mc-4.7.3_mcedit_quit_dialog_default.patch
new file mode 100644
index 000000000000..364db95a866f
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.3_mcedit_quit_dialog_default.patch
@@ -0,0 +1,20 @@
+Index: src/editor/editcmd.c
+===================================================================
+--- src/editor/editcmd.c (revision 59a85303a8db608f80bc8f0a828d6d22d43937b4)
++++ src/editor/editcmd.c (revision f660c97698a90234bba8e1e9b61999993ac2db69)
+@@ -2068,4 +2068,5 @@
+             return FALSE;
+ 
++        query_set_sel (2);
+         act = edit_query_dialog3 (_("Quit"), _("File was modified. Save with exit?"),
+                                   _("&Yes"), _("&No"), _("&Cancel quit"));
+Index: src/viewer/lib.c
+===================================================================
+--- src/viewer/lib.c (revision 48fe4e6881473ecb2f7188684a92450dc842b7b7)
++++ src/viewer/lib.c (revision f660c97698a90234bba8e1e9b61999993ac2db69)
+@@ -150,4 +150,5 @@
+     if (!midnight_shutdown)
+     {
++        query_set_sel (2);
+         r = query_dialog (_("Quit"),
+                           _("File was modified. Save with exit?"), D_NORMAL, 3,
diff --git a/app-misc/mc/mc-4.7.3-r1.ebuild b/app-misc/mc/mc-4.7.3-r1.ebuild
new file mode 100644
index 000000000000..0abbafd6acf7
--- /dev/null
+++ b/app-misc/mc/mc-4.7.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.3-r1.ebuild,v 1.1 2010/07/09 08:16:06 wired Exp $
+
+EAPI=3
+
+inherit base
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm nls samba slang X"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+# bug #327573
+PATCHES=(
+	"${FILESDIR}/${P}_advanced_chown_segfault_fix.patch"
+	"${FILESDIR}/${P}_mcedit_quit_dialog_default.patch"
+)
+
+src_configure() {
+	local myscreen=ncurses
+	use slang && myscreen=slang
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-vfs \
+		$(use_enable kernel_linux vfs-undelfs) \
+		--enable-charset \
+		$(use_with X x) \
+		$(use_with samba) \
+		--with-configdir="${EPREFIX}"/etc/samba \
+		--with-codepagedir="${EPREFIX}"/var/lib/samba/codepages \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}