diff options
author | Chuck Short <zul@gentoo.org> | 2003-11-23 05:09:40 +0000 |
---|---|---|
committer | Chuck Short <zul@gentoo.org> | 2003-11-23 05:09:40 +0000 |
commit | fa0c9d9ffc57169a919f6abac64b8ef79ad8263f (patch) | |
tree | bd00c6f714e8004527ccc9e40bd7334e7828ff0f /net-irc | |
parent | New version add patches (diff) | |
download | gentoo-2-fa0c9d9ffc57169a919f6abac64b8ef79ad8263f.tar.gz gentoo-2-fa0c9d9ffc57169a919f6abac64b8ef79ad8263f.tar.bz2 gentoo-2-fa0c9d9ffc57169a919f6abac64b8ef79ad8263f.zip |
New version add patches
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/xchat/ChangeLog | 10 | ||||
-rw-r--r-- | net-irc/xchat/Manifest | 6 | ||||
-rw-r--r-- | net-irc/xchat/files/digest-xchat-2.0.5-r1 | 1 | ||||
-rw-r--r-- | net-irc/xchat/files/xc205-fix-emptyword.diff | 16 | ||||
-rw-r--r-- | net-irc/xchat/files/xc205-fix64bit.diff | 47 | ||||
-rw-r--r-- | net-irc/xchat/xchat-1.8.11.ebuild | 4 | ||||
-rw-r--r-- | net-irc/xchat/xchat-2.0.5-r1.ebuild | 82 |
7 files changed, 160 insertions, 6 deletions
diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog index a6eb23edb0d3..3b56d560909e 100644 --- a/net-irc/xchat/ChangeLog +++ b/net-irc/xchat/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-irc/xchat # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.71 2003/10/05 10:40:30 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.72 2003/11/23 05:09:14 zul Exp $ + +*xchat-2.0.5-r1 (23 Nov 2003) + + 23 Nov 2003; Chuck Short <zul@gentoo.org> xchat-2.0.5-r1.ebuild, + files/xc205-fix-emptyword.diff, files/xc205-fix64bit.diff: + New version, adds latest patches. + Ebuild originally submitted by Bluefox Phoenix Lucid <bluefoxicy@linux.net> + Closes bug number 34060. 05 Oct 2003; foser <foser@gentoo.org> xchat-2.0.{4,5}.ebuild : Fix USE depend (#29942) diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest index 027e5811c4f9..50992115fc48 100644 --- a/net-irc/xchat/Manifest +++ b/net-irc/xchat/Manifest @@ -1,9 +1,9 @@ MD5 b424d2740a1f93cdc3f306461b4cf778 xchat-2.0.1.ebuild 1946 -MD5 6011a84d15e1f1ac75713dc75209e00c xchat-1.8.11.ebuild 2217 -MD5 325dc46df0ed462bc135ae38b4f6b3e6 xchat-2.0.5-r1.ebuild 2102 +MD5 4887bbd6f7df0f18b5aebc93850c6cf4 xchat-1.8.11.ebuild 2213 +MD5 6a93f14b4104d5e69a65614d07546583 xchat-2.0.5-r1.ebuild 2103 MD5 e09e7c7a11448b323c9381343d21285a xchat-2.0.5.ebuild 1977 MD5 5560dba63d7b69569420abc72d653f03 xchat-2.0.4.ebuild 2010 -MD5 476b24edbd2c3b1854e313d42b8d44ee ChangeLog 10449 +MD5 d1772465b4916faada870254accd6231 ChangeLog 10447 MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179 MD5 785881948431e9b5cc0fd90ccbd997e9 xchat-2.0.3-r1.ebuild 1915 MD5 1ee812a2b3e28e3866413e75a80ff983 files/digest-xchat-2.0.1 64 diff --git a/net-irc/xchat/files/digest-xchat-2.0.5-r1 b/net-irc/xchat/files/digest-xchat-2.0.5-r1 new file mode 100644 index 000000000000..1b857ff4f118 --- /dev/null +++ b/net-irc/xchat/files/digest-xchat-2.0.5-r1 @@ -0,0 +1 @@ +MD5 8a594ed57287a9fb212425ecba8d5401 xchat-2.0.5.tar.bz2 902581 diff --git a/net-irc/xchat/files/xc205-fix-emptyword.diff b/net-irc/xchat/files/xc205-fix-emptyword.diff new file mode 100644 index 000000000000..3d1a1720a184 --- /dev/null +++ b/net-irc/xchat/files/xc205-fix-emptyword.diff @@ -0,0 +1,16 @@ +# fix skiping of "" in word[] array. +# Side effect: fixes DCC RESUME with mIRC >= 6.1 +--- xchat-2.0.5/src/common/outbound.c 2003-09-05 21:12:52.000000000 +1000 ++++ xchat-2.0.6/src/common/outbound.c 2003-10-16 14:00:52.000000000 +1000 +@@ -185,8 +185,10 @@ + if (!handle_quotes) + goto def; + if (quote) ++ { + quote = FALSE; +- else ++ space = FALSE; ++ } else + quote = TRUE; + cmd++; + break; diff --git a/net-irc/xchat/files/xc205-fix64bit.diff b/net-irc/xchat/files/xc205-fix64bit.diff new file mode 100644 index 000000000000..f41f760e2872 --- /dev/null +++ b/net-irc/xchat/files/xc205-fix64bit.diff @@ -0,0 +1,47 @@ +# fixes 64bit issues (where a pointer to int was given, instead of gsize). +--- xchat-2.0.5/src/common/server.c 2003-08-11 01:40:15.000000000 +1000 ++++ xchat-2.0.6/src/common/server.c 2003-10-07 14:54:26.000000000 +1000 +@@ -289,8 +289,8 @@ + { + char *conv_line; /* holds a copy of the original string */ + int conv_len; /* tells g_convert how much of line to convert */ +- int utf_len; +- int read_len; ++ gsize utf_len; ++ gsize read_len; + GError *err; + gboolean retry; + +--- xchat-2.0.5/src/common/text.c 2003-09-21 20:36:15.000000000 +1000 ++++ xchat-2.0.6/src/common/text.c 2003-10-07 15:01:06.000000000 +1000 +@@ -446,7 +446,7 @@ + get_stamp_str (char *fmt, time_t tim, char **ret) + { + char dest[128]; +- int len; ++ gsize len; + + len = strftime (dest, sizeof (dest), fmt, localtime (&tim)); + if (len) +--- xchat-2.0.5/src/fe-gtk/xtext.c 2003-09-18 15:26:52.000000000 +1000 ++++ xchat-2.0.6/src/fe-gtk/xtext.c 2003-10-07 14:57:14.000000000 +1000 +@@ -2126,6 +2126,7 @@ + char *stripped; + guchar *new_text; + int len; ++ gsize glen; + + stripped = gtk_xtext_selection_get_text (xtext, &len); + if (!stripped) +@@ -2158,9 +2159,9 @@ + } + break; + default: +- new_text = g_locale_from_utf8 (stripped, len, NULL, &len, NULL); ++ new_text = g_locale_from_utf8 (stripped, len, NULL, &glen, NULL); + gtk_selection_data_set (selection_data_ptr, GDK_SELECTION_TYPE_STRING, +- 8, new_text, len); ++ 8, new_text, glen); + g_free (new_text); + } + diff --git a/net-irc/xchat/xchat-1.8.11.ebuild b/net-irc/xchat/xchat-1.8.11.ebuild index c83d970ebc1d..f275f82413b1 100644 --- a/net-irc/xchat/xchat-1.8.11.ebuild +++ b/net-irc/xchat/xchat-1.8.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.11.ebuild,v 1.9 2003/09/11 01:23:41 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.11.ebuild,v 1.10 2003/11/23 05:09:14 zul Exp $ inherit eutils @@ -19,7 +19,7 @@ RDEPEND="gtk? ( =x11-libs/gtk+-1.2* ) python? ( >=dev-lang/python-2.2-r7 ) perl? ( >=dev-lang/perl-5.6.1 ) gnome? ( <gnome-base/gnome-panel-1.5.0 - >=media-libs/gdk-pixbuf-0.11.0-r1 ) + >=media-libs/gdk-pixbuf-0.22.0 ) ssl? ( >=dev-libs/openssl-0.9.6a )" DEPEND="${RDEPEND} diff --git a/net-irc/xchat/xchat-2.0.5-r1.ebuild b/net-irc/xchat/xchat-2.0.5-r1.ebuild new file mode 100644 index 000000000000..1075f22c17b5 --- /dev/null +++ b/net-irc/xchat/xchat-2.0.5-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.5-r1.ebuild,v 1.1 2003/11/23 05:09:15 zul Exp $ + +inherit eutils + +DESCRIPTION="Graphical IRC client" +SRC_URI="http://www.xchat.org/files/source/2.0/${P}.tar.bz2" +HOMEPAGE="http://www.xchat.org/" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64" +IUSE="perl tcltk python ssl mmx ipv6 nls" +# Local use flag for the text frontend (bug #26427) +IUSE="${IUSE} xchattext xchatnogtk" + +# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org> +if [ ${ARCH} = "sparc" ] +then + replace-flags "-O3" "-O2" +fi + + +RDEPEND=">=dev-libs/glib-2.0.3 + !xchatnogtk? ( >=x11-libs/gtk+-2.0.3 ) + perl? ( >=dev-lang/perl-5.6.1 ) + ssl? ( >=dev-libs/openssl-0.9.6d ) + python? ( dev-lang/python ) + tcltk? ( dev-lang/tcl ) + nls? ( sys-devel/gettext )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.7" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/xc205-fix-emptyword.diff + epatch ${FILESDIR}/xc205-fix64bit.diff +} + +src_compile() { + # xchat's configure script uses sys.path to find library path + # instead of python-config (#25943) + unset PYTHONPATH + + # test for local usage of xchatnogtk + local gtkconf + use xchatnogtk \ + && gtkconf="--disable-gtkfe" \ + || gtkconf="--enable-gtkfe" + + econf \ + ${gtkconf} \ + `use_enable ssl openssl` \ + `use_enable perl` \ + `use_enable python` \ + `use_enable tcltk tcl` \ + `use_enable mmx` \ + `use_enable ipv6` \ + `use_enable nls` \ + `use_enable xchattext textfe` \ + --program-suffix=-2 \ + || die "Configure failed" + + MAKEOPTS="-j1" emake || die "Compile failed" +} + +src_install() { + # some magic to create a menu entry for xchat 2 + mv xchat.desktop xchat.desktop.old + sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop + + einstall install || die "Install failed" + + # install plugin development header + insinto /usr/include/xchat + doins src/common/xchat-plugin.h + + dodoc AUTHORS COPYING ChangeLog README* +} |