Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
Showing
3 changed files
with
67 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
...client/files/patch-src_onmainwindow.cpp_pulsemanager.cpp-support-non-standard-prefix.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
|
11 changes: 11 additions & 0 deletions
11
aqua/x2goclient/files/patch-src_x2goutils.cpp-fix-startup-failure.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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] + ":")); | ||
} |