Fix terminal window automatic resizing bug, thanks to Donnie Berkholz.

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 103 insertions, 1 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 3098b499b29e..1a66078691e8 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.255 2013/01/21 20:25:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.256 2013/01/24 04:56:18 tetromino Exp $
+
+*gnome-terminal-3.6.1-r2 (24 Jan 2013)
+
+  24 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-terminal-3.6.1-r2.ebuild,
+  +files/gnome-terminal-3.6.1-window-resize.patch:
+  Fix terminal window automatic resizing bug, thanks to Donnie Berkholz.
 
   21 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-terminal-3.6.1-r1.ebuild,
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch
new file mode 100644
index 000000000000..efe60b991e51
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch
@@ -0,0 +1,30 @@
+From 611e93f2f8c0c18ed8d365ecb850258e8d5c9c12 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Wed, 16 Jan 2013 22:52:03 +0100
+Subject: [PATCH] window: Use the geometry of the active screen
+
+When we get the restyle on focus-out, the screens call terminal_window_set_size()
+directly. This was causing the window to revert to a previous size, see bug
+https://bugzilla.gnome.org/show_bug.cgi?id=688959 .
+---
+ src/terminal-window.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index ed509ba..1740247 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2330,6 +2330,10 @@ terminal_window_set_size_force_grid (TerminalWindow *window,
+   int grid_width;
+   int grid_height;
+ 
++  /* Only update the geometry from the active screen. */
++  if (window->priv->active_screen != screen)
++    return;
++
+   /* be sure our geometry is up-to-date */
+   terminal_window_update_geometry (window);
+ 
+-- 
+1.8.1.1
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r2.ebuild
new file mode 100644
index 000000000000..2ffd0858ed8e
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r2.ebuild,v 1.1 2013/01/24 04:56:18 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X]
+RDEPEND="
+	>=dev-libs/glib-2.26.0:2
+	>=x11-libs/gtk+-3.3.17:3[X]
+	>=x11-libs/vte-0.30.0:2.90
+	>=gnome-base/gconf-2.31.3
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	x11-libs/libSM
+	x11-libs/libICE
+"
+# gtk+:2 needed for gtk-builder-convert, bug 356239
+DEPEND="${RDEPEND}
+	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# eautoreconf needs gnome-base/gnome-common
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=692233
+	epatch "${FILESDIR}/${PN}-3.6.1-no-gnome-doc-utils.patch"
+	# annoying window auto-resize behavior; fixed in 3.7.x
+	epatch "${FILESDIR}/${PN}-3.6.1-window-resize.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	# FIXME: leave smclient configure unset until it accepts values from the
+	# switch and not from GDK_TARGET, bug #363033
+	gnome2_src_configure --with-gtk=3.0
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 &&
+	      ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then
+		elog "Gnome Terminal no longer uses login shell by default, switching"
+		elog "to upstream default. Because of this, if you have some command you"
+		elog "want to be run, be sure to have it placed in your ~/.bashrc file."
+	fi
+}