From nobody@FreeBSD.org  Sat Sep 17 15:11:13 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 69B5916A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 Sep 2005 15:11:13 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DC17043D45
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 Sep 2005 15:11:12 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j8HFBAh9037444
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 17 Sep 2005 15:11:10 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id j8HFBAhN037443;
	Sat, 17 Sep 2005 15:11:10 GMT
	(envelope-from nobody)
Message-Id: <200509171511.j8HFBAhN037443@www.freebsd.org>
Date: Sat, 17 Sep 2005 15:11:10 GMT
From: Victor Semionov <semionov@mail.bg>
To: freebsd-gnats-submit@FreeBSD.org
Subject: New port: net/vyqchat A Qt LAN chat, compatible with Vypress Chat(TM)
X-Send-Pr-Version: www-2.3

>Number:         86257
>Category:       ports
>Synopsis:       New port: net/vyqchat A Qt LAN chat, compatible with Vypress Chat(TM)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 17 15:20:04 GMT 2005
>Closed-Date:    Sat Sep 17 22:41:35 GMT 2005
>Last-Modified:  Mon Sep 19 15:30:04 GMT 2005
>Originator:     Victor Semionov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
Devian
>Environment:
FreeBSD neon.devian.bg 5.4-STABLE FreeBSD 5.4-STABLE #0: Thu Sep 15 23:03:53 EEST 2005     root@neon.devian.bg:/usr/obj/usr/src/sys/NEONKERN  i386

>Description:
VyQChat is a real-time, text-based, serverless chat program dedicated to LANs, that runs on Linux using Qt/X11 library. It is almost 100% compatible with Vypress Chat(TM) for Windows. It allows you to chat with friends on public or private channels, send and recieve messages etc. The GUI is meant to be user-friendly and lets you to do most things with mouse. There is also optional sound support. VyQChat has been written in C++ and requires Qt library, version 3.x.

>How-To-Repeat:
      
