pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Qt client for the X2Go remote desktop system
details: https://anonhg.NetBSD.org/pkgsrc/rev/2b40322e8abc
branches: trunk
changeset: 447660:2b40322e8abc
user: hauke <hauke%pkgsrc.org@localhost>
date: Wed Feb 24 18:39:30 2021 +0000
description:
Qt client for the X2Go remote desktop system
diffstat:
x11/Makefile | 4 +-
x11/x2go-client/DESCR | 18 +++
x11/x2go-client/Makefile | 77 +++++++++++++++
x11/x2go-client/PLIST | 12 ++
x11/x2go-client/distinfo | 12 ++
x11/x2go-client/options.mk | 20 +++
x11/x2go-client/patches/patch-Makefile | 54 ++++++++++
x11/x2go-client/patches/patch-src_printwidget.cpp | 15 ++
x11/x2go-client/patches/patch-src_sshmasterconnection.cpp | 16 +++
x11/x2go-client/patches/patch-src_sshprocess.cpp | 45 ++++++++
x11/x2go-client/patches/patch-src_sshprocess.h | 19 +++
x11/x2go-client/patches/patch-src_x2goclientconfig.h | 17 +++
12 files changed, 308 insertions(+), 1 deletions(-)
diffs (truncated from 374 to 300 lines):
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/Makefile
--- a/x11/Makefile Wed Feb 24 18:38:42 2021 +0000
+++ b/x11/Makefile Wed Feb 24 18:39:30 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.917 2021/02/15 15:07:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.918 2021/02/24 18:39:30 hauke Exp $
#
COMMENT= Packages to support the X window system
@@ -300,6 +300,7 @@
SUBDIR+= mxterm
SUBDIR+= neXtaw
SUBDIR+= numlockx
+SUBDIR+= nx-libs
SUBDIR+= ocaml-graphics
SUBDIR+= ocaml-lablgtk
SUBDIR+= ocaml-lablgtk3
@@ -452,6 +453,7 @@
SUBDIR+= wxWindows-docs
SUBDIR+= x11perf
SUBDIR+= x11vnc
+SUBDIR+= x2go-client
SUBDIR+= x2x
SUBDIR+= x3270
SUBDIR+= xaniroc
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/DESCR Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,18 @@
+X2Go is a Remote Desktop solution: It enables you to access a
+computer's graphical desktop over the network.
+
+X2Go works well over a low bandwidth connection.
+
+The Unix computer you are accessing is the X2Go Server (there are ways
+to connect to a Windows computer as well).
+
+You can connect from a computer running Unix, Windows or Mac OS
+X. This computer is the X2Go Client.
+
+Multiple users/clients can access a single X2Go Server at the same
+time, with each user/client having an individual Desktop session by
+default - however, Desktop sharing (Remote Assistance) is possible,
+too.
+
+For the graphical part of remote desktop sessions, X2Go uses No
+Machine NX3 technology under the hood.
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/Makefile Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,77 @@
+# $NetBSD: Makefile,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+DISTNAME= x2goclient-${PKGVER}
+PKGVER= 4.1.2.2
+CATEGORIES= x11 net
+MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/
+
+MAINTAINER= hauke%NetBSD.org@localhost
+HOMEPAGE= http://www.x2go.org/
+COMMENT= Qt client for the X2Go remote desktop system
+
+LICENSE= gnu-gpl-v2
+
+USE_TOOLS+= pkg-config gmake
+USE_LIBTOOL= yes
+
+USE_LANGUAGES= c c++
+
+ICON_THEMES= yes
+
+LIBS+= -lXpm -lcups
+
+DOCDIR= share/doc/x2go
+
+.include "../../mk/bsd.prefs.mk"
+
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_MESSAGE.paths= Fixing absolute paths
+SUBST_FILES.paths= Makefile
+SUBST_VARS.paths+= PREFIX DESTDIR PKG_SYSCONFDIR SH
+SUBST_VARS.paths+= INSTALL_DATA INSTALL_DATA_DIR INSTALL_PROGRAM
+SUBST_VARS.paths+= QMAKE_OPTS LDFLAGS LIBS
+
+SUBST_CLASSES+= os-def
+SUBST_STAGE.os-def= pre-configure
+SUBST_MESSAGE.os-def= Re-purposing Q_OS_LINUX defines for all Unixen
+SUBST_NOOP_OK.os-def= yes
+SUBST_FILES.os-def= src/*.cpp
+SUBST_FILES.os-def+= src/*.h
+# Too broad a brush, but should be dealt with by upstream
+SUBST_SED.os-def= -e 's/Q_OS_LINUX/Q_OS_UNIX/'
+# - because above
+SUBST_SED.os-def+= -e '/<linux\/fs.h>/s|^|//|'
+# Too sweeping, mostly macosx paths
+SUBST_SED.os-def+= -e 's|/usr/local/bin|${PREFIX}\/bin|'
+
+.include "options.mk"
+
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS+= share/applications
+INSTALLATION_DIRS+= ${DOCDIR}
+INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps
+INSTALLATION_DIRS+= share/icons/hicolor/64x64/apps
+INSTALLATION_DIRS+= share/icons/hicolor/32x32/apps
+INSTALLATION_DIRS+= share/icons/hicolor/16x16/apps
+INSTALLATION_DIRS+= share/x2goclient/icons
+
+pre-configure:
+ ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/qmake-qt4
+ ${LN} -sf ${QTDIR}/bin/lrelease ${BUILDLINK_DIR}/bin/lrelease-qt4
+
+post-install:
+ #@${MKDIR} ${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/HOWTO.GPGCARD ${DESTDIR}${PREFIX}/${DOCDIR}
+
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+
+.include "../../print/libcups/buildlink3.mk"
+.include "../../security/libssh/buildlink3.mk"
+.include "../../hauke/nx-libs/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/PLIST Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,12 @@
+@comment $NetBSD: PLIST,v 1.1 2021/02/24 18:39:30 hauke Exp $
+bin/x2goclient
+man/man1/x2goclient.1
+share/applications/x2goclient.desktop
+share/doc/x2go/HOWTO.GPGCARD
+share/icons/hicolor/128x128/apps/x2goclient.png
+share/icons/hicolor/16x16/apps/x2goclient.png
+share/icons/hicolor/32x32/apps/x2goclient.png
+share/icons/hicolor/64x64/apps/x2goclient.png
+share/x2goclient/icons/x2goclient.png
+share/x2goclient/icons/x2goclient.xpm
+share/x2goclient/icons/x2gosession.png
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/distinfo Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+SHA1 (x2goclient-4.1.2.2.tar.gz) = 822924d16f8bb297f6046ff86084e10a46442216
+RMD160 (x2goclient-4.1.2.2.tar.gz) = bc8d71587e5c278632150db0a84836963b791b3e
+SHA512 (x2goclient-4.1.2.2.tar.gz) = 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d
+Size (x2goclient-4.1.2.2.tar.gz) = 2576404 bytes
+SHA1 (patch-Makefile) = 6c431a2a9aac9f1b35061a89221553449d5968e4
+SHA1 (patch-src_printwidget.cpp) = b3b8a9efa43fd6f53ea91c11911a531d3e1d950c
+SHA1 (patch-src_sshmasterconnection.cpp) = 5758273e6a7fd6aeb95f3bd02a08c3fc9b8fcd52
+SHA1 (patch-src_sshprocess.cpp) = ff1da65d92068f7f5e2a958019d3dbd74bff9642
+SHA1 (patch-src_sshprocess.h) = 172c4a54b1b1dc55898aa85b5a7dc42dbec102a5
+SHA1 (patch-src_x2goclientconfig.h) = a98438be46c9fd5c1bbc53ec711ce37c12dc067d
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/options.mk Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.x2go-client
+PKG_SUPPORTED_OPTIONS= ldap pulseaudio
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mldap)
+CPPFLAGS+= -DUSELDAP
+LIBS+= -lldap
+. include "../../databases/openldap-client/buildlink3.mk"
+.else
+# nothing
+.endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+# nothing
+.endif
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/patches/patch-Makefile Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,54 @@
+$NetBSD: patch-Makefile,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+Let pkgsrc framework set build variables
+
+--- Makefile.orig 2020-02-13 10:36:07.000000000 +0000
++++ Makefile
+@@ -4,28 +4,28 @@ TOP_DIR=$(CURDIR)
+ CLIENT_DIR=$(TOP_DIR)/client_build
+ CLIENT_BINARY=$(CLIENT_DIR)/x2goclient
+
+-SHELL=/bin/bash
++SHELL=@SH@
+
+-INSTALL_DIR=install -d -o root -g root -m 755
+-INSTALL_FILE=install -o root -g root -m 644
++INSTALL_DIR=@INSTALL_DATA_DIR@
++INSTALL_FILE=@INSTALL_DATA@
+ INSTALL_SYMLINK=ln -s -f
+-INSTALL_PROGRAM=install -o root -g root -m 755
++INSTALL_PROGRAM=@INSTALL_PROGRAM@
+
+ RM_FILE=rm -f
+ RM_DIR=rmdir -p --ignore-fail-on-non-empty
+
+-DESTDIR=
+-PREFIX=/usr/local
+-ETCDIR=/etc/x2go
++DESTDIR=@DESTDIR@
++PREFIX=@PREFIX@
++ETCDIR=@PKG_SYSCONFDIR@
+ BINDIR=$(PREFIX)/bin
+ SHAREDIR=$(PREFIX)/share
+-MANDIR=$(SHAREDIR)/man
++MANDIR=$(PREFIX)/man
+ QMAKE_BINARY=qmake-qt4
+ LRELEASE_BINARY=lrelease-qt4
+-QMAKE_OPTS=
++QMAKE_OPTS=@QMAKE_OPTS@
+
+-LDFLAGS=
+-LIBS=
++LDFLAGS=@LDFLAGS@
++LIBS=@LIBS@
+
+
+ #####################################################################
+@@ -115,7 +115,6 @@ install_man:
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL_FILE) man/man1/x2goclient.1 $(DESTDIR)$(MANDIR)/man1/x2goclient.1
+- gzip -f $(DESTDIR)$(MANDIR)/man1/x2goclient.1
+
+ uninstall: uninstall_client uninstall_man
+
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/patches/patch-src_printwidget.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/patches/patch-src_printwidget.cpp Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_printwidget.cpp,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+Add missing include
+
+--- src/printwidget.cpp.orig 2019-03-09 16:48:28 UTC
++++ src/printwidget.cpp
+@@ -26,6 +26,8 @@
+ #ifdef Q_OS_WIN
+ #include "wapi.h"
+ #endif
++#include <QButtonGroup>
++
+ PrintWidget::PrintWidget ( QWidget* parent )
+ : QWidget ( parent )
+ {
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/patches/patch-src_sshmasterconnection.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/patches/patch-src_sshmasterconnection.cpp Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_sshmasterconnection.cpp,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+Add missing includes
+
+--- src/sshmasterconnection.cpp.orig 2018-06-25 20:21:49 UTC
++++ src/sshmasterconnection.cpp
+@@ -29,6 +29,9 @@
+ #include <QDir>
+ #include <QTemporaryFile>
+ #ifndef Q_OS_WIN
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #endif
+ #include <math.h>
diff -r 7b8f28e53af3 -r 2b40322e8abc x11/x2go-client/patches/patch-src_sshprocess.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/x2go-client/patches/patch-src_sshprocess.cpp Wed Feb 24 18:39:30 2021 +0000
@@ -0,0 +1,45 @@
+$NetBSD: patch-src_sshprocess.cpp,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+Fix namespace issue
+
+Stomp out bashisms
+
+--- src/sshprocess.cpp.orig 2018-06-25 20:21:49 UTC
++++ src/sshprocess.cpp
+@@ -24,6 +24,9 @@
+
+ #include <QProcess>
+ #ifndef Q_OS_WIN
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
Home |
Main Index |
Thread Index |
Old Index