Attachment #198941 for bug #232962

View | Details | Raw Unified | Return to bug 232962
Collapse All | Expand All




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 \

		x2goclient-cli:net/x2goclient-cli

USES=		qmake qt:4
USE_XORG=	x11 xpm
USE_QT=		corelib gui network svg \
		linguisttools_build moc_build rcc_build uic_build
QMAKE_ARGS=	QMAKE_LRELEASE="${LRELEASE}"


Lines 1-4 Link Here

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

Return to bug 232962

Lines 12-19 Link Here

(-)Makefile (-4 / +2 lines)
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	BROKEN= fails to build
16
17	# Avoid clash with libssh from base	15	# Avoid clash with libssh from base
18	BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh	16	BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh
19	LIB_DEPENDS= libcups.so:print/cups \	17	LIB_DEPENDS= libcups.so:print/cups \
Lines 22-29 Link Here
22	x2goclient-cli:net/x2goclient-cli	20	x2goclient-cli:net/x2goclient-cli
23		21
24	USES= qmake qt:4	22	USES= qmake qt:4
25	USE_XORG= xpm	23	USE_XORG= x11 xpm
26	USE_QT= gui network svg \	24	USE_QT= corelib gui network svg \
27	linguisttools_build moc_build rcc_build uic_build	25	linguisttools_build moc_build rcc_build uic_build
28	QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}"	26	QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}"
29		27