Fix wrong charset dialog placement. http://www.midnight-commander.org/ticket/1451.

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

3 files changed, 100 insertions, 1 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index cb9327ec73c3..8095b9c30bbe 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.165 2009/09/01 14:43:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.166 2009/09/04 13:05:24 ssuominen Exp $
+
+*mc-4.7.0_pre2-r1 (04 Sep 2009)
+
+  04 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +mc-4.7.0_pre2-r1.ebuild, +files/mc-4.7.0_pre2-horizontal_split.patch:
+  Fix wrong charset dialog placement.
+  http://www.midnight-commander.org/ticket/1451.
 
   01 Sep 2009; Jeroen Roovers <jer@gentoo.org> mc-4.7.0_pre1.ebuild:
   Stable for HPPA (bug #281667).
diff --git a/app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch b/app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch
new file mode 100644
index 000000000000..f1b0f3448721
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/show_bug.cgi?id=282556
+http://www.midnight-commander.org/ticket/1451
+
+diff -ur mc-4.7.0-pre2.orig/src/screen.c mc-4.7.0-pre2/src/screen.c
+--- mc-4.7.0-pre2.orig/src/screen.c	2009-08-23 23:17:14.000000000 +0300
++++ mc-4.7.0-pre2/src/screen.c	2009-09-04 15:59:56.000000000 +0300
+@@ -2702,10 +2702,16 @@
+     char *cd_path;
+ #ifdef HAVE_CHARSET
+     const char *errmsg;
++    int offset;
+     int r;
+-    int width = (panel->widget.x)? panel->widget.cols : panel->widget.cols * (-1);
+ 
+-    r = select_charset (width, 0, source_codepage, FALSE);
++    if (horizontal_split) {
++	offset = (get_current_index () != 0) ? panel->widget.lines : -panel->widget.lines;
++	r = select_charset (0, offset, source_codepage, FALSE);
++    } else {
++	offset = (get_current_index () != 0) ? panel->widget.cols : -panel->widget.cols;
++	r = select_charset (offset, 0, source_codepage, FALSE);
++    }
+ 
+     if (r == SELECT_CHARSET_CANCEL)
+ 	return; /* Cancel */
diff --git a/app-misc/mc/mc-4.7.0_pre2-r1.ebuild b/app-misc/mc/mc-4.7.0_pre2-r1.ebuild
new file mode 100644
index 000000000000..cfd6e1a4e733
--- /dev/null
+++ b/app-misc/mc/mc-4.7.0_pre2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.0_pre2-r1.ebuild,v 1.1 2009/09/04 13:05:24 ssuominen Exp $
+
+EAPI=2
+MY_P=${P/_/-}
+inherit eutils
+
+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"
+IUSE="chdir +edit gpm nls samba slang X"
+
+RDEPEND=">=dev-libs/glib-2.6: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}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-horizontal_split.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=/etc/samba \
+		--with-codepagedir=/var/lib/samba/codepages \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README
+
+	if use chdir; then
+		insinto /etc/profile.d
+		doins "${FILESDIR}"/mc-chdir.sh
+	fi
+}