Added a patch to make the input box a bit smaller.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 49 insertions, 4 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 37ae1093289d..b54f1a088ab3 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.280 2010/06/01 08:13:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.281 2010/07/21 00:58:57 polynomial-c Exp $
+
+  21 Jul 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +files/xchat-input-box3.patch, xchat-2.8.8.ebuild:
+  Added a patch to make the input box a bit smaller. Thanks to s0ulslack for
+  reporting this in bug #301161 and to Rafał Mużyło for the patch.
 
 *xchat-2.8.8 (01 Jun 2010)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index d486abba8bfd..a02f984a0e7a 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -2,12 +2,13 @@ AUX xc286-smallfixes.diff 2020 RMD160 91c654320b7b1f9d6b13f7b226fb4cec26054319 S
 AUX xchat-2.8.6-automagic-ntlm-configure-fix.patch 1246 RMD160 d088fc71f1494da290399e0da4f0ff0b72c3e43a SHA1 1a258fe21c42dcb4c25def307992f36a8ff526e4 SHA256 5d34b49bbf151c81bf0d064bd20e3c28d0441bf13c4f52addbad69973ca6f7c5
 AUX xchat-2.8.6-fix-button-underlines.patch 502 RMD160 67bd79c04d725d15e9cd0a800c8e539d3bdf78da SHA1 c2552b0582e3239802ba52e66be12f4d383c610b SHA256 2eab3471a7d0228917e76a79348761565ab88f7491b37185cae4227d7f2f997b
 AUX xchat-2.8.6-shm-pixmaps.patch 2711 RMD160 0052d6981752d19cf4876180f00a57b4c503f0c8 SHA1 3731d5c7ac04f053da923406fc73df37ff7802df SHA256 984174ea711fbb7b2d7817e838fb5ad54f4c414ca5f6004994f15bf790279060
+AUX xchat-input-box3.patch 1398 RMD160 7c4241cedd46e3d048bcb5ad7151d3e64fe79615 SHA1 f4fd52b5ba4a8d9c5b62d69a6ba02639d781ee47 SHA256 73a42a6415e7300b688fedb44ce2e9f66e3b48d23183197311d4d9dd83e189ba
 DIST xchat-2.8.6.tar.bz2 1423645 RMD160 bc199e3b58a9db3dfd9f2af6bac7fb6162c53d6e SHA1 7a7463e65cb26c680ed70dd96cec98bcc05435a4 SHA256 8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
 DIST xchat-2.8.8.tar.bz2 1509993 RMD160 1bc3e0ff00e15c83588dd21a3ef3e8e34f953331 SHA1 a4ac161e4e40f4bbabc492675a1ff4380dba8d68 SHA256 0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
 EBUILD xchat-2.8.6-r1.ebuild 2754 RMD160 1879a7cc8d8c7a6a164f56e43b8c82db168ba9ea SHA1 84a3a90b7547c27dd92cbc209b36019612dc4d9e SHA256 e9f8ee1295fa54ff682efe1e429579594a7422e7269a41ba03f52ec0e898630e
 EBUILD xchat-2.8.6-r2.ebuild 2809 RMD160 ef7c11cef8a96acaeb1ebc05a0b6e6c59de738c9 SHA1 45cc0900a12f3b0d1d1a4c15beb65cec21d63bc6 SHA256 a27b5975fba8cffe708a67749fefb6d31361d78ab4cd98423fa7028d9b87e078
 EBUILD xchat-2.8.6-r3.ebuild 2967 RMD160 b735987dfe9ecc6aec723c355852073b5e6e97a4 SHA1 0de3a1a363cae9769852ceebbc2aff88f4e54eba SHA256 fc2da3b45d8396576b2f139d3bd3429c348318e78bc1c03c35258e159b78a400
-EBUILD xchat-2.8.8.ebuild 2747 RMD160 15aa1f6277cce95233ee3c1b0567150f84cf0a99 SHA1 976771485672c2c622183cd91b7412bae6dd1f49 SHA256 8f0b95b90027a2e5da47b2fd95d808c71a73a62947a35da89b4c3949680df235
-MISC ChangeLog 41394 RMD160 b9628feb180add8556ce62ff9ff7de011d75c7c7 SHA1 6192194eaa8bded8a04e58ba4001860a0842ca73 SHA256 ebf1f8bf18ca1ca3248575abe2e6b5d9af7a155ed52a9b4627fb23d2f50058ce
+EBUILD xchat-2.8.8.ebuild 2792 RMD160 535d87320574d0f14d6725694d75bbbaa156c0a2 SHA1 2315a1b0c2b89dd5ea481081d372decc3d1c9444 SHA256 e88df299ad404a049a9154fddd9b5e89fa73846104fea47f28402c8cadf6f73f
+MISC ChangeLog 41649 RMD160 61bdc240b528e6e9138abb2d86f9bd073bea088b SHA1 0dbb0b07ed8d441201732588bc3982c774f7656b SHA256 c52f627efe8957b71ecbf99bd632aab65bc3713276755424bae3400f7255a7ce
 MISC metadata.xml 495 RMD160 c3256be4b69caa0bb58fdeb84251204ce2104ca8 SHA1 8c6574965df0e645108968cc6b4755f1e46286e3 SHA256 0a77df07eb182f95bef529db8194fd4828f95bee16a85ceac996cf76989f92a7
diff --git a/net-irc/xchat/files/xchat-input-box3.patch b/net-irc/xchat/files/xchat-input-box3.patch
new file mode 100644
index 000000000000..7055c7be7b73
--- /dev/null
+++ b/net-irc/xchat/files/xchat-input-box3.patch
@@ -0,0 +1,38 @@
+--- src/fe-gtk/maingui.c.old	2010-05-16 05:15:55.000000000 +0200
++++ src/fe-gtk/maingui.c	2010-07-20 23:49:11.000000000 +0200
+@@ -2828,13 +2828,13 @@
+ static void
+ mg_create_entry (session *sess, GtkWidget *box)
+ {
+-	GtkWidget *sw, *hbox, *but, *entry;
++	GtkWidget *sw, *hbox, *but, *entry, *mybox;
+ 	session_gui *gui = sess->gui;
+ 
+ 	hbox = gtk_hbox_new (FALSE, 0);
+ 	gtk_box_pack_start (GTK_BOX (box), hbox, 0, 0, 0);
+ 
+-	gui->nick_box = gtk_hbox_new (FALSE, 0);
++	gui->nick_box = gtk_vbox_new (FALSE, 0);
+ 	gtk_box_pack_start (GTK_BOX (hbox), gui->nick_box, 0, 0, 0);
+ 
+ 	gui->nick_label = but = gtk_button_new_with_label (sess->server->nick);
+@@ -2846,7 +2846,7 @@
+ 
+ #ifdef USE_GTKSPELL
+ 	gui->input_box = entry = gtk_text_view_new ();
+-	gtk_widget_set_size_request (entry, 0, 1);
++	gtk_widget_set_size_request (entry, 0, -1);
+ 	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (entry), GTK_WRAP_NONE);
+ 	gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (entry), FALSE);
+ 	if (prefs.gui_input_spell)
+@@ -2859,7 +2859,9 @@
+ 												GTK_POLICY_NEVER,
+ 												GTK_POLICY_NEVER);
+ 	gtk_container_add (GTK_CONTAINER (sw), entry);
+-	gtk_container_add (GTK_CONTAINER (hbox), sw);
++	mybox = gtk_vbox_new(FALSE, 0);
++	gtk_box_pack_start (GTK_BOX (mybox), sw, 1, 0, 0);
++	gtk_box_pack_start (GTK_BOX (hbox), mybox, 1, 1, 0);
+ #else
+ #ifdef USE_LIBSEXY
+ 	gui->input_box = entry = sexy_spell_entry_new ();
diff --git a/net-irc/xchat/xchat-2.8.8.ebuild b/net-irc/xchat/xchat-2.8.8.ebuild
index 82c7cff0a8e8..20a51c5ac0ea 100644
--- a/net-irc/xchat/xchat-2.8.8.ebuild
+++ b/net-irc/xchat/xchat-2.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8.ebuild,v 1.1 2010/06/01 08:13:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8.ebuild,v 1.2 2010/07/21 00:58:57 polynomial-c Exp $
 
 EAPI=2
 
@@ -41,6 +41,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-input-box3.patch
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
 
 	# use libdir/xchat/plugins as the plugin directory