# ChangeLog for net-irc/xchat
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.23 2002/10/11 15:46:43 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.24 2002/10/20 22:51:56 foser Exp $
+
+*xchat-1.9.3-r2.ebuild (20 Oct 2002)
+
+ 20 Oct 2002; foser <foser@gentoo.org> xchat-1.9.3-r2.ebuild :
+ Now really fixing plugins
+ Added a patch to prevent problems with gnome2.1 and up
*xchat-1.9.3-r1.ebuild (11 Oct 2002)
+++ /dev/null
-MD5 c7f0b4bd82622c280299ddf6c415b281 xchat-1.9.2.tar.bz2 706790
+++ /dev/null
-MD5 7fbb3d96ab4b288343a6d9cf9e597d25 xchat-1.9.3.tar.bz2 701422
--- /dev/null
+diff -ru --exclude=po --exclude=Makefile.in xchat-1.9.3/src/common/util.c xchat-1.9.4/src/common/util.c
+--- xchat-1.9.3/src/common/util.c Wed Aug 21 19:47:38 2002
++++ xchat-1.9.4/src/common/util.c Sat Oct 5 02:18:36 2002
+@@ -266,7 +266,7 @@
+
+ if (len == 0)
+ return (char *)s;
+- while (tolower(*s) != tolower(*wanted) || strncasecmp (s, wanted, len))
++ while (rfc_tolower(*s) != rfc_tolower(*wanted) || strncasecmp (s, wanted, len))
+ if (*s++ == '\0')
+ return (char *)NULL;
+ return (char *)s;
+@@ -574,7 +574,7 @@
+ if (*m == '?' || *m == '*')
+ ch = *m++;
+ default:
+- if (tolower(*s) != tolower(ch))
++ if (rfc_tolower(*s) != rfc_tolower(ch))
+ return 0;
+ case '?':
+ if (!*s++)
+@@ -604,8 +604,8 @@
+ break_while:
+ if (!ch)
+ return 1; /* mask ends with '*', we got it */
+- ch = tolower(ch);
+- while (tolower(*s++) != ch)
++ ch = rfc_tolower(ch);
++ while (rfc_tolower(*s++) != ch)
+ if (!*s)
+ return 0;
+ bs = s; /* Next try start from here */
+@@ -621,7 +621,7 @@
+ if (*m == '?' || *m == '*')
+ ch = *m++;
+ default:
+- if (tolower(*s) != tolower(ch))
++ if (rfc_tolower(*s) != rfc_tolower(ch))
+ {
+ m = bm;
+ s = bs;
+@@ -676,7 +676,7 @@
+ {
+ while (*str)
+ {
+- *str = tolower (*str);
++ *str = rfc_tolower (*str);
+ str++;
+ }
+ }
+@@ -1122,7 +1122,7 @@
+ register unsigned char *str2 = (unsigned char *) s2;
+ register int res;
+
+- while ((res = tolower (*str1) - tolower (*str2)) == 0)
++ while ((res = rfc_tolower (*str1) - rfc_tolower (*str2)) == 0)
+ {
+ if (*str1 == '\0')
+ return 0;
+@@ -1139,7 +1139,7 @@
+ register unsigned char *s2 = (unsigned char *) str2;
+ register int res;
+
+- while ((res = tolower (*s1) - tolower (*s2)) == 0)
++ while ((res = rfc_tolower (*s1) - rfc_tolower (*s2)) == 0)
+ {
+ s1++;
+ s2++;
+@@ -1150,7 +1150,7 @@
+ return (res);
+ }
+
+-const unsigned char tolowertab[] =
++const unsigned char rfc_tolowertab[] =
+ { 0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa,
+ 0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11, 0x12, 0x13, 0x14,
+ 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
+diff -ru --exclude=po --exclude=Makefile.in xchat-1.9.3/src/common/util.h xchat-1.9.4/src/common/util.h
+--- xchat-1.9.3/src/common/util.h Wed Aug 21 19:47:44 2002
++++ xchat-1.9.4/src/common/util.h Sat Oct 5 02:17:39 2002
+@@ -11,10 +11,9 @@
+ * --+ Dagmar d'Surreal
+ */
+
+-#undef tolower
+-#define tolower(c) (tolowertab[(unsigned char)(c)])
++#define rfc_tolower(c) (rfc_tolowertab[(unsigned char)(c)])
+
+-extern const unsigned char tolowertab[];
++extern const unsigned char rfc_tolowertab[];
+
+ int my_poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr);
+ char *expand_homedir (char *file);
+diff -ru --exclude=po --exclude=Makefile.in xchat-1.9.3/src/fe-gtk/fkeys.c xchat-1.9.4/src/fe-gtk/fkeys.c
+--- xchat-1.9.3/src/fe-gtk/fkeys.c Wed Jun 26 01:01:42 2002
++++ xchat-1.9.4/src/fe-gtk/fkeys.c Sat Oct 5 02:19:13 2002
+@@ -1808,7 +1808,7 @@
+ if (match_char == 0xff)
+ {
+ match_char = current_nick[match_pos];
+- } else if (tolower (current_nick[match_pos]) != tolower (match_char))
++ } else if (rfc_tolower (current_nick[match_pos]) != rfc_tolower (match_char))
+ {
+ match_text = malloc (match_pos + 1);
+ memcpy (match_text, current_nick, match_pos);
+++ /dev/null
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.2-r1.ebuild,v 1.5 2002/10/05 05:39:22 drobbins Exp $
-
-IUSE="ssl nls gnome ipv6 mmx python gtk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
-SRC_URI="http://www.xchat.org/files/source/1.9/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86 ppc sparc sparc64"
-
-RDEPEND=">=dev-libs/glib-2.0.4
- >=x11-libs/gtk+-2.0.5
- perl? ( >=sys-devel/perl-5.6.1 )
- gnome? ( >=x11-libs/libzvt-2.0.1
- >=gnome-base/libgnome-2.0.1
- >=gnome-base/gnome-applets-2.0.0
- >=gnome-base/gnome-panel-2.0.1 )
- ssl? ( >=dev-libs/openssl-0.9.6d )"
-
-DEPEND="${RDEPEND}
- nls? ( >=sys-devel/gettext-0.10.38 )"
-
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-}
-
-
-# From the xchat 1.9.2 README_FIRST file:
-# (one of the) REMAINING PROBLEMS:
-# * can't compile with gnome, panel and zvt support *
-# stroke
-
-src_compile() {
-
- local myopts myflags
-
- if [ ! `use perl` ] ; then
- use gnome \
- && myopts="${myopts} --enable-gnome --enable-panel" \
- || myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt"
-
- use gnome \
- && CFLAGS="${CFLAGS} -I/usr/include/orbit-2.0" \
- || myopts="${myopts} --disable-gnome"
- fi
-
- use gtk \
- || myopts="${myopts} --disable-gtkfe"
-
- use ssl \
- && myopts="${myopts} --enable-openssl"
-
- use perl \
- || myopts="${myopts} --disable-perl"
-
- use python \
- || myopts="${myopts} --disable-python"
-
- use nls \
- && myopts="${myopts} --enable-hebrew --enable-japanese-conv" \
- || myopts="${myopts} --disable-nls"
-
- use mmx \
- && myopts="${myopts} --enable-mmx" \
- || myopts="${myopts} --disable-mmx"
-
- use ipv6 \
- && myopts="${myopts} --enable-ipv6"
-
-
- econf \
- --program-suffix=-2 \
- ${myopts} || die "Configure failed"
-
- MAKEOPTS="-j1" emake || die "Compile failed"
-}
-
-src_install() {
-
- einstall utildir=${D}${KDEDIR}/share/applnk/Internet install || die "Install failed"
-
- use gnome &&
- ( insinto /usr/share/gnome/apps/Internet
- doins xchat.desktop )
-
- dodoc AUTHORS COPYING ChangeLog README
-}
# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.3-r1.ebuild,v 1.1 2002/10/11 15:46:43 lostlogic Exp $
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.3-r2.ebuild,v 1.1 2002/10/20 22:51:56 foser Exp $
-IUSE="ssl nls gnome ipv6 mmx python gtk perl"
+IUSE="perl gnome ssl gtk python mmx ipv6 nls"
S=${WORKDIR}/${P}
DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
src_unpack() {
unpack ${A}
- cd ${S}
+ patch -d ${S} -p1 < ${FILESDIR}/xchat-1.9.3-tolowertab.patch
+
}
-# From the xchat 1.9.2 README_FIRST file:
+# From the xchat 1.9.3 README_FIRST file:
# (one of the) REMAINING PROBLEMS:
# * can't compile with gnome, panel and zvt support *
# stroke
einstall utildir=${D}${KDEDIR}/share/applnk/Internet install || die "Install failed"
- mv ${D}usr/lib/xchat ${D}usr/lib/xchat-2 || die
- for file in ${D}usr/lib/xchat-2/plugins/* ;do
- mv ${file} ${file/.so-2/}.so || die
- done
-
use gnome &&
( insinto /usr/share/gnome/apps/Internet
doins xchat.desktop )
-
+ use python &&
+ ( dosym /usr/lib/xchat/plugins/python.so-2 /usr/lib/xchat/plugins/python.so )
+ use perl &&
+ ( dosym /usr/lib/xchat/plugins/perl.so-2 /usr/lib/xchat/plugins/perl.so )
dodoc AUTHORS COPYING ChangeLog README
}
+++ /dev/null
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.3.ebuild,v 1.1 2002/10/11 15:01:47 lostlogic Exp $
-
-IUSE="ssl nls gnome ipv6 mmx python gtk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
-SRC_URI="http://www.xchat.org/files/source/1.9/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86 ppc sparc sparc64"
-
-RDEPEND=">=dev-libs/glib-2.0.4
- >=x11-libs/gtk+-2.0.5
- perl? ( >=sys-devel/perl-5.6.1 )
- gnome? ( >=x11-libs/libzvt-2.0.1
- >=gnome-base/libgnome-2.0.1
- >=gnome-base/gnome-applets-2.0.0
- >=gnome-base/gnome-panel-2.0.1 )
- ssl? ( >=dev-libs/openssl-0.9.6d )"
-
-DEPEND="${RDEPEND}
- nls? ( >=sys-devel/gettext-0.10.38 )"
-
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-}
-
-
-# From the xchat 1.9.2 README_FIRST file:
-# (one of the) REMAINING PROBLEMS:
-# * can't compile with gnome, panel and zvt support *
-# stroke
-
-src_compile() {
-
- local myopts myflags
-
- if [ ! `use perl` ] ; then
- use gnome \
- && myopts="${myopts} --enable-gnome --enable-panel" \
- || myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt"
-
- use gnome \
- && CFLAGS="${CFLAGS} -I/usr/include/orbit-2.0" \
- || myopts="${myopts} --disable-gnome"
- fi
-
- use gtk \
- || myopts="${myopts} --disable-gtkfe"
-
- use ssl \
- && myopts="${myopts} --enable-openssl"
-
- use perl \
- || myopts="${myopts} --disable-perl"
-
- use python \
- || myopts="${myopts} --disable-python"
-
- use nls \
- && myopts="${myopts} --enable-hebrew --enable-japanese-conv" \
- || myopts="${myopts} --disable-nls"
-
- use mmx \
- && myopts="${myopts} --enable-mmx" \
- || myopts="${myopts} --disable-mmx"
-
- use ipv6 \
- && myopts="${myopts} --enable-ipv6"
-
-
- econf \
- --program-suffix=-2 \
- ${myopts} || die "Configure failed"
-
- MAKEOPTS="-j1" emake || die "Compile failed"
-}
-
-src_install() {
-
- einstall utildir=${D}${KDEDIR}/share/applnk/Internet install || die "Install failed"
-
- use gnome &&
- ( insinto /usr/share/gnome/apps/Internet
- doins xchat.desktop )
-
- dodoc AUTHORS COPYING ChangeLog README
-}
projects / gentoo.git / commitdiff