Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
aqua/x2goclient: update to 4.1.0.0.
Fix startup failure and non-default prefixes via patches/reinplaces.
  • Loading branch information
Ionic committed Feb 23, 2017
1 parent 3fe9df6 commit 5ef7d72
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 3 deletions.
20 changes: 17 additions & 3 deletions aqua/x2goclient/Portfile
Expand Up @@ -4,9 +4,10 @@ PortSystem 1.0
PortGroup qt4 1.0

name x2goclient
version 4.0.5.2
checksums sha256 0d0adfd5c03cef42367a5894948ee804ae13ffb7ed30a608e7c54351addd1530 \
rmd160 0e4548325daa543fba71f7eb72c8f781faa099c1
version 4.1.0.0
revision 0
checksums sha256 4b5915bc3666228910342810a34f7a03fb6967c6b9c796633d9cdf8b89cc2b6a \
rmd160 04950c8c0f9dafa4f42e2716ab03af5363e70e5e

categories aqua net
platforms macosx
Expand All @@ -32,6 +33,17 @@ depends_lib port:qt4-mac \
port:libssh \
port:xorg-libX11

depends_run port:pulseaudio

patchfiles patch-src_x2goutils.cpp-fix-startup-failure.diff \
patch-src_onmainwindow.cpp_pulsemanager.cpp-support-non-standard-prefix.diff

post-patch {
foreach filename [list "src/onmainwindow.cpp" "src/pulsemanager.cpp"] {
reinplace -W "${worksrcpath}" "s#@@PREFIX@@#${prefix}#g" $filename
}
}

pre-configure {
file mkdir "${worksrcpath}/client_build"
system -W "${worksrcpath}/client_build" "${qt_lrelease_cmd} ../${name}.pro"
Expand All @@ -56,6 +68,8 @@ destroot {
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}

copy ${worksrcpath}/res/audio/startup.wav ${destroot}${applications_dir}/${name}.app/Contents/Resources/
}

variant debug description {Builds a debug version. Only really useful with a debugging-enabled version of Qt.} {
Expand Down
@@ -0,0 +1,39 @@
--- src/onmainwindow.cpp.old 2017-02-22 05:11:35.000000000 +0100
+++ src/onmainwindow.cpp 2017-02-23 09:38:07.000000000 +0100
@@ -5708,14 +5708,14 @@ void ONMainWindow::slotSetModMap()
/* Let's set a reasonable default value if none is provided. */
if (path_val.isEmpty ()) {
/* Prefer the default MacPorts prefix. */
- 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";
+ path_val = "@@PREFIX@@/bin:@@PREFIX@@/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin:/opt/X11/bin";
tmp_env.insert ("PATH", path_val);
}
else {
/* Search for and add specific directories to the PATH value, if necessary. */
QStringList to_back, to_front;
to_back << "/opt/X11/bin";
- to_front << "/opt/local/bin" << "/usr/local/bin";
+ to_front << "@@PREFIX@@/bin" << "/usr/local/bin";

path_val = add_to_path (path_val, to_back);
path_val = add_to_path (path_val, to_front, false);
--- src/pulsemanager.cpp.old 2017-02-22 05:11:35.000000000 +0100
+++ src/pulsemanager.cpp 2017-02-23 09:38:32.000000000 +0100
@@ -70,7 +70,7 @@ PulseManager::PulseManager () : app_dir_
QString path_val = tmp_env.value ("PATH");

QStringList to_front, to_back;
- to_front << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
+ to_front << "@@PREFIX@@/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
to_back << "/usr/local/bin"; /* Homebrew or random stuff. Probably even both intermingled... */

path_val = add_to_path (path_val, to_back);
@@ -93,7 +93,7 @@ PulseManager::PulseManager () : app_dir_

if (server_binary_.isEmpty ()) {
search_paths = QStringList ();
- search_paths << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
+ search_paths << "@@PREFIX@@/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */

server_binary_ = QStandardPaths::findExecutable ("pulseaudio", search_paths);

@@ -0,0 +1,11 @@
--- src/x2goutils.cpp.old 2017-02-22 05:11:35.000000000 +0100
+++ src/x2goutils.cpp 2017-02-23 09:32:43.000000000 +0100
@@ -299,7 +299,7 @@ QString add_to_path (const QString &orig
}
}
else {
- for (int i = (clean_add.size () - 1); i > 0; --i) {
+ for (int i = (clean_add.size () - 1); i >= 0; --i) {
if (!found[i]) {
ret.prepend (QString (clean_add[i] + ":"));
}

0 comments on commit 5ef7d72

Please sign in to comment.