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

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 113 insertions, 9 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/Manifest b/x11-terms/gnome-terminal/Manifest
index d801dbcb5280..9387f958eccd 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX gnome-terminal-2.22.0-default_shell.patch 491 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892 SHA512 bb3a5b25551d9d2d39dba791d0ff9231ef6f2247faf528ef7d699d5048fe3da26c06748add8b1529be80a7fcbe6f83dffea75fecb20cc68a393eff46a0915615 WHIRLPOOL 3c856ef243be930be1d6ff4f0afc8f464a3d97c8ab1859141b967a95bc583f34ce566352c61ec9105ab90e9ad369679ce5bedd9ebb0893545eae49e6e7a5e136
 AUX gnome-terminal-3.6.1-no-gnome-doc-utils.patch 818 SHA256 e6163f5e2794d238bd0bfe7c1997e423774a4579dcdb7e0d5108bc2247108634 SHA512 9c26ee63497f886b5cb3b779a7b7e08beeac8276349db0141c0544f94193305c640aecc6accb1cd9ce8cc8e0a66250a3bc46f735fededd5c0ceb16710d112ff2 WHIRLPOOL aa8c41d02febc9025d64b7140d93620899e6f4d3cbc55aeac51b15055fd3deebffb670f1e9814287d7e4e8608ab908f10a2a7b0c223d0d53c22b07561ec21a2f
+AUX gnome-terminal-3.6.1-window-resize.patch 986 SHA256 1ce91e6d4bf7ab8220ddadf1875a0ca065a2ff5a76653c5e7883bb45152522f2 SHA512 3df4ff654bdfbd12527bfc7c86da09bdcd064f4abd5eb53c1293e409c88fa279541857b06183581ec4b3bcee1a73af0d59f86218bad84be280bdd8ae6ca335ee WHIRLPOOL 50efc479dc2f8bc229c307d5717a11b8cd07d5d058f13d807d50fab359803b7201a698bcca79019ddf718197d15f0bf353bc8dfe121fe15281f8e9749c01bd22
 DIST gnome-terminal-2.32.1.tar.bz2 2319315 SHA256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb SHA512 791591ecd219f605ae815c7ef6d464889f628124e077052805a6890508c570d635c8677d2a83262aa2029bdf9db3e6fb3294cb57bd988ac47534dc7023858f66 WHIRLPOOL 11c27188d5e0a8dd29c13130f84695dd30548c0cca263dcc723b4a63a6fd13b0503c439a0e5c9502cf5d335dd60b04f2caec2fb967fc8b13e96dd17b904aef72
 DIST gnome-terminal-3.4.1.1.tar.xz 2015448 SHA256 14d4a252fcbadf0a5fff89f1ff65f0a84d02f5e51c42f8fc14cee73eabc43fdd SHA512 75faad48f8a482df0e069aff391496a00cbebd3b7b90364fa5831c2371d47b0292606fdb73757fa3f01c44a9a012ee9bbb767f994acbdc09960a4354331cde39 WHIRLPOOL bef9c92ce4aa1d19e85d563f32eb50c45e1191b3d8f165c8a34764d4080e9bb6de649c798c4557e468c2d8f09834d49f3dcd7c2cc831f8e120cfec5e2b16f4b0
 DIST gnome-terminal-3.6.1.tar.xz 1648676 SHA256 c6816f77eaae791dadeef89596df811e2fa353088241aa0613bb8e1af63304f6 SHA512 b91c7a1c572e430bdfd9dc66c5c8720e1fb669b0495a278e89417c94788f215c2070b2f16dc5e2d2e1b12c41ab105af221c3816462962b3edb8ca40581598774 WHIRLPOOL f8681c9b4487d9a38287f029f057d6a7a301af091845298d46a0aa6527ce73b2efaf817dd7d8e97d89e6bb1004de9b22d3d44cbae9149071f8d1dbb0e265d58c
