<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/9724eb038943da660e240722627f76dce8a2e580">https://github.com/macports/macports-ports/commit/9724eb038943da660e240722627f76dce8a2e580</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 9724eb03894 x2goclient: restore Qt4 version, unbreak the build for macOS < 10.7
</span>9724eb03894 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 9724eb038943da660e240722627f76dce8a2e580
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Dec 31 07:36:23 2023 +0800

<span style='display:block; white-space:pre;color:#404040;'>    x2goclient: restore Qt4 version, unbreak the build for macOS < 10.7
</span>---
 aqua/x2goclient/Portfile                     | 19 ++++++++++++++++---
 aqua/x2goclient/files/patch-unbreak-gcc.diff | 17 +++++++++++++++++
 2 files changed, 33 insertions(+), 3 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 bca156d1792..4e12b77a5ee 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,7 +1,6 @@
</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               qmake5 1.0
</span> PortGroup               openssl 1.0
 
 name                    x2goclient
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +26,21 @@ master_sites            https://code.x2go.org/releases/source/${name}/
</span> 
 installs_libs           no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component   qttools qtsvg qtdeclarative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup           qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Apple gcc do not support -stdlib= flag. gcc10+ do, but at the moment Macports gcc on PowerPC are built without it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[string match gcc-4.* ${configure.compiler}] || [string match apple-gcc-* ${configure.compiler}] ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        [string match macports-gcc-* ${configure.compiler}] && {configure.build_arch} in [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-unbreak-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup           qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        qttools qtsvg qtdeclarative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 depends_lib-append      port:libssh \
                         port:xorg-libX11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +50,7 @@ depends_run-append      port:pulseaudio \
</span>                         port:xmodmap \
                         port:xauth
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles              patch-x2goclient-sshsubprocess-bind.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-x2goclient-sshsubprocess-bind.diff \
</span>                         patch-x2go-VERSION-changes.diff
 
 post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/x2goclient/files/patch-unbreak-gcc.diff b/aqua/x2goclient/files/patch-unbreak-gcc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4df77965e7d
</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-unbreak-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Setting these flags is wrong and breaks the build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cc1plus: error: unrecognized command line option "-stdlib=libstdc++"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- x2goclient.pro 2023-06-29 04:09:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ x2goclient.pro 2023-12-31 07:27:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -242,11 +242,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   message("building $$TARGET with ldap and cups")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   LIBS += -framework LDAP -lcups -lcrypto -lssl -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  !isEmpty(OSX_STDLIB) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    QMAKE_CXXFLAGS += -stdlib=$${OSX_STDLIB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    QMAKE_LFLAGS += -stdlib=$${OSX_STDLIB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   !isEmpty(MACPORTS_INCLUDE_PATH) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     INCLUDEPATH += $${MACPORTS_INCLUDE_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span></pre><pre style='margin:0'>

</pre>