This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit ae9139e083792e7c3cc98febfde5d75afdc696f7 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 22 18:23:27 2019 +0200 x2goclient.pro: fix libssh_threads logic again. Ubuntu Bionic/18.04 ships a pre-release version of 0.8.0, which is tagged as that version, but really based upon 0.7.x and still has/needs a libssh_threads library. Big "Wat?" to you, Canonical. --- debian/changelog | 4 ++++ x2goclient.pro | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bb04e66..341900c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,10 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium condition check for every x2goDebug () call. - src/x2goclient.cpp: do not use std::array since that's a C++11 feature, just live with plain C arrays for now. + - x2goclient.pro: fix libssh_threads logic again. Ubuntu Bionic/18.04 + ships a pre-release version of 0.8.0, which is tagged as that version, + but really based upon 0.7.x and still has/needs a libssh_threads + library. Big "Wat?" to you, Canonical. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/x2goclient.pro b/x2goclient.pro index 9c697a5..3aaf01c 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -142,7 +142,10 @@ unix { # Failure to find libssh_threads is non-fatal, since newer libssh versions # don't ship a separate library any longer. - system("$$PKG_CONFIG --exists 'libssh < 0.8.0'"):PKGCONFIG += libssh_threads + # We can't just check for version 0.8.0, though, since some distros + # (looking at you, Ubuntu Bionic/18.04) ship a pre-release version of 0.8.0 + # which is actually still based upon 0.7.x and still has libssh_threads... + system("$$PKG_CONFIG --exists 'libssh_threads'"):PKGCONFIG += libssh_threads } else { # No pkgconfig stuff, because... for some reason we wanted to call the -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git