<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/2afdc1ac5a1265d05144d1ab74c7dbae78e4f6f1">https://github.com/macports/macports-ports/commit/2afdc1ac5a1265d05144d1ab74c7dbae78e4f6f1</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 2afdc1a aqua/x2goclient: update to 4.1.1.0.
</span>2afdc1a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2afdc1ac5a1265d05144d1ab74c7dbae78e4f6f1
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Mon Oct 30 04:05:41 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> aqua/x2goclient: update to 4.1.1.0.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also switch URLs to https, clear (and delete) patchfiles, add size
</span><span style='display:block; white-space:pre;color:#404040;'> parameter to checksums and use new demonic mechanism to pass our prefix.
</span>---
aqua/x2goclient/Portfile | 31 ++++++++---------
...lsemanager.cpp-support-non-standard-prefix.diff | 39 ----------------------
...atch-src_x2goutils.cpp-fix-startup-failure.diff | 11 ------
3 files changed, 16 insertions(+), 65 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 9c4ac34..e50d5fe 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,10 +4,11 @@ PortSystem 1.0
</span> PortGroup qt4 1.0
name x2goclient
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 4b5915bc3666228910342810a34f7a03fb6967c6b9c796633d9cdf8b89cc2b6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 04950c8c0f9dafa4f42e2716ab03af5363e70e5e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.1.1.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 be153529f67e34849b1d807170bf1de1c2d3e1bbe6c5a25ad457c88a981b63ca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 326ba01ab8ccb5b6653a07ab5412713f810405ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2745227
</span>
categories aqua net
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +21,8 @@ long_description X2Go is based on the (now closed source) NX libraries wh
</span> terminal server services. \
This is a client application to access the remote side.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.x2go.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://code.x2go.org/releases/source/${name}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.x2go.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://code.x2go.org/releases/source/${name}/
</span>
universal_variant yes
supported_archs ppc i386 x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,14 +37,7 @@ depends_lib port:qt4-mac \
</span>
depends_run port:pulseaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src_x2goutils.cpp-fix-startup-failure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_onmainwindow.cpp_pulsemanager.cpp-support-non-standard-prefix.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach filename [list "src/onmainwindow.cpp" "src/pulsemanager.cpp"] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W "${worksrcpath}" "s#@@PREFIX@@#${prefix}#g" $filename
</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:#e0ffe0;'>+#patchfiles none
</span>
pre-configure {
file mkdir "${worksrcpath}/client_build"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +49,17 @@ configure.dir "${worksrcpath}/client_build"
</span> configure.cmd ${qt_qmake_cmd}
configure.pre_args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# To pass string defines via DEFINES to qmake, we need 7 level
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# of backslashes. Since we're using TCL, parsing that and then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# are passing commands on to the shell, which handles execution,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# these 7 levels must be doubled.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# According to https://xkcd.com/1638/, this might potentially
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sommon some form of lesser demons.
</span> configure.args-append -config \"release\" \
CONFIG+=\"${qt_arch_types}\" \
CONFIG-=\"sdk\" \
OSX_STDLIB=\"${configure.cxx_stdlib}\" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES+=\"MACPORTS_PREFIX=\\\\\\\\\\\\\\"${prefix}\\\\\\\\\\\\\\"\" \
</span> "../${qmake_project_file}"
build.dir "${worksrcpath}/client_build"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,5 +79,5 @@ variant debug description {Builds a debug version. Only really useful with a deb
</span> -config \"debug\"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://code.x2go.org/releases/source/x2goclient/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://code.x2go.org/releases/source/x2goclient/
</span> livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)\\.tar.gz
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f8f960c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/x2goclient/files/patch-src_onmainwindow.cpp_pulsemanager.cpp-support-non-standard-prefix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/onmainwindow.cpp.old 2017-02-22 05:11:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/onmainwindow.cpp 2017-02-23 09:38:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5708,14 +5708,14 @@ void ONMainWindow::slotSetModMap()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Let's set a reasonable default value if none is provided. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (path_val.isEmpty ()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Prefer the default MacPorts prefix. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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:#ffe0e0;'>-+ 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:#ffe0e0;'>- tmp_env.insert ("PATH", path_val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Search for and add specific directories to the PATH value, if necessary. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QStringList to_back, to_front;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to_back << "/opt/X11/bin";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- to_front << "/opt/local/bin" << "/usr/local/bin";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ to_front << "@@PREFIX@@/bin" << "/usr/local/bin";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path_val = add_to_path (path_val, to_back);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path_val = add_to_path (path_val, to_front, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pulsemanager.cpp.old 2017-02-22 05:11:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pulsemanager.cpp 2017-02-23 09:38:32.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,7 +70,7 @@ PulseManager::PulseManager () : app_dir_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QString path_val = tmp_env.value ("PATH");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QStringList to_front, to_back;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- to_front << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ to_front << "@@PREFIX@@/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to_back << "/usr/local/bin"; /* Homebrew or random stuff. Probably even both intermingled... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path_val = add_to_path (path_val, to_back);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +93,7 @@ PulseManager::PulseManager () : app_dir_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (server_binary_.isEmpty ()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- search_paths = QStringList ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- search_paths << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ search_paths << "@@PREFIX@@/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- server_binary_ = QStandardPaths::findExecutable ("pulseaudio", search_paths);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1761ae9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/x2goclient/files/patch-src_x2goutils.cpp-fix-startup-failure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/x2goutils.cpp.old 2017-02-22 05:11:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/x2goutils.cpp 2017-02-23 09:32:43.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,7 +299,7 @@ QString add_to_path (const QString &orig
</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;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (int i = (clean_add.size () - 1); i > 0; --i) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = (clean_add.size () - 1); i >= 0; --i) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!found[i]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret.prepend (QString (clean_add[i] + ":"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>