Date: Tue, 6 Nov 2018 07:16:28 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r484278 - in branches/2018Q4/net/x2goclient: . files Message-ID: <201811060716.wA67GSit050313@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Tue Nov 6 07:16:28 2018 New Revision: 484278 URL: https://svnweb.freebsd.org/changeset/ports/484278 Log: MFH: r484262 net/x2goclient: unbreak the build While here, adjust USES. PR: 232962 Submitted by: w.schwarzenfeld@utanet.at Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/net/x2goclient/Makefile branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net/x2goclient/Makefile ============================================================================== --- branches/2018Q4/net/x2goclient/Makefile Tue Nov 6 06:02:27 2018 (r484277) +++ branches/2018Q4/net/x2goclient/Makefile Tue Nov 6 07:16:28 2018 (r484278) @@ -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}" Modified: branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp ============================================================================== --- branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp Tue Nov 6 06:02:27 2018 (r484277) +++ branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp Tue Nov 6 07:16:28 2018 (r484278) @@ -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())
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811060716.wA67GSit050313>