[X2Go-Commits] [x2goclient] 04/10: x2goclient.pro: update comment mentioning that libssh does not provide pkgconfig files on non-UNIX/Windows platforms any longer and drop libssh_thread linkage.

[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 8c528b474751d3ca7cc31c61fb81d24e3d81ec90
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Feb 6 15:38:07 2020 +0100

    x2goclient.pro: update comment mentioning that libssh does not provide pkgconfig files on non-UNIX/Windows platforms any longer and drop libssh_thread linkage.
---
 debian/changelog | 3 +++
 x2goclient.pro   | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95c06f8..1dd9908 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -165,6 +165,9 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
     - Windows: Update Win32 OpenSSL from 1.0.2n to 1.0.2u. Implicit.
     - Windows: Upgrade libssh from 0.7.4 to 0.9.3 (while maintaining Pageant
       support). Drop libssh_threads library not provided (or used) any longer.
+    - x2goclient.pro: update comment mentioning that libssh does not provide
+      pkgconfig files on non-UNIX/Windows platforms any longer and drop
+      libssh_thread linkage.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/x2goclient.pro b/x2goclient.pro
index d465236..66cc8e9 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -157,10 +157,11 @@ unix {
   }
 }
 else:win32 {
-  # pkgconfig is... tricky on Windows.
+  # pkgconfig is... tricky on Windows. Additionally, libssh 0.7.x stopped
+  # distributing pkgconfig files on non-UNIX platforms, including Windows.
   # We'll hardcode stuff here. Make sure that it's consistent with the
   # libraries we use on Windows.
-  LIBS += -lssh -lssh_threads
+  LIBS += -lssh
 }
 else {
   # For backwards-compatibility.

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