[X2Go-Commits] [x2goclient] 02/02: src/onmainwindow.cpp: add (and prefer) non-compat-symlink scp server location for 64-bit-based Gentoo distros (17.1+ profiles).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 567223f5b55fb0398322f01cb0f158da6eb2a524
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jun 18 11:38:29 2019 +0200

    src/onmainwindow.cpp: add (and prefer) non-compat-symlink scp server location for 64-bit-based Gentoo distros (17.1+ profiles).
    
    Fixes: #1393.
---
 debian/changelog     | 3 +++
 src/onmainwindow.cpp | 1 +
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 284692b..ed1b3ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,9 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       version available in EPEL 6.
     - src/onmainwindow.cpp: unbreak builds by fixing syntax error.
     - src/onmainwindow.cpp: also unbreak old EPEL 6 builds.
+    - src/onmainwindow.cpp: add (and prefer) non-compat-symlink scp server
+      location for 64-bit-based Gentoo distros (17.1+ profiles). Fixes:
+      #1393.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index cb6bb72..cd97e6c 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10754,6 +10754,7 @@ void ONMainWindow::generateEtcFiles()
                      << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */
                      << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */
                      << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */
+                     << "/usr/lib64/misc" /* Gentoo *64 with 17.1 profile - has no lib compat-symlink. */
                      << "/usr/lib/misc" /* Gentoo */
                      << "/run/current-system/sw/bin" /* NixOS */
                      << "/usr/libexec"; /* Slackware, OS X */

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git