cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch x2goclient from Qt4 to Qt5.

Browse Source
This commit is contained in:
rsadowski 2020-02-21 16:05:36 +00:00
parent b1737954fd
commit 2a6546242c
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
x11/x2goclient/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2019/07/12 20:51:25 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2020/02/21 16:05:36 rsadowski Exp $
COMMENT = Qt4 client for the X2Go system
COMMENT = Qt client for the X2Go system
DISTNAME = x2goclient-4.1.2.1
REVISION = 2
REVISION = 3
CATEGORIES = x11
@ -14,29 +14,25 @@ MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# GPLv2+
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} ICE QtGui QtNetwork QtSvg SM X11
WANTLIB += Xext Xi Xinerama Xpm Xrender c cups fontconfig freetype
WANTLIB += ldap m ssh
COMPILER = base-clang ports-gcc base-gcc
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Widgets
WANTLIB += Qt5X11Extras X11 Xpm c cups ldap m ssh
MASTER_SITES = https://code.x2go.org/releases/source/x2goclient/
MODULES += x11/qt4
MODULES = x11/qt5
LIB_DEPENDS += security/libssh>=0.8.4 \
databases/openldap \
print/cups,-libs
LIB_DEPENDS = databases/openldap \
print/cups,-libs \
security/libssh>=0.8.4 \
x11/qt5/qtx11extras
RUN_DEPENDS += x11/nx/nxcomp \
RUN_DEPENDS = x11/nx/nxcomp \
x11/nx/nxproxy \
shells/bash
DOCSDIR = ${PREFIX}/share/doc/x2goclient
EXAMPLESDIR = ${PREFIX}/share/examples/x2goclient
LRELEASE = ${LOCALBASE}/bin/lrelease4
do-configure:
find ${WRKSRC} -type f -iname "*.cpp" -exec \
perl -pi -e 's,Q_OS_LINUX,Q_OS_UNIX,g;' \
@ -46,8 +42,8 @@ do-configure:
-e 's,#include <linux/fs.h>,,g;' {} \;
sed -i -e 's,nxproxy -S nx,${LOCALBASE}/NX/bin/nxproxy -S nx,' \
${WRKSRC}/src/onmainwindow.cpp
cd ${WRKSRC} && ${LRELEASE} x2goclient.pro \
&& ${MODQT4_QMAKE} x2goclient.pro
cd ${WRKSRC} && ${MODQT_LRELEASE} x2goclient.pro \
&& ${MODQT_QMAKE} x2goclient.pro
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/x2goclient ${PREFIX}/bin

16
x11/x2goclient/patches/patch-src_sshprocess_cpp
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-src_sshprocess_cpp,v 1.1.1.1 2017/06/08 18:05:04 rsadowski Exp $
--- src/sshprocess.cpp.orig Tue Jul 28 22:40:25 2015
+++ src/sshprocess.cpp Tue Jul 28 22:41:01 2015
$OpenBSD: patch-src_sshprocess_cpp,v 1.2 2020/02/21 16:05:36 rsadowski Exp $
Index: src/sshprocess.cpp
--- src/sshprocess.cpp.orig
+++ src/sshprocess.cpp
@@ -23,6 +23,8 @@
#include <QUuid>
@ -10,3 +11,12 @@ $OpenBSD: patch-src_sshprocess_cpp,v 1.1.1.1 2017/06/08 18:05:04 rsadowski Exp $
#ifndef Q_OS_WIN
#include <arpa/inet.h>
#include <netinet/tcp.h>
@@ -140,7 +142,7 @@ void SshProcess::tunnelLoop()
address.sin_family=AF_INET;
address.sin_addr.s_addr=htonl(INADDR_LOOPBACK);
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;