<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/13e224b73e2e0b6c256ac650e750004e0cfb19af">https://github.com/macports/macports-ports/commit/13e224b73e2e0b6c256ac650e750004e0cfb19af</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 13e224b73e2 x2goclient: update to 4.1.2.3 and qt5
</span>13e224b73e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 13e224b73e2e0b6c256ac650e750004e0cfb19af
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Oct 16 08:58:22 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> x2goclient: update to 4.1.2.3 and qt5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/68413
</span>---
aqua/x2goclient/Portfile | 47 +++++++++-------------
.../files/patch-x2go-VERSION-changes.diff | 11 +++++
.../files/patch-x2goclient-sshsubprocess-bind.diff | 11 +++++
aqua/x2goclient/files/x2goclient.pro.patch | 12 ------
4 files changed, 42 insertions(+), 39 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/x2goclient/Portfile b/aqua/x2goclient/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bee8cc2f3ac..bca156d1792 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/x2goclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/x2goclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,20 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake5 1.0
</span> PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt4.debug_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name x2goclient
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.1.2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 c9953267c40fa67119ad96a73bacb1f266196da2059f0cdcd1b8d5199421d12a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bc8d71587e5c278632150db0a84836963b791b3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2576404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 ab8bb3c78d31625c749e42f15f810fe3d242927a15298308c13dea3b915aca3c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 65a8505d43101c9683a0699039a510b5e117e11f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2582072
</span>
categories aqua net
platforms macosx
license {GPL-2+ OpenSSLException}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> maintainers {ionic @Ionic} openmaintainer
description vnc-like remote desktop software
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,13 +25,11 @@ long_description X2Go is based on the (now closed source) NX libraries wh
</span> homepage https://www.x2go.org/
master_sites https://code.x2go.org/releases/source/${name}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs ppc i386 x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:qt4-mac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libssh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component qttools qtsvg qtdeclarative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libssh \
</span> port:xorg-libX11
depends_run-append port:pulseaudio \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,23 +37,22 @@ depends_run-append port:pulseaudio \
</span> port:xmodmap \
port:xauth
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles x2goclient.pro.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-x2goclient-sshsubprocess-bind.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-x2go-VERSION-changes.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> file mkdir "${worksrcpath}/client_build"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W "${worksrcpath}/client_build" "${qt_lrelease_cmd} ../${name}.pro"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Avoid errors like
</span> # ../../x2goclient-4.1.2.2/version:1:1: error: expected unqualified-id
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # 4.1.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ^
</span> move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set qmake_project_file "x2goclient.pro"
</span> configure.dir "${worksrcpath}/client_build"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir "${worksrcpath}/client_build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.dir "${worksrcpath}/client_build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid hundreds of deprecation warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -Wno-deprecated-declarations
</span>
# To pass string defines via DEFINES to qmake, we need 7 level
# of backslashes. Since we're using TCL, parsing that and then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,16 +60,15 @@ configure.dir "${worksrcpath}/client_build"
</span> # these 7 levels must be doubled.
# According to https://xkcd.com/1638/, this might potentially
# summon some form of lesser demon.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qmake_project_file "x2goclient.pro"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append CONFIG+=\"release\" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG+=\"${qt_arch_types}\" \
</span> CONFIG-=\"sdk\" \
OSX_STDLIB=\"${configure.cxx_stdlib}\" \
DEFINES+=\"MACPORTS_PREFIX=\\\\\\\\\\\\\\"${prefix}\\\\\\\\\\\\\\"\" \
"../${qmake_project_file}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir "${worksrcpath}/client_build"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.dir "${worksrcpath}/client_build"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot {
copy ${worksrcpath}/client_build/${name}.app ${destroot}${applications_dir}
xinstall -d -m 755 ${destroot}${applications_dir}/${name}.app/Contents/exe
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/x2goclient/files/patch-x2go-VERSION-changes.diff b/aqua/x2goclient/files/patch-x2go-VERSION-changes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aac387f9067
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/x2goclient/files/patch-x2go-VERSION-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- x2goclient.pro.orig 2023-10-16 08:36:27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ x2goclient.pro 2023-10-16 08:36:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += link_pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CONFIG += console
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-VERSION = "$$cat($${PWD}/VERSION)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++VERSION = "$$cat($${PWD}/VERSION.txt)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FORMS += src/ui/cupsprintsettingsdialog.ui \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/ui/cupsprintwidget.ui \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/x2goclient/files/patch-x2goclient-sshsubprocess-bind.diff b/aqua/x2goclient/files/patch-x2goclient-sshsubprocess-bind.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f0a0b0a3109
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/x2goclient/files/patch-x2goclient-sshsubprocess-bind.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/sshprocess.cpp.orig 2023-10-12 17:27:36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/sshprocess.cpp 2023-10-12 17:27:44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,7 +140,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ address.sin_family=AF_INET;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ address.sin_addr.s_addr=htonl(INADDR_LOOPBACK);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ address.sin_port=htons(localPort);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (::bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString err=tr("Error binding ")+localHost+":"+QString::number(localPort);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x2goDebug<<err<<endl;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/x2goclient/files/x2goclient.pro.patch b/aqua/x2goclient/files/x2goclient.pro.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a5793523590..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/x2goclient/files/x2goclient.pro.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use the right C++ standard library when linking.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This patch needs to be sent to the developers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- x2goclient.pro.orig 2020-02-13 04:36:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ x2goclient.pro 2020-03-20 05:13:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,6 +236,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !isEmpty(OSX_STDLIB) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS += -stdlib=$${OSX_STDLIB}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMAKE_LFLAGS += -stdlib=$${OSX_STDLIB}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !isEmpty(MACPORTS_INCLUDE_PATH) {
</span></pre><pre style='margin:0'>
</pre>