1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

net/x2goclient: unbreak the build

While here, adjust USES.

PR:		232962
Submitted by:	w.schwarzenfeld@utanet.at
Approved by:	mentors (implicit)
This commit is contained in:
Koichiro Iwao 2018-11-05 23:52:30 +00:00
parent 18ad73ce30
commit 4fbbbac7c2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=484262
2 changed files with 12 additions and 5 deletions

View File

@ -12,8 +12,6 @@ COMMENT= Qt client for the X2Go system
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= fails to build
# Avoid clash with libssh from base
BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh
LIB_DEPENDS= libcups.so:print/cups \
@ -22,8 +20,8 @@ RUN_DEPENDS= nxproxy:net/nxproxy \
x2goclient-cli:net/x2goclient-cli
USES= qmake qt:4
USE_XORG= xpm
USE_QT= gui network svg \
USE_XORG= x11 xpm
USE_QT= corelib gui network svg \
linguisttools_build moc_build rcc_build uic_build
QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}"

View File

@ -1,4 +1,4 @@
--- src/sshprocess.cpp.orig 2016-03-24 20:39:27 UTC
--- src/sshprocess.cpp.orig 2018-11-04 13:15:51 UTC
+++ src/sshprocess.cpp
@@ -24,6 +24,9 @@
@ -10,6 +10,15 @@
#include <arpa/inet.h>
#include <netinet/tcp.h>
#endif
@@ -140,7 +143,7 @@ void SshProcess::tunnelLoop()
address.sin_family=AF_INET;
address.sin_addr.s_addr=INADDR_ANY;
address.sin_port=htons(localPort);
- if (bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
+ if (::bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
{
QString err=tr("Error binding ")+localHost+":"+QString::number(localPort);
x2goDebug<<err<<endl;
@@ -200,7 +203,7 @@ void SshProcess::startNormal(const QStri
// #endif
if(!masterCon->useKerberos())