<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5ef7d72e34586081b904c15830ec70741f758566">https://github.com/macports/macports-ports/commit/5ef7d72e34586081b904c15830ec70741f758566</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 5ef7d72 aqua/x2goclient: update to 4.1.0.0.
</span>5ef7d72 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5ef7d72e34586081b904c15830ec70741f758566
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Thu Feb 23 09:54:32 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> aqua/x2goclient: update to 4.1.0.0.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix startup failure and non-default prefixes via patches/reinplaces.
</span>---
aqua/x2goclient/Portfile | 20 +++++++++--
...lsemanager.cpp-support-non-standard-prefix.diff | 39 ++++++++++++++++++++++
...atch-src_x2goutils.cpp-fix-startup-failure.diff | 11 ++++++
3 files changed, 67 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 80e687c..709db8e4 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;'>@@ -4,9 +4,10 @@ PortSystem 1.0
</span> PortGroup qt4 1.0
name x2goclient
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.5.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 0d0adfd5c03cef42367a5894948ee804ae13ffb7ed30a608e7c54351addd1530 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0e4548325daa543fba71f7eb72c8f781faa099c1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.1.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 4b5915bc3666228910342810a34f7a03fb6967c6b9c796633d9cdf8b89cc2b6a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 04950c8c0f9dafa4f42e2716ab03af5363e70e5e
</span>
categories aqua net
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +33,17 @@ depends_lib port:qt4-mac \
</span> port:libssh \
port:xorg-libX11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src_x2goutils.cpp-fix-startup-failure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src_onmainwindow.cpp_pulsemanager.cpp-support-non-standard-prefix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach filename [list "src/onmainwindow.cpp" "src/pulsemanager.cpp"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}" "s#@@PREFIX@@#${prefix}#g" $filename
</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;'>+
</span> pre-configure {
file mkdir "${worksrcpath}/client_build"
system -W "${worksrcpath}/client_build" "${qt_lrelease_cmd} ../${name}.pro"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +68,8 @@ destroot {
</span> xinstall -d -m 755 ${destroot}${applications_dir}/${name}.app/Contents/exe
ln -s ${prefix}/bin/nxproxy ${destroot}${applications_dir}/${name}.app/Contents/exe/nxproxy
ln -s ${applications_dir}/${name}.app/Contents/MacOS/${name} ${destroot}${prefix}/bin/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/res/audio/startup.wav ${destroot}${applications_dir}/${name}.app/Contents/Resources/
</span> }
variant debug description {Builds a debug version. Only really useful with a debugging-enabled version of Qt.} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/x2goclient/files/patch-src_onmainwindow.cpp_pulsemanager.cpp-support-non-standard-prefix.diff b/aqua/x2goclient/files/patch-src_onmainwindow.cpp_pulsemanager.cpp-support-non-standard-prefix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f8f960c
</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-src_onmainwindow.cpp_pulsemanager.cpp-support-non-standard-prefix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/onmainwindow.cpp.old 2017-02-22 05:11:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/onmainwindow.cpp 2017-02-23 09:38:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5708,14 +5708,14 @@ void ONMainWindow::slotSetModMap()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Let's set a reasonable default value if none is provided. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (path_val.isEmpty ()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Prefer the default MacPorts prefix. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- path_val = "/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin:/opt/X11/bin";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ path_val = "@@PREFIX@@/bin:@@PREFIX@@/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin:/opt/X11/bin";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp_env.insert ("PATH", path_val);
</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;'>+ /* Search for and add specific directories to the PATH value, if necessary. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QStringList to_back, to_front;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to_back << "/opt/X11/bin";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- to_front << "/opt/local/bin" << "/usr/local/bin";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ to_front << "@@PREFIX@@/bin" << "/usr/local/bin";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path_val = add_to_path (path_val, to_back);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path_val = add_to_path (path_val, to_front, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pulsemanager.cpp.old 2017-02-22 05:11:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pulsemanager.cpp 2017-02-23 09:38:32.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@ PulseManager::PulseManager () : app_dir_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString path_val = tmp_env.value ("PATH");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QStringList to_front, to_back;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- to_front << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ to_front << "@@PREFIX@@/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to_back << "/usr/local/bin"; /* Homebrew or random stuff. Probably even both intermingled... */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path_val = add_to_path (path_val, to_back);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@ PulseManager::PulseManager () : app_dir_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (server_binary_.isEmpty ()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search_paths = QStringList ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- search_paths << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ search_paths << "@@PREFIX@@/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ server_binary_ = QStandardPaths::findExecutable ("pulseaudio", search_paths);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/x2goclient/files/patch-src_x2goutils.cpp-fix-startup-failure.diff b/aqua/x2goclient/files/patch-src_x2goutils.cpp-fix-startup-failure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1761ae9
</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-src_x2goutils.cpp-fix-startup-failure.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/x2goutils.cpp.old 2017-02-22 05:11:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/x2goutils.cpp 2017-02-23 09:32:43.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,7 +299,7 @@ QString add_to_path (const QString &orig
</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;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (int i = (clean_add.size () - 1); i > 0; --i) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int i = (clean_add.size () - 1); i >= 0; --i) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!found[i]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret.prepend (QString (clean_add[i] + ":"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>