ports/86257
Victor Semionov
victor at vmpbg.com
Sun Sep 18 22:00:44 UTC 2005
The following reply was made to PR ports/86257; it has been noted by GNATS.
From: Victor Semionov <victor at vmpbg.com>
To: pav at freebsd.org,
bug-followup at 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>
+
+ //
More information about the freebsd-ports-bugs
mailing list