Patch segfault on newest GTK+.

(Portage version: 2.0.53)

5 files changed, 26 insertions, 12 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index 64f26e4d52a7..9d149470b264 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.8 2005/12/09 20:09:32 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.9 2005/12/14 20:20:07 chainsaw Exp $
+
+*xchat-gnome-0.7-r1 (14 Dec 2005)
+
+  14 Dec 2005; <chainsaw@gentoo.org> +files/xchat-gnome-0.7-segfault.patch,
+  -xchat-gnome-0.7.ebuild, +xchat-gnome-0.7-r1.ebuild:
+  Patch segfault on newest GTK+.
 
 *xchat-gnome-0.7 (09 Dec 2005)
 
diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index 099f5938ff89..90fe8080b105 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f3087c42db97c14eb269aca116cb6ef0 ChangeLog 1440
 MD5 6b74f53c26e12ea2bc55b54b33ada601 files/digest-xchat-gnome-0.4 69
 MD5 ba4f8ea248bc0fbcb776188ff3378f5f files/digest-xchat-gnome-0.5 69
 MD5 96c43ae259f40b55469226fdc18f26c9 files/digest-xchat-gnome-0.6 69
 MD5 6829fbc411f27e2883b18dcf6f3e784f files/digest-xchat-gnome-0.7 69
+MD5 6829fbc411f27e2883b18dcf6f3e784f files/digest-xchat-gnome-0.7-r1 69
 MD5 cf21778a2cac6a5ad0a81032f48583fd files/xchat-gnome-0.7-dbus.patch 1620
 MD5 c7599a8531a6130925ead14ec1489bc5 files/xchat-gnome-0.7-scrollkeeper.patch 386
+MD5 6cc0d3248f5cb2d9309392b9fa413d18 files/xchat-gnome-0.7-segfault.patch 414
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 ea5d21ed4c3fafc70d7aa442f7a64730 xchat-gnome-0.4.ebuild 1667
 MD5 56cd43f4d2579e3c7e7b26beb3c9b5fe xchat-gnome-0.5.ebuild 1667
 MD5 09539bbeae697f7de7b0352190ca4d02 xchat-gnome-0.6.ebuild 1739
+MD5 baaf05d49abbb270d5e2194aa85ca499 xchat-gnome-0.7-r1.ebuild 1911
 MD5 b2ac03dfaa7ad98ae9919438d00084e7 xchat-gnome-0.7.ebuild 1871
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDmeRGp5vW4rUFj5oRAinkAJ46hRKLkVC8ugq17Nk4IhAeOVG6UgCeODuz
-wnJM5ez7D5GiE/nbNxRsq1Q=
-=60P3
------END PGP SIGNATURE-----
diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1
index e168b382edbc..e168b382edbc 100644
--- a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7
+++ b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1
diff --git a/net-irc/xchat-gnome/files/xchat-gnome-0.7-segfault.patch b/net-irc/xchat-gnome/files/xchat-gnome-0.7-segfault.patch
new file mode 100644
index 000000000000..47fdfe4ca8fa
--- /dev/null
+++ b/net-irc/xchat-gnome/files/xchat-gnome-0.7-segfault.patch
@@ -0,0 +1,14 @@
+Index: navigation-tree.c
+===================================================================
+--- src/fe-gnome/navigation-tree.c	(revision 9810)
++++ src/fe-gnome/navigation-tree.c	(working copy)
+@@ -1060,6 +1060,9 @@
+ 	gpointer *s;
+ 	session *sess;
+ 
++	if (gui.server_tree == NULL)
++		return;
++
+ 	treeview = GTK_TREE_VIEW (glade_xml_get_widget (gui.xml, "userlist"));
+ 
+ 	if (gui.server_tree->current_path != NULL)
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild
index c97331d1ce0d..40b17de50201 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild,v 1.1 2005/12/09 20:09:32 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild,v 1.1 2005/12/14 20:20:07 chainsaw Exp $
 
 inherit gnome2 eutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-dbus.patch
 	epatch ${FILESDIR}/${P}-scrollkeeper.patch
+	epatch ${FILESDIR}/${P}-segfault.patch
 }
 
 src_compile() {