hi,

simple update to the git branch from
https://gitlab.x2go.org/x2go/client/x2goclient/-/merge_requests/19,
starts fine here and displays the qt6 window, will be able to do actual
tests when i'm back at work with my x2go instances.

testing welcome

Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/x2goclient/Makefile,v
diff -u -r1.19 Makefile
--- Makefile    17 Mar 2024 20:20:33 -0000      1.19
+++ Makefile    6 Nov 2026 16:46:16 -0000
@@ -1,6 +1,9 @@
 COMMENT =      Qt client for the X2Go system
 
-DISTNAME =     x2goclient-4.1.2.3
+PKGNAME =      x2goclient-4.1.2.4pre0
+DIST_TUPLE =   gitlab x2go client/x2goclient 
a0374540c6a791ad992c19952de138d8fc70331b .
+SITES.gitlab = https://gitlab.x2go.org/
+FETCH_CMD =    /usr/bin/ftp -V ${_PROGRESS} -C -Sdont
 
 CATEGORIES =   x11
 
@@ -11,18 +14,15 @@
 # GPLv2+
 PERMIT_PACKAGE =       Yes
 
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Svg
-WANTLIB += Qt5Widgets Qt5X11Extras X11 Xpm c cups ldap m ssh
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6Svg
+WANTLIB += Qt6Widgets X11 Xpm c cups ldap m ssh
 
-SITES =                https://code.x2go.org/releases/source/x2goclient/
-
-MODULES =      x11/qt5
+MODULES =      x11/qt6
 
 LIB_DEPENDS =  databases/openldap \
                print/cups,-libs \
                security/libssh>=0.8.4 \
-               x11/qt5/qtx11extras \
-               x11/qt5/qtsvg
+               x11/qt6/qtsvg
 
 RUN_DEPENDS =  x11/nx/nxcomp \
                x11/nx/nxproxy \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/x2goclient/distinfo,v
diff -u -r1.7 distinfo
--- distinfo    17 Mar 2024 20:20:33 -0000      1.7
+++ distinfo    6 Nov 2026 16:46:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (x2goclient-4.1.2.3.tar.gz) = 
q4uzx40xYlx0nkLxX4EP49JCknoVKYMIwT3qO5Fayjw=
-SIZE (x2goclient-4.1.2.3.tar.gz) = 2582072
+SHA256 
(x2go-client/x2goclient-a0374540c6a791ad992c19952de138d8fc70331b.tar.gz) = 
SWE/q9Bd2CnwYGU3k2Nn+WpwuDw2J6H9OoefZaqSlqI=
+SIZE (x2go-client/x2goclient-a0374540c6a791ad992c19952de138d8fc70331b.tar.gz) 
= 2603094
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/x2goclient/patches/patch-Makefile,v
diff -u -r1.3 patch-Makefile
--- patches/patch-Makefile      17 Mar 2024 20:20:33 -0000      1.3
+++ patches/patch-Makefile      6 Nov 2026 16:46:16 -0000
@@ -22,8 +22,8 @@
 +BINDIR ?= /usr/local/bin
 +SHAREDIR ?= /usr/local/share
 +MANDIR ?= /usr/local/man
-+QMAKE_BINARY ?= qmake-qt5
-+LRELEASE_BINARY ?= lrelease-qt5
++QMAKE_BINARY ?= qmake-qt6
++LRELEASE_BINARY ?= lrelease-qt6
  QMAKE_OPTS ?=
  
  LDFLAGS ?=
Index: patches/patch-src_sshmasterconnection_cpp
===================================================================
RCS file: /cvs/ports/x11/x2goclient/patches/patch-src_sshmasterconnection_cpp,v
diff -u -r1.3 patch-src_sshmasterconnection_cpp
--- patches/patch-src_sshmasterconnection_cpp   11 Mar 2022 20:17:40 -0000      
1.3
+++ patches/patch-src_sshmasterconnection_cpp   6 Nov 2026 16:46:16 -0000
@@ -4,7 +4,7 @@
 Index: src/sshmasterconnection.cpp
 --- src/sshmasterconnection.cpp.orig
 +++ src/sshmasterconnection.cpp
-@@ -152,7 +152,7 @@ SshMasterConnection::SshMasterConnection (QObject* par
+@@ -153,7 +153,7 @@ SshMasterConnection::SshMasterConnection (QObject* par
          QString proxylogin, QString proxypassword, QString proxykey,
          bool proxyautologin, bool proxyKrbLogin ) : QThread ( parent )
  {
Index: patches/patch-src_sshprocess_cpp
===================================================================
RCS file: /cvs/ports/x11/x2goclient/patches/patch-src_sshprocess_cpp,v
diff -u -r1.3 patch-src_sshprocess_cpp
--- patches/patch-src_sshprocess_cpp    11 Mar 2022 20:17:40 -0000      1.3
+++ patches/patch-src_sshprocess_cpp    6 Nov 2026 16:46:16 -0000
@@ -10,7 +10,7 @@
  #ifndef Q_OS_WIN
  #include <arpa/inet.h>
  #include <netinet/tcp.h>
-@@ -140,7 +142,7 @@ void SshProcess::tunnelLoop()
+@@ -142,7 +144,7 @@ void SshProcess::tunnelLoop()
      address.sin_family=AF_INET;
      address.sin_addr.s_addr=htonl(INADDR_LOOPBACK);
      address.sin_port=htons(localPort);
@@ -18,4 +18,4 @@
 +    if (::bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
      {
          QString err=tr("Error binding 
")+localHost+":"+QString::number(localPort);
-         x2goDebug<<err<<endl;
+         x2goDebug<<err<<X2GO_COMPAT_ENDL;
Index: patches/patch-x2goclient_pro
===================================================================
RCS file: /cvs/ports/x11/x2goclient/patches/patch-x2goclient_pro,v
diff -u -r1.8 patch-x2goclient_pro
--- patches/patch-x2goclient_pro        17 Mar 2024 20:20:33 -0000      1.8
+++ patches/patch-x2goclient_pro        6 Nov 2026 16:46:16 -0000
@@ -21,23 +21,14 @@
  RESOURCES += res/resources.qrc
  
  exists(res/txt/git-info) {
-@@ -229,6 +229,10 @@ linux|linux-* {
+@@ -228,6 +228,10 @@ linux|linux-* {
+   message("building $$TARGET via $$QMAKESPEC with ldap and cups")
    LIBS += -lldap -lcups -lX11 -lXpm
    DEFINES += __linux__
- }
++}
 +openbsd-* {
 +    message("building $$TARGET with ldap and cups")
 +    LIBS += -lldap -lcups -lX11 -lXpm
-+}
+ }
  x2go_linux_static {
    message("linking all libs statically")
-   DEFINES += __linux__
-@@ -278,7 +282,7 @@ win32|win32-* {
-   CONFIG += static release
- }
- QT += svg network
--linux|linux-* {
-+openbsd-*|linux|linux-* {
-   greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras
- }
- win32|win32-* {

Reply via email to