pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11
Module Name: pkgsrc
Committed By: hauke
Date: Wed Feb 24 18:39:31 UTC 2021
Modified Files:
pkgsrc/x11: Makefile
Added Files:
pkgsrc/x11/x2go-client: DESCR Makefile PLIST distinfo options.mk
pkgsrc/x11/x2go-client/patches: patch-Makefile
patch-src_printwidget.cpp patch-src_sshmasterconnection.cpp
patch-src_sshprocess.cpp patch-src_sshprocess.h
patch-src_x2goclientconfig.h
Log Message:
Qt client for the X2Go remote desktop system
To generate a diff of this commit:
cvs rdiff -u -r1.917 -r1.918 pkgsrc/x11/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/x2go-client/DESCR \
pkgsrc/x11/x2go-client/Makefile pkgsrc/x11/x2go-client/PLIST \
pkgsrc/x11/x2go-client/distinfo pkgsrc/x11/x2go-client/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/x2go-client/patches/patch-Makefile \
pkgsrc/x11/x2go-client/patches/patch-src_printwidget.cpp \
pkgsrc/x11/x2go-client/patches/patch-src_sshmasterconnection.cpp \
pkgsrc/x11/x2go-client/patches/patch-src_sshprocess.cpp \
pkgsrc/x11/x2go-client/patches/patch-src_sshprocess.h \
pkgsrc/x11/x2go-client/patches/patch-src_x2goclientconfig.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/Makefile
diff -u pkgsrc/x11/Makefile:1.917 pkgsrc/x11/Makefile:1.918
--- pkgsrc/x11/Makefile:1.917 Mon Feb 15 15:07:08 2021
+++ pkgsrc/x11/Makefile Wed Feb 24 18:39:30 2021
@@ -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+= mrxvt
SUBDIR+= mxterm
SUBDIR+= neXtaw
SUBDIR+= numlockx
+SUBDIR+= nx-libs
SUBDIR+= ocaml-graphics
SUBDIR+= ocaml-lablgtk
SUBDIR+= ocaml-lablgtk3
@@ -452,6 +453,7 @@ SUBDIR+= wxGTK30
SUBDIR+= wxWindows-docs
SUBDIR+= x11perf
SUBDIR+= x11vnc
+SUBDIR+= x2go-client
SUBDIR+= x2x
SUBDIR+= x3270
SUBDIR+= xaniroc
Added files:
Index: pkgsrc/x11/x2go-client/DESCR
diff -u /dev/null pkgsrc/x11/x2go-client/DESCR:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/DESCR Wed Feb 24 18:39:30 2021
@@ -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.
Index: pkgsrc/x11/x2go-client/Makefile
diff -u /dev/null pkgsrc/x11/x2go-client/Makefile:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/Makefile Wed Feb 24 18:39:30 2021
@@ -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"
Index: pkgsrc/x11/x2go-client/PLIST
diff -u /dev/null pkgsrc/x11/x2go-client/PLIST:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/PLIST Wed Feb 24 18:39:30 2021
@@ -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
Index: pkgsrc/x11/x2go-client/distinfo
diff -u /dev/null pkgsrc/x11/x2go-client/distinfo:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/distinfo Wed Feb 24 18:39:30 2021
@@ -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
Index: pkgsrc/x11/x2go-client/options.mk
diff -u /dev/null pkgsrc/x11/x2go-client/options.mk:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/options.mk Wed Feb 24 18:39:30 2021
@@ -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
Index: pkgsrc/x11/x2go-client/patches/patch-Makefile
diff -u /dev/null pkgsrc/x11/x2go-client/patches/patch-Makefile:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/patches/patch-Makefile Wed Feb 24 18:39:30 2021
@@ -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
+
Index: pkgsrc/x11/x2go-client/patches/patch-src_printwidget.cpp
diff -u /dev/null pkgsrc/x11/x2go-client/patches/patch-src_printwidget.cpp:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/patches/patch-src_printwidget.cpp Wed Feb 24 18:39:30 2021
@@ -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 )
+ {
Index: pkgsrc/x11/x2go-client/patches/patch-src_sshmasterconnection.cpp
diff -u /dev/null pkgsrc/x11/x2go-client/patches/patch-src_sshmasterconnection.cpp:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/patches/patch-src_sshmasterconnection.cpp Wed Feb 24 18:39:30 2021
@@ -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>
Index: pkgsrc/x11/x2go-client/patches/patch-src_sshprocess.cpp
diff -u /dev/null pkgsrc/x11/x2go-client/patches/patch-src_sshprocess.cpp:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/patches/patch-src_sshprocess.cpp Wed Feb 24 18:39:30 2021
@@ -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>
+ #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=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;
+@@ -209,7 +212,7 @@ void SshProcess::startNormal(const QString& cmd, bool
+ }
+ if(!masterCon->useKerberos())
+ {
+- QString shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; " + pathString + "export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
++ QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; " + pathString + "export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
+ x2goDebug << "this="<<this<<" Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');";
+ masterCon->addChannelConnection(this, uuidStr, shcmd);
+ connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray)));
+@@ -231,7 +234,7 @@ void SshProcess::startNormal(const QString& cmd, bool
+ * as there is no preceding "outer double quote" the whole argument
+ * is wrapped in.
+ */
+- shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\";" + pathString + "export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
++ shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\";" + pathString + "export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
+
+ proc=new QProcess(this);
+ QString local_cmd = "";
Index: pkgsrc/x11/x2go-client/patches/patch-src_sshprocess.h
diff -u /dev/null pkgsrc/x11/x2go-client/patches/patch-src_sshprocess.h:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/patches/patch-src_sshprocess.h Wed Feb 24 18:39:30 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_sshprocess.h,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+Add missing Unix includes
+
+--- src/sshprocess.h.orig 2016-03-24 20:39:27 UTC
++++ src/sshprocess.h
+@@ -18,6 +18,12 @@
+ #ifndef SSHPROCESS_H
+ #define SSHPROCESS_H
+
++#ifndef Q_OS_WIN
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#endif
+ #include <libssh/libssh.h>
+ #include <QObject>
+ #include <QProcess>
Index: pkgsrc/x11/x2go-client/patches/patch-src_x2goclientconfig.h
diff -u /dev/null pkgsrc/x11/x2go-client/patches/patch-src_x2goclientconfig.h:1.1
--- /dev/null Wed Feb 24 18:39:31 2021
+++ pkgsrc/x11/x2go-client/patches/patch-src_x2goclientconfig.h Wed Feb 24 18:39:30 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_x2goclientconfig.h,v 1.1 2021/02/24 18:39:30 hauke Exp $
+
+We make LDAP an option.
+
+--- src/x2goclientconfig.h.orig 2020-02-13 10:36:07.000000000 +0000
++++ src/x2goclientconfig.h
+@@ -25,10 +25,6 @@
+
+ //#define LOGFILE QDir::homePath()+"/x2goclient.log"
+
+-#if !defined Q_OS_WIN
+-#define USELDAP
+-#endif
+-
+ #ifdef Q_OS_WIN
+ #undef USELDAP
+ #endif
Home |
Main Index |
Thread Index |
Old Index