From 24724026707285becce4a26b28bda3f1a18255d1 Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Wed, 14 Dec 2005 20:20:07 +0000 Subject: Patch segfault on newest GTK+. (Portage version: 2.0.53) --- net-irc/xchat-gnome/ChangeLog | 8 ++- net-irc/xchat-gnome/Manifest | 13 +--- net-irc/xchat-gnome/files/digest-xchat-gnome-0.7 | 1 - .../xchat-gnome/files/digest-xchat-gnome-0.7-r1 | 1 + .../files/xchat-gnome-0.7-segfault.patch | 14 ++++ net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild | 76 ++++++++++++++++++++++ net-irc/xchat-gnome/xchat-gnome-0.7.ebuild | 75 --------------------- 7 files changed, 101 insertions(+), 87 deletions(-) delete mode 100644 net-irc/xchat-gnome/files/digest-xchat-gnome-0.7 create mode 100644 net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1 create mode 100644 net-irc/xchat-gnome/files/xchat-gnome-0.7-segfault.patch create mode 100644 net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild delete mode 100644 net-irc/xchat-gnome/xchat-gnome-0.7.ebuild (limited to 'net-irc') 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; +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 deleted file mode 100644 index e168b382edbc..000000000000 --- a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 a5f0940ee6389d58222a04facca0aa0d xchat-gnome-0.7.tar.bz2 1396796 diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1 new file mode 100644 index 000000000000..e168b382edbc --- /dev/null +++ b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.7-r1 @@ -0,0 +1 @@ +MD5 a5f0940ee6389d58222a04facca0aa0d xchat-gnome-0.7.tar.bz2 1396796 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-r1.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild new file mode 100644 index 000000000000..40b17de50201 --- /dev/null +++ b/net-irc/xchat-gnome/xchat-gnome-0.7-r1.ebuild @@ -0,0 +1,76 @@ +# 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-r1.ebuild,v 1.1 2005/12/14 20:20:07 chainsaw Exp $ + +inherit gnome2 eutils + +DESCRIPTION="GNOME frontend for the popular X-Chat IRC client" +HOMEPAGE="http://xchat-gnome.navi.cx/" +SRC_URI="http://flapjack.navi.cx/releases/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc" +IUSE="perl tcltk python ssl mmx ipv6 nls dbus" + +RDEPEND=">=dev-libs/glib-2.0.3 + >=gnome-base/libgnome-2 + >=gnome-base/gconf-2 + >=gnome-base/libgnomeui-2 + >=gnome-base/libglade-2 + >=gnome-base/gnome-vfs-2 + ssl? ( >=dev-libs/openssl-0.9.6d ) + perl? ( >=dev-lang/perl-5.6.1 ) + python? ( dev-lang/python ) + tcltk? ( dev-lang/tcl ) + dbus? ( >=sys-apps/dbus-0.35 ) + !net-irc/xchat" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.7 + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-dbus.patch + epatch ${FILESDIR}/${P}-scrollkeeper.patch + epatch ${FILESDIR}/${P}-segfault.patch +} + +src_compile() { + # We disable gtkfe and textfe, if you want them please use net-irc/xchat instead! + econf \ + --disable-textfe \ + --disable-gtkfe \ + --enable-gnomefe \ + --enable-shm \ + $(use_enable ssl openssl) \ + $(use_enable perl) \ + $(use_enable python) \ + $(use_enable tcltk tcl) \ + $(use_enable mmx) \ + $(use_enable ipv6) \ + $(use_enable dbus) \ + $(use_enable nls) \ + || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install" + + rm -f \ + "${D}"/usr/share/applications/xchat.desktop \ + "${D}"/usr/share/pixmaps/xchat.png + + # install plugin development header + insinto /usr/include/xchat + doins src/common/xchat-plugin.h || die "doins failed" + + dodoc src/fe-gnome/{BUGS,ChangeLog,TODO} || die "dodoc failed" +} + +pkg_postinst() { + gnome2_gconf_install +} diff --git a/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild deleted file mode 100644 index c97331d1ce0d..000000000000 --- a/net-irc/xchat-gnome/xchat-gnome-0.7.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# 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 $ - -inherit gnome2 eutils - -DESCRIPTION="GNOME frontend for the popular X-Chat IRC client" -HOMEPAGE="http://xchat-gnome.navi.cx/" -SRC_URI="http://flapjack.navi.cx/releases/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="perl tcltk python ssl mmx ipv6 nls dbus" - -RDEPEND=">=dev-libs/glib-2.0.3 - >=gnome-base/libgnome-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libglade-2 - >=gnome-base/gnome-vfs-2 - ssl? ( >=dev-libs/openssl-0.9.6d ) - perl? ( >=dev-lang/perl-5.6.1 ) - python? ( dev-lang/python ) - tcltk? ( dev-lang/tcl ) - dbus? ( >=sys-apps/dbus-0.35 ) - !net-irc/xchat" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.7 - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-dbus.patch - epatch ${FILESDIR}/${P}-scrollkeeper.patch -} - -src_compile() { - # We disable gtkfe and textfe, if you want them please use net-irc/xchat instead! - econf \ - --disable-textfe \ - --disable-gtkfe \ - --enable-gnomefe \ - --enable-shm \ - $(use_enable ssl openssl) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable tcltk tcl) \ - $(use_enable mmx) \ - $(use_enable ipv6) \ - $(use_enable dbus) \ - $(use_enable nls) \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install" - - rm -f \ - "${D}"/usr/share/applications/xchat.desktop \ - "${D}"/usr/share/pixmaps/xchat.png - - # install plugin development header - insinto /usr/include/xchat - doins src/common/xchat-plugin.h || die "doins failed" - - dodoc src/fe-gnome/{BUGS,ChangeLog,TODO} || die "dodoc failed" -} - -pkg_postinst() { - gnome2_gconf_install -} -- cgit v1.2.3-65-gdbad