Date: Mon, 5 Nov 2018 23:52:31 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484262 - in head/net/x2goclient: . files Message-ID: <201811052352.wA5NqVlM021036@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Mon Nov 5 23:52:30 2018 New Revision: 484262 URL: https://svnweb.freebsd.org/changeset/ports/484262 Log: net/x2goclient: unbreak the build While here, adjust USES. PR: 232962 Submitted by: w.schwarzenfeld@utanet.at Approved by: mentors (implicit) Modified: head/net/x2goclient/Makefile head/net/x2goclient/files/patch-src_sshprocess.cpp Modified: head/net/x2goclient/Makefile ============================================================================== --- head/net/x2goclient/Makefile Mon Nov 5 23:51:03 2018 (r484261) +++ head/net/x2goclient/Makefile Mon Nov 5 23:52:30 2018 (r484262) @@ -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: head/net/x2goclient/files/patch-src_sshprocess.cpp ============================================================================== --- head/net/x2goclient/files/patch-src_sshprocess.cpp Mon Nov 5 23:51:03 2018 (r484261) +++ head/net/x2goclient/files/patch-src_sshprocess.cpp Mon Nov 5 23:52:30 2018 (r484262) @@ -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?201811052352.wA5NqVlM021036>