From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 19 15:30:10 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 645F116A41F for ; Mon, 19 Sep 2005 15:30:10 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0A9743D45 for ; Mon, 19 Sep 2005 15:30:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j8JFU9AA058771 for ; Mon, 19 Sep 2005 15:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j8JFU9iY058770; Mon, 19 Sep 2005 15:30:09 GMT (envelope-from gnats) Date: Mon, 19 Sep 2005 15:30:09 GMT Message-Id: <200509191530.j8JFU9iY058770@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Victor Semionov Cc: Subject: Re: ports/86257 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Victor Semionov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Sep 2005 15:30:10 -0000 The following reply was made to PR ports/86257; it has been noted by GNATS. From: Victor Semionov 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 - -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile" +.if !defined(WITHOUT_ARTS) || defined(WITH_LIBAO) +LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile .endif -.include +.include 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 #include -#include #include +#include ++#include #include #include #include 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(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 -#include ++#include +#include 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 + #include + #include ++#include + #include + + //