Fixed bug #330007.

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

4 files changed, 15 insertions, 25 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index f0cf85222c4f..e842717096d5 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.282 2010/07/26 13:33:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.283 2010/07/28 11:27:43 polynomial-c Exp $
+
+  28 Jul 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -files/xchat-input-box3.patch, xchat-2.8.8.ebuild,
+  +files/xchat-input-box4.patch:
+  Fixed placement of channelstatus dot at the left side of the input box.
+  Thanks to Westly Ward for reporting this issue in bug #330007 and Rafał
+  Mużyło for providing a fixed patch.
 
   26 Jul 2010; Christian Faulhammer <fauli@gentoo.org> xchat-2.8.8.ebuild:
   stable x86, bug 329835
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 20d9d1f3e012..f4704fdbb4cb 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xc286-smallfixes.diff 2020 RMD160 91c654320b7b1f9d6b13f7b226fb4cec26054319 SHA1 b13eb421f6d72fca195b398c606d9413aec57fc4 SHA256 08c31e4d8d792f101047362cb25c529389c9fa254e2139a678491ee4e1fe58ff
 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
+AUX xchat-input-box4.patch 1116 RMD160 a5f51ab0505b3f9724a7be6ed0199b60e94b6189 SHA1 055270f24defcdc327292bafb06ad21b8a4230e5 SHA256 a9f2e833afe4066d0e1e9f404eae79c90caa9c0a6a53c5201e6d3498a6ad3b6b
 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 2784 RMD160 fdb187addc19a3eb8793ac59ec95ec925b91bb6d SHA1 684108dd680c6ae60046a900d67832b1cc4d280e SHA256 e229e9ac97c3168ed60885f89bf6368031e674f0e645d7013f41c9217e6d3207
-MISC ChangeLog 41743 RMD160 8d62d44e67f60d1cae4813b89a83c39ec7b7f052 SHA1 d28ee94c7d819fc81ccc0f1a988de5f9d17e4ae2 SHA256 bf8e82faa5919fd88ae886c2c65c18af9c75a3fadfad96a495379c0b1675d88c
+EBUILD xchat-2.8.8.ebuild 2791 RMD160 3276c19d60989519150bbab9b40c47558c726dbb SHA1 9360b2ac9ecacaa9502c0f3a45725c6e00bc5766 SHA256 0c2ab0921340e2f9b3aefb70d658bda787ac287bef2057f05e181a917bf54134
+MISC ChangeLog 42080 RMD160 0f44a21c9d3ada311605897ca347b03a36820830 SHA1 16c0988c898f28d9013af2399e3765c14a8a5b72 SHA256 c0cd6c3bbb5d6a201793c49b7b30831ed74b96f1efecc548944d3bdd6cae68d3
 MISC metadata.xml 495 RMD160 c3256be4b69caa0bb58fdeb84251204ce2104ca8 SHA1 8c6574965df0e645108968cc6b4755f1e46286e3 SHA256 0a77df07eb182f95bef529db8194fd4828f95bee16a85ceac996cf76989f92a7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxNjzUACgkQNQqtfCuFneMmjQCeKKLCK51k6xx9IItce40SgH7m
-ha4AnjLs8frJ+3tJIKcfI8B/ZDymrKIN
-=2z6m
------END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/xchat-input-box3.patch b/net-irc/xchat/files/xchat-input-box4.patch
index 7055c7be7b73..74ee77a8678e 100644
--- a/net-irc/xchat/files/xchat-input-box3.patch
+++ b/net-irc/xchat/files/xchat-input-box4.patch
@@ -1,6 +1,6 @@
 --- 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 @@
++++ src/fe-gtk/maingui.c	2010-07-27 05:10:22.000000000 +0200
+@@ -2828,7 +2828,7 @@
  static void
  mg_create_entry (session *sess, GtkWidget *box)
  {
@@ -9,13 +9,6 @@
  	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
diff --git a/net-irc/xchat/xchat-2.8.8.ebuild b/net-irc/xchat/xchat-2.8.8.ebuild
index 02cdfd9970b0..99ed556209d0 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.3 2010/07/26 13:33:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8.ebuild,v 1.4 2010/07/28 11:27:43 polynomial-c Exp $
 
 EAPI=2
 
@@ -41,7 +41,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-input-box3.patch
+	epatch "${FILESDIR}"/${PN}-input-box4.patch
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
 
 	# use libdir/xchat/plugins as the plugin directory