@@ -10,16 +11,17 @@ EBUILD gnome-terminal-2.32.1-r1.ebuild 1326 SHA256 1638494982e6c8c121867d130fa0e
 EBUILD gnome-terminal-2.32.1.ebuild 1110 SHA256 566914823131f191000591113e6701179f7c32a3566d4a140d65fd7a00c65c45 SHA512 69368c042dce5704865f3186f6137f185b236fe3740d5e4374ea65796f52a7003e3210e0c8d19749c2bd520265f699c49100b3016412c096d38184fd86cc7dd0 WHIRLPOOL e2f1d09d5025ca38c0b36b376e8a7a39ab6153751c024904cea66664558a4581bdcfd19928edf381fc7510cf5b1d1c87e49a1e3f7c884609647eb2279677a578
 EBUILD gnome-terminal-3.4.1.1-r1.ebuild 1598 SHA256 378ed4d7437907af6687b6f61ce5565e5f3ff9d4d7819286e357ada27bc6bf6d SHA512 15b599d651b796857f6c95e493f49a8120e763e156e5bb525edca8f52a4db4a09ecf99c776d8e078cc90f636e10a8ac42df354dc20e037587d931232ca659950 WHIRLPOOL 6d77af6110b4259b755888443b18bc3901bf1b140f74a4519f2df3fa30c32a57b39f5f24865038fabca52d8ed5275ba11b70398f8bee4f2069dfe364ec9a6dd1
 EBUILD gnome-terminal-3.6.1-r1.ebuild 1878 SHA256 56532f6c54dafc86f9caff15c2506cbd3f57fe2ff956b5c27a375cd4d908956a SHA512 3be7fb146b2e32587819163d77be4a2e4108b51a9be048a51f1f3703cf7f449e295bac36c0ce624d921fc700e0cc18769ca9e281c0bf6115f4d23fc539404efb WHIRLPOOL 38b5ce3ed2b30eba4055589053cdcbbb5d492307c059fefb142b8a8b1c79857913bab7415d5519bab7d6a19da987858aa1d28bd9c15817fa97f6980fb0688625
-MISC ChangeLog 37078 SHA256 be68b849c41d7bcb9b162b68d9aa151ee6889a850fc37e44676683e140417534 SHA512 ce58b0b570f1b87895c958a9b42122e2b6a46a7443ce50eae050a09436e0495b8668b41736288c04fee7347171426b2d8339ec5e3cde9fb17cd99e831514ffa6 WHIRLPOOL 138db23c28041e96fcb50201521921ce87d35057658612d8b30f8aa414b3d49764920c590dc50b407e02cf30fd54c17698b3bdfad4ebcfdbd4ba268b5dd68e23
+EBUILD gnome-terminal-3.6.1-r2.ebuild 1968 SHA256 61352e09a62a8aaa7917039a01bcf436e6800358cec0b7f7dd777256c314bdb5 SHA512 2702a01ead9d1705526cfcbca95f94bf9068cb9aa49b6f33c88a07346b4967be4cdfa8138ffa575e7cfa9a4b524e39a298f862d7d01743ac53267037b63ae079 WHIRLPOOL d9e72d24f20ec4e84f3e12b65467141864c9af10eeabcc0d65d1858c9b515573dd27bd56dc519d36cdc7953ff78740f7437889e23a6cd3617376aad5baf71488
+MISC ChangeLog 37337 SHA256 c1ee5a5fd38484b5c2bbcacca856ea401e4ab02cb12a33039f8129161235b75e SHA512 4a8f8874ac5b0920ef63a0c8e0b5ee33d559c399729eaa04842d50bf04f9209f0f316a400a2e71aa620d71d5faa85ee4ebcc406a487bba994d282a1df8c16bcc WHIRLPOOL f2d570bcb072896c2a3375702fb918330971c8a7444063cf568ff52cd15a0de41ca32f2bcd6da5a936ad26e7237e862e81903bd559293b8db735cedcd09eac65
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/aRFAAoJEJ0WA1zPCt1hIB8H/34qgLO+UWF0UKhEg5nxdhPu
-ilou4va2tH4oox0SgLZyGV6raYmOSSd5BzqKugrAptQKQY9tvuLbUsOmQANzTVSJ
-JfmJTOdD8KzJvR0UnmW4NzphigT8JTX10BUu5weCc3wxDSDK2nZQY6/9pGyu2Cw5
-Usv2d5bhGkyfoE3w2wbGkTeLS5x2FR5cJ2C0AfrS/9HXy562+E8ugWIHtUCcWnn+
-H2DjjVDcBLkbhuGstIUa0Gidr8jQ3tqRRR2DnLWmB3WpUmkUN9XG8rqI7MMscoI0
-lZw2iIxn3u48wIu3cmG9H27bH7SCybfCC/Q1jhEzAandgeBbRsiqOl79iwjDwwY=
-=rttm
+iQEcBAEBCAAGBQJRAL7zAAoJEJ0WA1zPCt1htiIH+gPNadZAmYyywGoSpAke8SBL
+rAe39nN4O2KgrjPrQa5o3yYs1guiLzvc+f3YStv3OkYUzuE3ZU2LFaccL9XhUmHv
+HVSuYUiinfutBeYfxfrlq/KKkRof3lgW5aaXW2NXFuQpe4QPRw7QRT28PraBriWX
+KcQmAwXMX4kGJkDBsbkm6tkykoNG3plNxuvgt/phQEv9Eg9Dl2eKvpi6CAvJAqYd
+tB7A6aiXZgPXkuBswprd0PXzCm6ZkhyNBUdZGSFaKCVHhsLxJuJLQ3NcAlN5BTJ3
+NJ0+0zG0MXzYiZxgTrYex6ZfE1rl1u8Gv2nnykNqpEi4Hj5JU+LbsXqaVs/43RA=
+=N3A+
 -----END PGP SIGNATURE-----
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
+}