>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       vyqchat
#       vyqchat/files
#       vyqchat/files/patch-src-uuid.cpp
#       vyqchat/files/patch-src-settings.cpp
#       vyqchat/Makefile
#       vyqchat/pkg-plist
#       vyqchat/pkg-descr
#       vyqchat/distinfo
#
echo c - vyqchat
mkdir -p vyqchat > /dev/null 2>&1
echo c - vyqchat/files
mkdir -p vyqchat/files > /dev/null 2>&1
echo x - vyqchat/files/patch-src-uuid.cpp
sed 's/^X//' >vyqchat/files/patch-src-uuid.cpp << 'END-of-vyqchat/files/patch-src-uuid.cpp'
X--- src/uuid.cpp        Mon Jul 18 21:54:08 2005
X+++ src/uuid.cpp        Sun Aug  7 17:49:40 2005
X@@ -12,7 +12,7 @@
X
X #include "uuid.h"
X #include <qstring.h>
X-#include <openssl/rand.h>
X+#include <fcntl.h>
X
X UUID::UUID(): QByteArray(UUID_LEN)/*{{{*/
X {
X@@ -35,7 +35,9 @@
X
X void UUID::generate()/*{{{*/
X {
X-      RAND_bytes((unsigned char *)data(), UUID_LEN);
X+      int rfd = open("/dev/random", O_RDONLY);
X+      read(rfd, (void *)data(), UUID_LEN);
X+      close(rfd);
X }/*}}}*/
X
X void UUID::set(const unsigned char *data)/*{{{*/
END-of-vyqchat/files/patch-src-uuid.cpp
echo x - vyqchat/files/patch-src-settings.cpp
sed 's/^X//' >vyqchat/files/patch-src-settings.cpp << 'END-of-vyqchat/files/patch-src-settings.cpp'
X--- src/settings.cpp    Mon Jul 18 21:54:08 2005
X+++ src/settings.cpp    Sun Aug  7 15:59:58 2005
X@@ -14,8 +14,8 @@
X #include "settings.h"
X #include <unistd.h>
X #include <sys/ioctl.h>
X-#include <net/if.h>
X #include <sys/socket.h>
X+#include <net/if.h>
X #include <sys/types.h>
X #include <arpa/inet.h>
X #include <stdlib.h>
END-of-vyqchat/files/patch-src-settings.cpp
echo x - vyqchat/Makefile
sed 's/^X//' >vyqchat/Makefile << 'END-of-vyqchat/Makefile'
X# New ports collection makefile for:   vyqchat
X# Date created:        25 August 2005
X# Whom:                vic_semionov
X#
X# $FreeBSD$
X#
X
XPORTNAME=      vyqchat
XPORTVERSION=   0.2.8
XCATEGORIES=    net
XMASTER_SITES=  http://linux.bydg.org/~yogin/
X
XMAINTAINER=    semionov@mail.bg
XCOMMENT=       A Qt LAN chat, compatible with Vypress Chat(TM)
X
XUSE_QT_VER=    3
XUSE_GMAKE=     yes
XGNU_CONFIGURE= yes
XQTCFGLIBS=     ${PTHREAD_LIBS}
X
XCONFIGURE_ARGS+=    --with-Qt-dir=${QT_PREFIX}
X
X.if !defined(WITHOUT_ARTS)
XLIB_DEPENDS+=       artsc:${PORTSDIR}/audio/arts
X.else
XCONFIGURE_ARGS+=    --without-arts
X.endif
X
X.if defined(WITH_LIBAO)
XLIB_DEPENDS+=       ao:${PORTSDIR}/audio/libao
X.else
XCONFIGURE_ARGS+=    --without-libao
X.endif
X
X.include <bsd.port.mk>
END-of-vyqchat/Makefile
echo x - vyqchat/pkg-plist
sed 's/^X//' >vyqchat/pkg-plist << 'END-of-vyqchat/pkg-plist'
Xbin/vyqchat
Xshare/vyqchat/default/channel_alert.png
Xshare/vyqchat/default/channel_normal.png
Xshare/vyqchat/default/channel.png
Xshare/vyqchat/default/comm.png
Xshare/vyqchat/default/enter.png
Xshare/vyqchat/default/info.png
Xshare/vyqchat/default/massmessage.png
Xshare/vyqchat/default/message.png
Xshare/vyqchat/default/priv_alert.png
Xshare/vyqchat/default/priv.png
Xshare/vyqchat/default/settings.png
Xshare/vyqchat/default/user_away.png
Xshare/vyqchat/default/user_dnd.png
Xshare/vyqchat/default/user_offline.png
Xshare/vyqchat/default/user.png
Xshare/vyqchat/default/themeinfo
Xshare/vyqchat/crystal/beep.png
Xshare/vyqchat/crystal/cancel.png
Xshare/vyqchat/crystal/channel_alert.png
Xshare/vyqchat/crystal/channel_normal.png
Xshare/vyqchat/crystal/channel.png
Xshare/vyqchat/crystal/comm.png
Xshare/vyqchat/crystal/enter.png
Xshare/vyqchat/crystal/info.png
Xshare/vyqchat/crystal/massmessage.png
Xshare/vyqchat/crystal/message.png
Xshare/vyqchat/crystal/priv_alert.png
Xshare/vyqchat/crystal/priv.png
Xshare/vyqchat/crystal/settings.png
Xshare/vyqchat/crystal/user_away.png
Xshare/vyqchat/crystal/user_dnd.png
Xshare/vyqchat/crystal/user_offline.png
Xshare/vyqchat/crystal/user.png
Xshare/vyqchat/crystal/themeinfo
Xshare/vyqchat/tr/vyqchat_pl.qm
Xshare/vyqchat/tr/vyqchat_ru.qm
Xshare/vyqchat/tr/vyqchat_tr.qm
X@dirrm share/vyqchat/default
X@dirrm share/vyqchat/crystal
X@dirrm share/vyqchat/tr
X@dirrm share/vyqchat
END-of-vyqchat/pkg-plist
echo x - vyqchat/pkg-descr
sed 's/^X//' >vyqchat/pkg-descr << 'END-of-vyqchat/pkg-descr'
XVyQChat is a real-time, text-based, serverless chat program dedicated to LANs,
Xthat runs on Linux using Qt/X11 library. It is almost 100% compatible with
XVypress Chat(TM) for Windows. It allows you to chat with friends on public or
Xprivate channels, send and recieve messages etc. The GUI is meant to be
Xuser-friendly and lets you to do most things with mouse. There is also optional
Xsound support. VyQChat has been written in C++ and requires Qt library, version
X3.x.
X
XWWW: http://linux.bydg.org/~yogin/
X
X- Victor Semionov
Xsemionov@mail.bg
END-of-vyqchat/pkg-descr
echo x - vyqchat/distinfo
sed 's/^X//' >vyqchat/distinfo << 'END-of-vyqchat/distinfo'
XMD5 (vyqchat-0.2.8.tar.gz) = 67974bc5df1ed0d63785d04325444d4f
XSIZE (vyqchat-0.2.8.tar.gz) = 413505
END-of-vyqchat/distinfo
exit

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sat Sep 17 22:41:13 GMT 2005 
State-Changed-Why:  
New port added, thank you! 

Port does not compile on FreeBSD 4.X with gcc 2.95: 
http://hood.oook.cz/tb/errors/4-i386/vyqchat-0.2.8.log 

Do you think you can fix this? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86257 

From: Victor Semionov <victor@vmpbg.com>
To: pav@freebsd.org,
 bug-followup@freebsd.org
Cc:  
Subject: Re: ports/86257
Date: Mon, 19 Sep 2005 00:59:29 +0300

 > New port added, thank you!
 >
 > Port does not compile on FreeBSD 4.X with gcc 2.95:
 > http://hood.oook.cz/tb/errors/4-i386/vyqchat-0.2.8.log
 >
 > Do you think you can fix this?
 
 Thank you!
 Yes, I fixed the gcc-2.95 issues. I'm sending a patch against the port. I've 
 tested it on 4.11-release and 5-stable.
 
 The patch includes:
  -small syntactical changes that fix the compile errors
  -added a missing dependency libsndfile to the port makefile
  -new patch file against src/user.cpp - fixes a segmentation fault when the 
 program is compiled with optimisations with gcc-2.95
 Here's the patch:
 
 diff -urN /root/vyqchat/Makefile ./Makefile
 --- /root/vyqchat/Makefile	Sun Sep 18 01:40:23 2005
 +++ ./Makefile	Sun Sep 18 23:05:54 2005
 @@ -23,19 +23,17 @@
  .if !defined(WITHOUT_ARTS)
  LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/arts
  .else
 -CONFIGURE_ARGS+=--without-arts
 +CONFIGURE_ARGS+= --without-arts
  .endif
  
  .if defined(WITH_LIBAO)
  LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
  .else
 -CONFIGURE_ARGS+=--without-libao
 +CONFIGURE_ARGS+= --without-libao
  .endif
  
 -.include <bsd.port.pre.mk>
 -
 -.if ${OSVERSION} < 500000
 -BROKEN=		"Does not compile"
 +.if !defined(WITHOUT_ARTS) || defined(WITH_LIBAO)
 +LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff 
 -urN /root/vyqchat/files/patch-src-appwin.cpp ./files/patch-src-appwin.cpp
 --- /root/vyqchat/files/patch-src-appwin.cpp	Thu Jan  1 02:00:00 1970
 +++ ./files/patch-src-appwin.cpp	Sun Sep 18 22:57:34 2005
 @@ -0,0 +1,11 @@
 +--- src/appwin.cpp	Tue Jul 19 18:54:11 2005
 ++++ src/appwin.cpp	Sun Sep 18 21:22:23 2005
 +@@ -1265,7 +1265,7 @@
 + 	chattab->write(MAIN_CHANNEL, tmp, special_color);
 + 	if (settings->getScriptEnabled(EventInfo))
 + 		Scripting::executeInfoRequest(settings->getScriptFileName(EventInfo), 
 QDateTime::currentDateTime(), from);
 +-	vc->vc_inforeqack(userslist->getIP(from), from, nick, 
 settings->getHostname(), nick, settings->getIP().toString(), 
 settings->getHideChannels() ? MAIN_CHANNEL: chattab->channelsList(), 
 (status!=STATUS_NORMAL) ? autoanswer : QString(""));
 ++	vc->vc_inforeqack(userslist->getIP(from), from, nick, 
 settings->getHostname(), nick, settings->getIP().toString(), 
 settings->getHideChannels() ? QString(MAIN_CHANNEL): chattab->channelsList(), 
 (status!=STATUS_NORMAL) ? autoanswer : QString(""));
 + }/*}}}*/
 + 
 + void MainWindow::on_vc_inforeqack(const QHostAddress &source, const QString 
 &to, const QString &from, const QString &host, const QString &name, const 
 QString &ip, const QString &channels, const QString &answer, const QString 
 &computer, const QString &software, bool utf)/*{{{*/
 diff 
 -urN /root/vyqchat/files/patch-src-settings.cpp ./files/patch-src-settings.cpp
 --- /root/vyqchat/files/patch-src-settings.cpp	Sun Sep 18 01:40:23 2005
 +++ ./files/patch-src-settings.cpp	Sun Sep 18 22:57:43 2005
 @@ -1,12 +1,13 @@
 ---- src/settings.cpp    Mon Jul 18 21:54:08 2005
 -+++ src/settings.cpp    Sun Aug  7 15:59:58 2005
 -@@ -14,8 +14,8 @@
 +--- src/settings.cpp	Mon Jul 18 21:54:08 2005
 ++++ src/settings.cpp	Sun Sep 18 21:20:55 2005
 +@@ -14,8 +14,9 @@
   #include "settings.h"
   #include <unistd.h>
   #include <sys/ioctl.h>
  -#include <net/if.h>
   #include <sys/socket.h>
  +#include <net/if.h>
 ++#include <netinet/in.h>
   #include <sys/types.h>
   #include <arpa/inet.h>
   #include <stdlib.h>
 diff 
 -urN /root/vyqchat/files/patch-src-settingsdlg.cpp ./files/patch-src-settingsdlg.cpp
 --- /root/vyqchat/files/patch-src-settingsdlg.cpp	Thu Jan  1 02:00:00 1970
 +++ ./files/patch-src-settingsdlg.cpp	Sun Sep 18 22:57:51 2005
 @@ -0,0 +1,11 @@
 +--- src/settingsdlg.cpp	Mon Jul 18 21:54:08 2005
 ++++ src/settingsdlg.cpp	Sun Sep 18 21:21:08 2005
 +@@ -400,7 +400,7 @@
 + 		
 settings->setSoundType(static_cast<Sound::SoundType>(opt_snddev->id(opt_snddev->selected())));
 + 		sndcfgchanged = true;
 + 	}
 +-	settings->setEncodingName(l_enc->currentItem() ? l_enc->currentText() : 
 "");
 ++	settings->setEncodingName(l_enc->currentItem() ? l_enc->currentText() : 
 QString(""));
 + 	if (b_useutf->isChecked() != settings->getUseUTF())
 + 		settings->setUseUTF(b_useutf->isChecked());
 + 	settings->setHideChannels(b_hide->isChecked());
 diff -urN /root/vyqchat/files/patch-src-user.cpp ./files/patch-src-user.cpp
 --- /root/vyqchat/files/patch-src-user.cpp	Thu Jan  1 02:00:00 1970
 +++ ./files/patch-src-user.cpp	Sun Sep 18 22:58:04 2005
 @@ -0,0 +1,13 @@
 +--- src/user.cpp	Mon Jul 18 21:54:08 2005
 ++++ src/user.cpp	Sun Sep 18 21:48:55 2005
 +@@ -42,7 +42,9 @@
 + 
 + int User::height(const QListBox *lb) const/*{{{*/
 + {
 +-	return QMAX(lb->fontMetrics().height(), 
 Icons::icon_user.pixmap(QIconSet::Small, true).height());
 ++	int h1 = lb->fontMetrics().height();
 ++	int h2 = Icons::icon_user.pixmap(QIconSet::Small, true).height();
 ++	return QMAX(h1, h2);
 + }/*}}}*/
 + 
 + int User::width(const QListBox *lb) const/*{{{*/
 diff -urN /root/vyqchat/files/patch-src-uuid.cpp ./files/patch-src-uuid.cpp
 --- /root/vyqchat/files/patch-src-uuid.cpp	Sun Sep 18 01:40:23 2005
 +++ ./files/patch-src-uuid.cpp	Sun Sep 18 22:58:38 2005
 @@ -1,15 +1,16 @@
 ---- src/uuid.cpp.orig	Mon Jul 18 20:54:08 2005
 -+++ src/uuid.cpp	Sat Sep 17 23:03:48 2005
 -@@ -12,7 +12,7 @@
 +--- src/uuid.cpp	Mon Jul 18 21:54:08 2005
 ++++ src/uuid.cpp	Sun Sep 18 21:21:21 2005
 +@@ -12,7 +12,8 @@
   
   #include "uuid.h"
   #include <qstring.h>
  -#include <openssl/rand.h>
 ++#include <unistd.h>
  +#include <fcntl.h>
   
   UUID::UUID(): QByteArray(UUID_LEN)/*{{{*/
   {
 -@@ -35,7 +35,9 @@
 +@@ -35,7 +36,9 @@
   
   void UUID::generate()/*{{{*/
   {
 diff 
 -urN /root/vyqchat/files/patch-src-vcprotocol.cpp ./files/patch-src-vcprotocol.cpp
 --- /root/vyqchat/files/patch-src-vcprotocol.cpp	Thu Jan  1 02:00:00 1970
 +++ ./files/patch-src-vcprotocol.cpp	Sun Sep 18 22:58:30 2005
 @@ -0,0 +1,10 @@
 +--- src/vcprotocol.cpp	Mon Jul 18 21:58:26 2005
 ++++ src/vcprotocol.cpp	Sun Sep 18 21:21:41 2005
 +@@ -20,6 +20,7 @@
 + #include <unistd.h>
 + #include <fcntl.h>
 + #include <stdlib.h>
 ++#include <time.h>
 + #include <iostream>
 + 
 + //

From: Pav Lucistnik <pav@FreeBSD.org>
To: Victor Semionov <victor@vmpbg.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/86257
Date: Mon, 19 Sep 2005 09:27:34 +0200

 --=-HK3nqjtMjkEq5aWItJv2
 Content-Type: text/plain; charset=ISO8859-2
 Content-Transfer-Encoding: quoted-printable
 
 Victor Semionov p=ED=B9e v po 19. 09. 2005 v 00:59 +0300:
 
 > > New port added, thank you!
 > >
 > > Port does not compile on FreeBSD 4.X with gcc 2.95:
 > > http://hood.oook.cz/tb/errors/4-i386/vyqchat-0.2.8.log
 > >
 > > Do you think you can fix this?
 >=20
 > Thank you!
 > Yes, I fixed the gcc-2.95 issues. I'm sending a patch against the port. I=
 've=20
 > tested it on 4.11-release and 5-stable.
 >=20
 > The patch includes:
 >  -small syntactical changes that fix the compile errors
 >  -added a missing dependency libsndfile to the port makefile
 >  -new patch file against src/user.cpp - fixes a segmentation fault when t=
 he=20
 > program is compiled with optimisations with gcc-2.95
 > Here's the patch:
 
 The patch got corrupted by your mailer - lines got wrapped. Can you
 please resend properly?
 
 --=20
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 I will give you a name, and I shall call you Sting.
 
 --=-HK3nqjtMjkEq5aWItJv2
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Description: This is a digitally signed message part
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 
 iD8DBQBDLmhmntdYP8FOsoIRAlcuAJ9wUZszojV1ZI4N9L3tfpAI6pjPTACgvExW
 ECqcqqwsXGfHM9Yiaa5YX/I=
 =VEou
 -----END PGP SIGNATURE-----
 
 --=-HK3nqjtMjkEq5aWItJv2--

From: Victor Semionov <victor@vmpbg.com>
To: pav@freebsd.org,
 bug-followup@freebsd.org
Cc:  
Subject: Re: ports/86257
Date: Mon, 19 Sep 2005 18:20:46 +0300

 > The patch got corrupted by your mailer - lines got wrapped. Can you
 > please resend properly?
 Sure, sorry about that.
 
 diff -urN vyqchat.old/Makefile vyqchat/Makefile
 --- vyqchat.old/Makefile	Sun Sep 18 01:40:23 2005
 +++ vyqchat/Makefile	Mon Sep 19 16:44:57 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	vyqchat
  PORTVERSION=	0.2.8
 +PORTREVISION=	1
  CATEGORIES=	net
  MASTER_SITES=	http://linux.bydg.org/~yogin/
  
 @@ -23,19 +24,17 @@
  .if !defined(WITHOUT_ARTS)
  LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/arts
  .else
 -CONFIGURE_ARGS+=--without-arts
 +CONFIGURE_ARGS+= --without-arts
  .endif
  
  .if defined(WITH_LIBAO)
  LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
  .else
 -CONFIGURE_ARGS+=--without-libao
 +CONFIGURE_ARGS+= --without-libao
  .endif
  
 -.include <bsd.port.pre.mk>
 -
 -.if ${OSVERSION} < 500000
 -BROKEN=		"Does not compile"
 +.if !defined(WITHOUT_ARTS) || defined(WITH_LIBAO)
 +LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -urN vyqchat.old/files/patch-src-appwin.cpp vyqchat/files/patch-src-appwin.cpp
 --- vyqchat.old/files/patch-src-appwin.cpp	Thu Jan  1 02:00:00 1970
 +++ vyqchat/files/patch-src-appwin.cpp	Mon Sep 19 16:43:38 2005
 @@ -0,0 +1,11 @@
 +--- src/appwin.cpp	Tue Jul 19 18:54:11 2005
 ++++ src/appwin.cpp	Sun Sep 18 21:22:23 2005
 +@@ -1265,7 +1265,7 @@
 + 	chattab->write(MAIN_CHANNEL, tmp, special_color);
 + 	if (settings->getScriptEnabled(EventInfo))
 + 		Scripting::executeInfoRequest(settings->getScriptFileName(EventInfo), QDateTime::currentDateTime(), from);
 +-	vc->vc_inforeqack(userslist->getIP(from), from, nick, settings->getHostname(), nick, settings->getIP().toString(), settings->getHideChannels() ? MAIN_CHANNEL: chattab->channelsList(), (status!=STATUS_NORMAL) ? autoanswer : QString(""));
 ++	vc->vc_inforeqack(userslist->getIP(from), from, nick, settings->getHostname(), nick, settings->getIP().toString(), settings->getHideChannels() ? QString(MAIN_CHANNEL): chattab->channelsList(), (status!=STATUS_NORMAL) ? autoanswer : QString(""));
 + }/*}}}*/
 + 
 + void MainWindow::on_vc_inforeqack(const QHostAddress &source, const QString &to, const QString &from, const QString &host, const QString &name, const QString &ip, const QString &channels, const QString &answer, const QString &computer, const QString &software, bool utf)/*{{{*/
 diff -urN vyqchat.old/files/patch-src-settings.cpp vyqchat/files/patch-src-settings.cpp
 --- vyqchat.old/files/patch-src-settings.cpp	Sun Sep 18 01:40:23 2005
 +++ vyqchat/files/patch-src-settings.cpp	Mon Sep 19 16:43:38 2005
 @@ -1,12 +1,13 @@
 ---- src/settings.cpp    Mon Jul 18 21:54:08 2005
 -+++ src/settings.cpp    Sun Aug  7 15:59:58 2005
 -@@ -14,8 +14,8 @@
 +--- src/settings.cpp	Mon Jul 18 21:54:08 2005
 ++++ src/settings.cpp	Sun Sep 18 21:20:55 2005
 +@@ -14,8 +14,9 @@
   #include "settings.h"
   #include <unistd.h>
   #include <sys/ioctl.h>
  -#include <net/if.h>
   #include <sys/socket.h>
  +#include <net/if.h>
 ++#include <netinet/in.h>
   #include <sys/types.h>
   #include <arpa/inet.h>
   #include <stdlib.h>
 diff -urN vyqchat.old/files/patch-src-settingsdlg.cpp vyqchat/files/patch-src-settingsdlg.cpp
 --- vyqchat.old/files/patch-src-settingsdlg.cpp	Thu Jan  1 02:00:00 1970
 +++ vyqchat/files/patch-src-settingsdlg.cpp	Mon Sep 19 16:43:38 2005
 @@ -0,0 +1,11 @@
 +--- src/settingsdlg.cpp	Mon Jul 18 21:54:08 2005
 ++++ src/settingsdlg.cpp	Sun Sep 18 21:21:08 2005
 +@@ -400,7 +400,7 @@
 + 		settings->setSoundType(static_cast<Sound::SoundType>(opt_snddev->id(opt_snddev->selected())));
 + 		sndcfgchanged = true;
 + 	}
 +-	settings->setEncodingName(l_enc->currentItem() ? l_enc->currentText() : "");
 ++	settings->setEncodingName(l_enc->currentItem() ? l_enc->currentText() : QString(""));
 + 	if (b_useutf->isChecked() != settings->getUseUTF())
 + 		settings->setUseUTF(b_useutf->isChecked());
 + 	settings->setHideChannels(b_hide->isChecked());
 diff -urN vyqchat.old/files/patch-src-user.cpp vyqchat/files/patch-src-user.cpp
 --- vyqchat.old/files/patch-src-user.cpp	Thu Jan  1 02:00:00 1970
 +++ vyqchat/files/patch-src-user.cpp	Mon Sep 19 16:43:38 2005
 @@ -0,0 +1,13 @@
 +--- src/user.cpp	Mon Jul 18 21:54:08 2005
 ++++ src/user.cpp	Sun Sep 18 21:48:55 2005
 +@@ -42,7 +42,9 @@
 + 
 + int User::height(const QListBox *lb) const/*{{{*/
 + {
 +-	return QMAX(lb->fontMetrics().height(), Icons::icon_user.pixmap(QIconSet::Small, true).height());
 ++	int h1 = lb->fontMetrics().height();
 ++	int h2 = Icons::icon_user.pixmap(QIconSet::Small, true).height();
 ++	return QMAX(h1, h2);
 + }/*}}}*/
 + 
 + int User::width(const QListBox *lb) const/*{{{*/
 diff -urN vyqchat.old/files/patch-src-uuid.cpp vyqchat/files/patch-src-uuid.cpp
 --- vyqchat.old/files/patch-src-uuid.cpp	Sun Sep 18 01:40:23 2005
 +++ vyqchat/files/patch-src-uuid.cpp	Mon Sep 19 16:43:38 2005
 @@ -1,15 +1,16 @@
 ---- src/uuid.cpp.orig	Mon Jul 18 20:54:08 2005
 -+++ src/uuid.cpp	Sat Sep 17 23:03:48 2005
 -@@ -12,7 +12,7 @@
 +--- src/uuid.cpp	Mon Jul 18 21:54:08 2005
 ++++ src/uuid.cpp	Sun Sep 18 21:21:21 2005
 +@@ -12,7 +12,8 @@
   
   #include "uuid.h"
   #include <qstring.h>
  -#include <openssl/rand.h>
 ++#include <unistd.h>
  +#include <fcntl.h>
   
   UUID::UUID(): QByteArray(UUID_LEN)/*{{{*/
   {
 -@@ -35,7 +35,9 @@
 +@@ -35,7 +36,9 @@
   
   void UUID::generate()/*{{{*/
   {
 diff -urN vyqchat.old/files/patch-src-vcprotocol.cpp vyqchat/files/patch-src-vcprotocol.cpp
 --- vyqchat.old/files/patch-src-vcprotocol.cpp	Thu Jan  1 02:00:00 1970
 +++ vyqchat/files/patch-src-vcprotocol.cpp	Mon Sep 19 16:43:38 2005
 @@ -0,0 +1,10 @@
 +--- src/vcprotocol.cpp	Mon Jul 18 21:58:26 2005
 ++++ src/vcprotocol.cpp	Sun Sep 18 21:21:41 2005
 +@@ -20,6 +20,7 @@
 + #include <unistd.h>
 + #include <fcntl.h>
 + #include <stdlib.h>
 ++#include <time.h>
 + #include <iostream>
 + 
 + //
>Unformatted:
