diff -Nru x2goclient-4.1.2.1/debian/changelog x2goclient-4.1.2.1/debian/changelog --- x2goclient-4.1.2.1/debian/changelog 2018-06-26 12:35:36.000000000 +0000 +++ x2goclient-4.1.2.1/debian/changelog 2018-08-13 19:48:20.000000000 +0000 @@ -1,3 +1,16 @@ +x2goclient (4.1.2.1-2) unstable; urgency=medium + + * debian/patches: + + Rebase 1002_fix-ftbfs-on-non-linux.patch. + + Add 1003_fix_ftbfs-against-libssh-0-8.patch. Fix FTBFS against + libssh 0.8. (Closes: #905945). + + Add 1004_fix_ftbfs-against-qt5-11.patch. Fix FTBFS against + Qt 5.11. + * debian/control: + + Bump Standards-Version: to 4.2.0. No changes needed. + + -- Mike Gabriel Mon, 13 Aug 2018 21:48:20 +0200 + x2goclient (4.1.2.1-1) unstable; urgency=medium * New upstream release. diff -Nru x2goclient-4.1.2.1/debian/control x2goclient-4.1.2.1/debian/control --- x2goclient-4.1.2.1/debian/control 2018-06-24 21:16:07.000000000 +0000 +++ x2goclient-4.1.2.1/debian/control 2018-08-13 19:48:20.000000000 +0000 @@ -19,7 +19,7 @@ man2html-base | man2html, qtbase5-dev, qttools5-dev-tools, -Standards-Version: 4.1.4 +Standards-Version: 4.2.0 Homepage: http://wiki.x2go.org/ Vcs-Git: https://salsa.debian.org/debian-remote-team/x2goclient.git Vcs-Browser: https://salsa.debian.org/debian-remote-team/x2goclient/ diff -Nru x2goclient-4.1.2.1/debian/patches/1002_fix-ftbfs-on-non-linux.patch x2goclient-4.1.2.1/debian/patches/1002_fix-ftbfs-on-non-linux.patch --- x2goclient-4.1.2.1/debian/patches/1002_fix-ftbfs-on-non-linux.patch 2018-06-25 09:35:40.000000000 +0000 +++ x2goclient-4.1.2.1/debian/patches/1002_fix-ftbfs-on-non-linux.patch 2018-08-13 19:44:12.000000000 +0000 @@ -265,7 +265,7 @@ QString fromCode=st.setting()->value ( sid+"/iconvfrom", ( QVariant ) tr ( -@@ -10992,7 +10992,7 @@ +@@ -10994,7 +10994,7 @@ else pixmap=*(sessionExplorer->getLastSession()->sessIcon()); @@ -274,7 +274,7 @@ XStoreName(QX11Info::display(), proxyWinId, title.toLocal8Bit().data()); -@@ -11039,7 +11039,7 @@ +@@ -11041,7 +11041,7 @@ void ONMainWindow::slotSetProxyWinFullscreen() { @@ -283,7 +283,7 @@ QRect geom=QApplication::desktop()->screenGeometry(localDisplayNumber-1); Atom atom = XInternAtom ( QX11Info::display(), "_NET_WM_STATE_FULLSCREEN", True ); -@@ -11095,7 +11095,7 @@ +@@ -11097,7 +11097,7 @@ ", h: "+ QString("%1").arg(geom.height()); x2goDebug<<"Resizing proxy window to fit display: " + QString("%1").arg(disp) + " " + geoStr; @@ -292,7 +292,7 @@ XSync(QX11Info::display(),false); XMoveResizeWindow(QX11Info::display(), proxyWinId, geom.x(), geom.y(), 800, 600); XMapWindow(QX11Info::display(), proxyWinId); -@@ -11115,7 +11115,7 @@ +@@ -11117,7 +11117,7 @@ return QRect(); return proxyRect; #endif @@ -301,7 +301,7 @@ QRect proxyRect; Window root; int x,y; -@@ -11202,7 +11202,7 @@ +@@ -11204,7 +11204,7 @@ xinSizeInc=1; else xinSizeInc=-1; @@ -310,7 +310,7 @@ lastDisplayGeometry.setWidth(lastDisplayGeometry.width()+xinSizeInc); XSync(QX11Info::display(),false); XResizeWindow(QX11Info::display(), proxyWinId, -@@ -11341,7 +11341,7 @@ +@@ -11343,7 +11343,7 @@ setStatStatus(); act_embedContol->setText ( tr ( "Attach X2Go window" ) ); act_embedContol->setIcon ( QIcon ( ":/img/icons/32x32/attach.png" ) ); @@ -319,7 +319,7 @@ //if QX11EmbedContainer cannot embed window, check if window exists //and reconnect if ( !embedControlChanged ) -@@ -11749,7 +11749,7 @@ +@@ -11751,7 +11751,7 @@ void ONMainWindow::slotChangeKbdLayout(const QString& layout) { @@ -328,7 +328,7 @@ QStringList args; args<<"-layout"<setEchoMode ( QLineEdit::Password ); pass->setFocus(); @@ -337,7 +337,7 @@ connect ( login,SIGNAL ( clicked() ),this, SLOT ( slotActivateWindow() ) ); connect ( pass,SIGNAL ( clicked() ),this, -@@ -12786,7 +12786,7 @@ +@@ -12788,7 +12788,7 @@ dr.rmdir ( path ); } @@ -346,7 +346,7 @@ long ONMainWindow::X11FindWindow ( QString text, long rootWin ) { Window wParent; -@@ -12827,7 +12827,7 @@ +@@ -12829,7 +12829,7 @@ long ONMainWindow::findWindow ( QString text ) { x2goDebug<<"Searching window with title: " + text; diff -Nru x2goclient-4.1.2.1/debian/patches/1003_fix_ftbfs-against-libssh-0-8.patch x2goclient-4.1.2.1/debian/patches/1003_fix_ftbfs-against-libssh-0-8.patch --- x2goclient-4.1.2.1/debian/patches/1003_fix_ftbfs-against-libssh-0-8.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-4.1.2.1/debian/patches/1003_fix_ftbfs-against-libssh-0-8.patch 2018-08-13 19:46:42.000000000 +0000 @@ -0,0 +1,14 @@ +Description: No libssh_threads in libssh 0.8 anymore +Author: Mike Gabriel + +--- a/x2goclient.pro ++++ b/x2goclient.pro +@@ -132,7 +132,7 @@ + src/compat.cpp \ + src/pulsemanager.cpp + +-LIBS += -lssh -lssh_threads ++LIBS += -lssh + win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 + + RC_FILE = res/x2goclient.rc diff -Nru x2goclient-4.1.2.1/debian/patches/1004_fix_ftbfs-against-qt5-11.patch x2goclient-4.1.2.1/debian/patches/1004_fix_ftbfs-against-qt5-11.patch --- x2goclient-4.1.2.1/debian/patches/1004_fix_ftbfs-against-qt5-11.patch 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-4.1.2.1/debian/patches/1004_fix_ftbfs-against-qt5-11.patch 2018-08-13 19:48:20.000000000 +0000 @@ -0,0 +1,13 @@ +Description: Fix FTBFS when built against Qt 5.11 +Author: Mike Gabriel + +--- a/src/printwidget.cpp ++++ b/src/printwidget.cpp +@@ -23,6 +23,7 @@ + #include "x2gosettings.h" + #include "x2gologdebug.h" + #include ++#include + #ifdef Q_OS_WIN + #include "wapi.h" + #endif diff -Nru x2goclient-4.1.2.1/debian/patches/series x2goclient-4.1.2.1/debian/patches/series --- x2goclient-4.1.2.1/debian/patches/series 2018-06-24 20:52:13.000000000 +0000 +++ x2goclient-4.1.2.1/debian/patches/series 2018-08-13 19:48:20.000000000 +0000 @@ -1,2 +1,4 @@ update_makefile_qt5-build.patch 1002_fix-ftbfs-on-non-linux.patch +1003_fix_ftbfs-against-libssh-0-8.patch +1004_fix_ftbfs-against-qt5-11.patch