gcc-3.3 gtk fixes

4 files changed, 34 insertions, 16 deletions

diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index 6a1434308f9d..de020cf2bc8a 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/bitchx
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.21 2003/03/23 22:09:50 seo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.22 2003/06/16 20:50:59 lu_zero Exp $
+
+  16 Jun 2003; Luca Barbato <lu_zero@gentoo.org> :
+  gtkBitchX fix, gcc-3.3 fix
 
 *bitchx-1.0.19-r5 (15 Mar 2003)
 
diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest
index e07d9357cede..447fdedc8100 100644
--- a/net-irc/bitchx/Manifest
+++ b/net-irc/bitchx/Manifest
@@ -1,15 +1,16 @@
-MD5 2a2ec9f968ea93e6d73f31b49330eb1c ChangeLog 3840
+MD5 9493b696a43b1d406b5d0cac240e11c4 ChangeLog 3925
 MD5 a0d406fa01701f41b0a32496205efc66 bitchx-1.0.19-r1.ebuild 2624
 MD5 2ce821e53f9b58439514e976caf6a96c bitchx-1.0.19-r2.ebuild 2705
 MD5 6ef30e5fc18af537611a47053ba9a21e bitchx-1.0.19-r3.ebuild 3192
 MD5 d8d31d074b565529e2cd7d66dc0adbb2 bitchx-1.0.19-r4.ebuild 3235
-MD5 2cd4e60db11730c4cecdeb6d2c6c28fc bitchx-1.0.19-r5.ebuild 3263
-MD5 10a57b14bb58910e1f373fbc1b8b2197 files/bitchx-1.0.19-cjk.patch 7050
+MD5 626240eb9872259a5c6bff48b0a512f7 bitchx-1.0.19-r5.ebuild 3459
 MD5 2573358b54ae05f8c23a452f657493e3 files/bitchx-1.0.19-r4-gentoo.diff 332
-MD5 2573358b54ae05f8c23a452f657493e3 files/bitchx-1.0.19-security.patch 332
-MD5 04374fc6080f46b1c3e9318e3ab657cf files/bitchx-1.0.19-security2.patch 5529
+MD5 3b4e5923d1c18b01092e2d43b2989d5f files/digest-bitchx-1.0.19-r4 70
+MD5 10a57b14bb58910e1f373fbc1b8b2197 files/bitchx-1.0.19-cjk.patch 7050
 MD5 3b4e5923d1c18b01092e2d43b2989d5f files/digest-bitchx-1.0.19-r1 70
 MD5 3b4e5923d1c18b01092e2d43b2989d5f files/digest-bitchx-1.0.19-r2 70
 MD5 cbd7411b65cfa8370ea570ff3daa9ab9 files/digest-bitchx-1.0.19-r3 136
-MD5 3b4e5923d1c18b01092e2d43b2989d5f files/digest-bitchx-1.0.19-r4 70
+MD5 2573358b54ae05f8c23a452f657493e3 files/bitchx-1.0.19-security.patch 332
+MD5 04374fc6080f46b1c3e9318e3ab657cf files/bitchx-1.0.19-security2.patch 5529
 MD5 cbd7411b65cfa8370ea570ff3daa9ab9 files/digest-bitchx-1.0.19-r5 136
+MD5 6a18811962d6992f9175f98d771d3d30 files/bitchx-1.0.19-gcc-3.3.patch 472
diff --git a/net-irc/bitchx/bitchx-1.0.19-r5.ebuild b/net-irc/bitchx/bitchx-1.0.19-r5.ebuild
index c2fbeb940b5d..a42a0ecd0bea 100644
--- a/net-irc/bitchx/bitchx-1.0.19-r5.ebuild
+++ b/net-irc/bitchx/bitchx-1.0.19-r5.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/bitchx/bitchx-1.0.19-r5.ebuild,v 1.3 2003/03/24 10:35:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.19-r5.ebuild,v 1.4 2003/06/16 20:50:59 lu_zero Exp $
 
 inherit flag-o-matic eutils
 
@@ -28,19 +28,19 @@ replace-flags -O[3-9] -O2
 DEPEND=">=sys-libs/ncurses-5.1 
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	xmms? ( media-sound/xmms )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
 	ncurses? ( sys-libs/ncurses )
 	esd? ( >=media-sound/esound-0.2.5
 		>=media-libs/audiofile-0.1.5 )
 	gtk? ( =x11-libs/gtk+-1.2*
-		>=media-libs/imlib-1.9.10-r1 )"
+		>=media-libs/imlib-1.9.10-r1 )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${S}
 
 	use cjk && epatch ${FILESDIR}/${P}-cjk.patch
-
+	epatch ${FILESDIR}/${P}-gcc-3.3.patch
 	epatch ${FILESDIR}/${P}-security.patch || die
 	epatch ${FILESDIR}/${P}-security2.patch || die
 }
@@ -62,8 +62,9 @@ src_compile() {
 		&& myconf="${myconf} --enable-sound" \
 		|| myconf="${myconf} --disable-sound"
 	
-	use gtk \
-	    || myconf="${myconf} --without-gtk"
+	use gtk && use gnome\
+	    && myconf="${myconf} --with-gtk" \
+		|| myconf="${myconf} --without-gtk"
 
 	use ipv6 \
 		&& myconf="${myconf} --enable-ipv6" \
@@ -85,12 +86,13 @@ src_compile() {
 	sed -e "s/#undef LATIN1/#define LATIN1 ON/;" \
 		${S}/include/config.h.orig > \
 		${S}/include/config.h 
-
-	econf \
+	#ugly workaround
+	use gtk && use gnome && CFLAGS="${CFLAGS} -I/usr/include/gnome-1.0"
+	
+	econf CFLAGS="${CFLAGS}" \
 		--enable-cdrom \
 		--with-plugins \
 		${myconf} || die
-
 	emake || die
 
 }
diff --git a/net-irc/bitchx/files/bitchx-1.0.19-gcc-3.3.patch b/net-irc/bitchx/files/bitchx-1.0.19-gcc-3.3.patch
new file mode 100644
index 000000000000..a8709735ab24
--- /dev/null
+++ b/net-irc/bitchx/files/bitchx-1.0.19-gcc-3.3.patch
@@ -0,0 +1,12 @@
+diff -ruN BitchX.orig/source/status.c BitchX/source/status.c
+--- BitchX.orig/source/status.c	2003-06-16 21:31:15.000000000 +0200
++++ BitchX/source/status.c	2003-06-16 21:31:44.000000000 +0200
+@@ -1213,7 +1213,7 @@
+  * current-type window, although i think they should go to all windows.
+  */
+ #define STATUS_VAR(x) \
+-static	char	*status_user ## x ## (Window *window)			\
++static	char	*status_user ## x  (Window *window)			\
+ {									\
+ 	char	*text;							\
+ 									\