[pkg-remote-commits] [x2goclient] 01/02: debian/patches: Add 1002_fix-ftbfs-on-non-linux.patch. Fix FTBFS on Debian GNU/kFreeBSD and Debian GNU/Hurd.
Mike Gabriel
sunweaver at debian.org
Sun Oct 1 18:15:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository x2goclient.
commit cff21c65544af7f40c05d19b6437ed49e3ffc79a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Oct 1 20:14:24 2017 +0200
debian/patches: Add 1002_fix-ftbfs-on-non-linux.patch. Fix FTBFS on Debian GNU/kFreeBSD and Debian GNU/Hurd.
---
debian/patches/1002_fix-ftbfs-on-non-linux.patch | 806 +++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 807 insertions(+)
diff --git a/debian/patches/1002_fix-ftbfs-on-non-linux.patch b/debian/patches/1002_fix-ftbfs-on-non-linux.patch
new file mode 100644
index 0000000..6898e47
--- /dev/null
+++ b/debian/patches/1002_fix-ftbfs-on-non-linux.patch
@@ -0,0 +1,806 @@
+Description: Successfully built on Debian GNU/kFreeBSD and Debian GNU/Hurd
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/src/clicklineedit.cpp
++++ b/src/clicklineedit.cpp
+@@ -31,7 +31,7 @@
+ {
+ }
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void ClickLineEdit::mouseReleaseEvent ( QMouseEvent * event )
+ {
+ QLineEdit::mouseReleaseEvent(event);
+--- a/src/clicklineedit.h
++++ b/src/clicklineedit.h
+@@ -31,7 +31,7 @@
+ ~ClickLineEdit();
+ signals:
+ void clicked();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ protected:
+ virtual void mouseReleaseEvent ( QMouseEvent * event );
+ /* virtual void focusInEvent ( QFocusEvent * event );
+--- a/src/editconnectiondialog.cpp
++++ b/src/editconnectiondialog.cpp
+@@ -110,7 +110,7 @@
+ setContentsMargins ( 3,3,3,3 );
+ fr->setCurrentIndex ( ind );
+ slot_changeCaption(sessSet->sessionName());
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ sessSet->slot_rdpDirectClicked();
+ #endif
+ }
+@@ -169,7 +169,7 @@
+ }
+ }
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void EditConnectionDialog::slot_directRDP(bool direct, bool isXDMCP)
+ {
+ fr->setTabEnabled(1,!direct);
+--- a/src/editconnectiondialog.h
++++ b/src/editconnectiondialog.h
+@@ -64,7 +64,7 @@
+ void slot_changeCaption ( const QString& newName );
+ void slot_accepted();
+ void slot_default();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void slot_directRDP(bool direct, bool isXDMCP);
+ #endif
+ };
+--- a/src/ongetpass.cpp
++++ b/src/ongetpass.cpp
+@@ -52,7 +52,7 @@
+ QApplication app ( argc,argv );
+
+ #ifndef Q_WS_HILDON
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ #if QT_VERSION < 0x050000
+ app.setStyle ( new QPlastiqueStyle() );
+ #else
+--- a/src/onmainwindow.cpp
++++ b/src/onmainwindow.cpp
+@@ -55,7 +55,7 @@
+ }
+ #endif
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ image=shape=0;
+ #endif
+ x2goInfof(1) << tr("Starting X2Go Client...");
+@@ -217,7 +217,7 @@
+ addToAppNames ( "OFFICE",tr ( "OpenOffice.org" ) );
+ addToAppNames ( "TERMINAL",tr ( "Terminal" ) );
+
+-#ifndef Q_OS_LINUX
++#if defined(Q_OS_DARWIN) || defined(Q_OS_WIN)
+ #if QT_VERSION < 0x050000
+ widgetExtraStyle = new QPlastiqueStyle ();
+ #else
+@@ -447,7 +447,7 @@
+ initSelectSessDlg();
+ initStatusDlg();
+
+-#if defined(CFGPLUGIN) && defined(Q_OS_LINUX)
++#if defined(CFGPLUGIN) && (defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD))
+
+ x2goDebug<<"Creating embedded container.";
+ embedContainer=new QX11EmbedContainer ( fr );
+@@ -479,7 +479,7 @@
+
+
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (thinMode)
+ {
+ QTimer *timer = new QTimer(this);
+@@ -556,7 +556,7 @@
+ {
+ if (!isHidden())
+ hide();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ XSync(QX11Info::display(),false);
+ #endif
+ }
+@@ -735,7 +735,7 @@
+ oldParentPos=QPoint ( 0,0 );
+ #endif
+ childId=0l;
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+
+ connect ( embedContainer, SIGNAL ( clientClosed() ), this,
+ SLOT ( slotDetachProxyWindow() ) );
+@@ -790,7 +790,7 @@
+ if ( !managedMode )
+ {
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QTimer::singleShot ( 500, this,
+ SLOT ( slotActivateWindow() ) );
+ #endif
+@@ -1426,7 +1426,7 @@
+ QVariant ( isMaximized() ) );
+ st.setting()->sync();
+ x2goDebug<<"Saved settings.";
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (image)
+ XFreePixmap(QX11Info::display(),image);
+ if (shape)
+@@ -2734,7 +2734,7 @@
+ autologin=st->setting()->value (
+ sid+"/autologin",
+ ( QVariant ) false ).toBool();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if(command =="XDMCP" && st->setting()->value (
+ sid+"/directxdmcp",
+ ( QVariant ) false ).toBool())
+@@ -3240,7 +3240,7 @@
+ if (config.brokerNoAuth && brokerNoauthWithSessionUsername) {
+ config.brokerUser = login->text();
+ }
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ X2goSettings* st=new X2goSettings(config.iniFile, QSettings::IniFormat);
+ QString sid=sessionExplorer->getLastSession()->id();
+ QString cmd=st->setting()->value ( sid+"/command",
+@@ -3302,7 +3302,7 @@
+ sshConnection->executeCommand ( "x2gogetservers", this, SLOT ( slotGetServers ( bool, QString,int ) ));
+ }
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void ONMainWindow::startDirectRDP()
+ {
+ X2goSettings* st;
+@@ -3538,7 +3538,7 @@
+ bool ONMainWindow::startSession ( const QString& sid )
+ {
+ setEnabled ( false );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ directRDP=false;
+ #endif
+ QString passwd;
+@@ -3602,7 +3602,7 @@
+ ( QVariant ) false ).toBool();
+ krbDelegation=st->setting()->value ( sid+"/krbdelegation",
+ ( QVariant ) false ).toBool();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ directRDP=(st->setting()->value ( sid+"/directrdp",
+ ( QVariant ) false ).toBool() && cmd == "RDP");
+
+@@ -4860,7 +4860,7 @@
+ void ONMainWindow::slotSuspendSess()
+ {
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (directRDP)
+ {
+ nxproxy->terminate();
+@@ -4921,7 +4921,7 @@
+ void ONMainWindow::slotSuspendSessFromSt()
+ {
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (directRDP)
+ {
+ nxproxy->terminate();
+@@ -4945,7 +4945,7 @@
+
+ void ONMainWindow::slotTermSessFromSt()
+ {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (directRDP)
+ {
+
+@@ -5018,7 +5018,7 @@
+ void ONMainWindow::slotTermSess()
+ {
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (directRDP)
+ {
+ nxproxy->terminate();
+@@ -5384,7 +5384,7 @@
+ sshConnection->executeCommand (scmd);
+
+ bool sysPulse=false;
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ loadPulseModuleNativeProtocol();
+ QFile file ( "/etc/default/pulseaudio" );
+ if ( file.open ( QIODevice::ReadOnly |
+@@ -5954,7 +5954,7 @@
+
+ void ONMainWindow::slotProxyError ( QProcess::ProcessError err )
+ {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if(err==QProcess::FailedToStart && directRDP)
+ {
+ QString main_text = tr("Failed to start RDP or XMDCP client");
+@@ -6063,7 +6063,7 @@
+ }
+ }
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (directRDP)
+ nxproxy=0;
+ #endif
+@@ -6077,7 +6077,7 @@
+ nxproxy=0l;
+ proxyWinId=0;
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (directRDP)
+ {
+ pass->setText ( "" );
+@@ -9359,7 +9359,7 @@
+ return false;
+ }
+
+-#ifndef Q_OS_LINUX
++#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN)
+ void ONMainWindow::setWidgetStyle ( QWidget* widget )
+ {
+ widget->setStyle ( widgetExtraStyle );
+@@ -9750,7 +9750,7 @@
+ ( QVariant )
+ "UTF-8" ).toString();
+ #endif
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QString fromCode=st.setting()->value (
+ sid+"/iconvfrom",
+ ( QVariant ) tr (
+@@ -10849,7 +10849,7 @@
+ else
+ pixmap=*(sessionExplorer->getLastSession()->sessIcon());
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+
+ XStoreName(QX11Info::display(), proxyWinId, title.toLocal8Bit().data());
+
+@@ -10896,7 +10896,7 @@
+ void ONMainWindow::slotSetProxyWinFullscreen()
+ {
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+
+ QRect geom=QApplication::desktop()->screenGeometry(localDisplayNumber-1);
+ Atom atom = XInternAtom ( QX11Info::display(), "_NET_WM_STATE_FULLSCREEN", True );
+@@ -10952,7 +10952,7 @@
+ ", h: "+ QString("%1").arg(geom.height());
+ x2goDebug<<"Resizing proxy window to fit display: " + QString("%1").arg(disp) + " " + geoStr;
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ XSync(QX11Info::display(),false);
+ XMoveResizeWindow(QX11Info::display(), proxyWinId, geom.x(), geom.y(), 800, 600);
+ XMapWindow(QX11Info::display(), proxyWinId);
+@@ -10972,7 +10972,7 @@
+ return QRect();
+ return proxyRect;
+ #endif
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QRect proxyRect;
+ Window root;
+ int x,y;
+@@ -11054,7 +11054,7 @@
+ xinSizeInc=1;
+ else
+ xinSizeInc=-1;
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ lastDisplayGeometry.setWidth(lastDisplayGeometry.width()+xinSizeInc);
+ XSync(QX11Info::display(),false);
+ XResizeWindow(QX11Info::display(), proxyWinId,
+@@ -11185,7 +11185,7 @@
+ setStatStatus();
+ act_embedContol->setText ( tr ( "Attach X2Go window" ) );
+ act_embedContol->setIcon ( QIcon ( ":/img/icons/32x32/attach.png" ) );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ //if QX11EmbedContainer cannot embed window, check if window exists
+ //and reconnect
+ if ( !embedControlChanged )
+@@ -11600,7 +11600,7 @@
+
+ void ONMainWindow::slotChangeKbdLayout(const QString& layout)
+ {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QStringList args;
+ args<<"-layout"<<layout;
+
+@@ -11677,7 +11677,7 @@
+ pass->setEchoMode ( QLineEdit::Password );
+ pass->setFocus();
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ connect ( login,SIGNAL ( clicked() ),this,
+ SLOT ( slotActivateWindow() ) );
+ connect ( pass,SIGNAL ( clicked() ),this,
+@@ -12638,7 +12638,7 @@
+ dr.rmdir ( path );
+ }
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ long ONMainWindow::X11FindWindow ( QString text, long rootWin )
+ {
+ Window wParent;
+@@ -12679,7 +12679,7 @@
+ long ONMainWindow::findWindow ( QString text )
+ {
+ x2goDebug<<"Searching window with title: " + text;
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ return X11FindWindow ( text );
+ #endif
+ #ifdef Q_OS_WIN
+@@ -12702,7 +12702,7 @@
+
+ void ONMainWindow::doPluginInit()
+ {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ Dl_info info;
+ dladdr ( ( void* ) & ( ONMainWindow::getPortable ),&info );
+ QString fname=info.dli_fname;
+@@ -12785,7 +12785,7 @@
+ QSize ONMainWindow::getWindowSize ( long winId )
+ {
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ XWindowAttributes atr;
+ if ( XGetWindowAttributes ( QX11Info::display(),winId,&atr ) )
+ return QSize ( atr.width,atr.height );
+@@ -12833,7 +12833,7 @@
+ {
+ childId=wndId;
+ embedContainer->show();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+
+ x2goDebug<<"Embedding window with ID "<<wndId<<" in container.";
+
+@@ -12856,7 +12856,7 @@
+ {
+ if ( !childId )
+ return;
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if ( embedContainer )
+ {
+ embedContainer->discardClient();
+--- a/src/onmainwindow.h
++++ b/src/onmainwindow.h
+@@ -61,7 +61,7 @@
+ @author Oleksandr Shneyder
+ */
+
+-#if defined(CFGPLUGIN) && defined(Q_OS_LINUX)
++#if defined(CFGPLUGIN) && (defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD))
+ class QX11EmbedContainer;
+ #endif
+ class QToolButton;
+@@ -778,7 +778,7 @@
+ bool runStartApp;
+ bool ldapOnly;
+ bool isScDaemonOk;
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ bool directRDP;
+ #endif
+
+@@ -887,7 +887,7 @@
+ QRect dispGeometry;
+ #endif
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ long image, shape;
+ #endif
+
+@@ -1150,7 +1150,7 @@
+
+ private:
+ void resizeProxyWinOnDisplay(int display);
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ long X11FindWindow ( QString text, long rootWin=0 );
+ #endif
+ void addToAppNames ( QString intName, QString transName );
+@@ -1176,7 +1176,7 @@
+ void printSshDError_noAuthorizedKeysFile();
+ void loadPulseModuleNativeProtocol();
+ void initEmbedToolBar();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void startDirectRDP();
+ #endif
+ void filterDesktops ( const QString& filter,
+@@ -1218,7 +1218,7 @@
+ long childId;
+ QSize oldParentSize;
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QX11EmbedContainer* embedContainer;
+ #endif
+ #ifdef Q_OS_WIN
+--- a/src/onmainwindow_privat.h
++++ b/src/onmainwindow_privat.h
+@@ -84,7 +84,7 @@
+
+ #if !defined Q_OS_WIN
+ #include <sys/mount.h>
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ #include <X11/Xatom.h>
+ #include <X11/xpm.h>
+ #include <linux/fs.h>
+@@ -149,7 +149,7 @@
+ #include <QHostInfo>
+ #endif
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ #if QT_VERSION < 0x050000
+ #include <QX11Info>
+ #else
+@@ -160,7 +160,7 @@
+ #endif
+
+ #ifdef CFGPLUGIN
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ #include <dlfcn.h>
+ #include <QX11EmbedContainer>
+ #endif
+--- a/src/pulsemanager.cpp
++++ b/src/pulsemanager.cpp
+@@ -143,7 +143,7 @@
+ #elif defined (Q_OS_WIN)
+ server_working_dir_ = QString (app_dir_ + "/pulse/");
+ server_binary_ = QString (app_dir_ + "/pulse/pulseaudio.exe");
+-#elif defined (Q_OS_LINUX)
++#elif defined (Q_OS_LINUX) || defined (Q_OS_FREEBSD_KERNEL) || defined (Q_OS_HURD)
+ std::ssize_t path_len = pathconf (".", _PC_PATH_MAX);
+
+ if (-1 == path_len) {
+@@ -212,7 +212,7 @@
+ start_osx ();
+ #elif defined (Q_OS_WIN)
+ start_win ();
+-#elif defined (Q_OS_LINUX)
++#elif defined (Q_OS_LINUX) || defined (Q_OS_FREEBSD_KERNEL) || defined (Q_OS_HURD)
+ start_linux ();
+ #endif // defined (Q_OS_DARWIN)
+ }
+--- a/src/sessionbutton.cpp
++++ b/src/sessionbutton.cpp
+@@ -449,7 +449,7 @@
+ }
+ else if ( command =="RDP" )
+ {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (st->setting()->value ( sid+"/directrdp",
+ ( QVariant ) false ).toBool())
+ directRDP=true;
+@@ -460,7 +460,7 @@
+ }
+ else if ( command =="XDMCP" )
+ {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if (st->setting()->value ( sid+"/directxdmcp",
+ ( QVariant ) false ).toBool()) {
+ directRDP=true;
+--- a/src/sessionwidget.cpp
++++ b/src/sessionwidget.cpp
+@@ -90,7 +90,7 @@
+ sshPort->setValue ( mainWindow->getDefaultSshPort().toInt() );
+ sshPort->setMinimum ( 1 );
+ sshPort->setMaximum ( 999999999 );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ rdpPort=new QSpinBox ( sgb );
+ rdpPort->setValue ( mainWindow->getDefaultSshPort().toInt() );
+ rdpPort->setMinimum ( 1 );
+@@ -121,7 +121,7 @@
+ elLay->addWidget ( server );
+ elLay->addWidget ( uname );
+ elLay->addWidget ( sshPort );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ elLay->addWidget ( rdpPort );
+ #endif
+ suLay->addLayout ( slLay );
+@@ -244,7 +244,7 @@
+ sessLay->addSpacing ( 15 );
+ sessLay->addWidget ( sgb );
+ sessLay->addWidget ( deskSess );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ cbDirectRDP=new QCheckBox(tr("Direct RDP connection"), deskSess);
+ cmdLay->addWidget(cbDirectRDP,1,0,1,6);
+ cbDirectRDP->hide();
+@@ -282,7 +282,7 @@
+ connect (server, SIGNAL(textChanged(const QString&)),this, SLOT(slot_emitSettings()));
+ connect (uname, SIGNAL(textChanged(const QString&)),this, SLOT(slot_emitSettings()));
+ connect (cbKrbLogin, SIGNAL(clicked(bool)), this, SLOT(slot_krbChecked()));
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ connect (rdpPort, SIGNAL(valueChanged(int)),this, SLOT(slot_emitSettings()));
+ #endif
+
+@@ -366,7 +366,7 @@
+ }
+
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void SessionWidget::slot_rdpDirectClicked()
+ {
+ bool isDirectRDP=cbDirectRDP->isChecked();
+@@ -478,7 +478,7 @@
+ {
+ leCmdIp->setText ( tr ( "Command:" ) );
+ pbAdvanced->hide();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ cbDirectRDP->hide();
+ #endif
+ leCmdIp->show();
+@@ -506,7 +506,7 @@
+ leCmdIp->setText ( tr ( "Server:" ) );
+ pbAdvanced->show();
+ cmd->setText ( rdpServer );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ cbDirectRDP->show();
+ #endif
+ }
+@@ -514,7 +514,7 @@
+ {
+ leCmdIp->setText ( tr ( "XDMCP server:" ) );
+ cmd->setText ( xdmcpServer );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ cbDirectRDP->show();
+ cbDirectRDP->setText(tr ("direct XDMCP connection"));
+ #endif
+@@ -526,7 +526,7 @@
+ cmd->setText ( "" );
+ }
+ }
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ slot_rdpDirectClicked();
+ #endif
+ }
+@@ -594,7 +594,7 @@
+ sessionId+"/sshport",
+ ( QVariant ) mainWindow->getDefaultSshPort().toInt()
+ ).toInt() );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ rdpPort->setValue (
+ st.setting()->value (
+ sessionId+"/rdpport",3389
+@@ -689,7 +689,7 @@
+ ( QVariant ) "" ).toString().trimmed();
+ xdmcpServer=st.setting()->value ( sessionId+"/xdmcpserver",
+ ( QVariant ) "localhost" ).toString().trimmed();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ if(st.setting()->value (sessionId+"/directrdp",false ).toBool())
+ {
+ cbDirectRDP->setChecked(true);
+@@ -758,7 +758,7 @@
+ cmd->setEnabled ( true );
+ cmd->setText ( rdpServer );
+ pbAdvanced->show();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ cbDirectRDP->show();
+ slot_rdpDirectClicked();
+ #endif
+@@ -769,7 +769,7 @@
+ sessBox->setCurrentIndex ( XDMCP );
+ cmd->setEnabled ( true );
+ cmd->setText ( xdmcpServer );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ cbDirectRDP->show();
+ slot_rdpDirectClicked();
+ #endif
+@@ -786,7 +786,7 @@
+ sessName->selectAll();
+ sessName->setFocus();
+ }
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ slot_rdpDirectClicked();
+ #endif
+ slot_krbChecked();
+@@ -811,7 +811,7 @@
+ icon->setIcon ( QIcon ( sessIcon ) );
+ sshPort->setValue (
+ mainWindow->getDefaultSshPort().toInt() );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ rdpPort->setValue (3389);
+ #endif
+
+@@ -857,7 +857,7 @@
+
+ st.setting()->setValue ( sessionId+"/key",
+ ( QVariant ) key->text().trimmed() );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ st.setting()->setValue ( sessionId+"/rdpport",
+ ( QVariant ) rdpPort->value() );
+ #endif
+@@ -866,7 +866,7 @@
+ st.setting()->setValue(sessionId+"/autologin",( QVariant ) cbAutoLogin->isChecked());
+ st.setting()->setValue(sessionId+"/krblogin",( QVariant ) cbKrbLogin->isChecked());
+ st.setting()->setValue(sessionId+"/krbdelegation",( QVariant ) cbKrbDelegation->isChecked());
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ st.setting()->setValue(sessionId+"/directrdp",( QVariant ) cbDirectRDP->isChecked());
+ st.setting()->setValue(sessionId+"/directxdmcp",( QVariant ) cbDirectRDP->isChecked());
+ #endif
+@@ -960,7 +960,7 @@
+ return sessName->text();
+ }
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void SessionWidget::slot_emitSettings()
+ {
+ emit settingsChanged(server->text(), QString::number( rdpPort->value()), uname->text());
+--- a/src/sessionwidget.h
++++ b/src/sessionwidget.h
+@@ -53,7 +53,7 @@
+ void slot_krbChecked();
+ void slot_openFolder();
+ public slots:
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void slot_rdpDirectClicked();
+ void slot_emitSettings();
+ #endif
+@@ -66,14 +66,14 @@
+ QSpinBox* sshPort;
+ ONMainWindow* parent;
+ bool newSession;
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QSpinBox* rdpPort;
+ #endif
+ QLineEdit* key;
+ QCheckBox* cbAutoLogin;
+ QCheckBox* cbKrbLogin;
+ QCheckBox* cbKrbDelegation;
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QCheckBox* cbDirectRDP;
+ #endif
+ QString sessIcon;
+@@ -110,7 +110,7 @@
+ void readConfig();
+ signals:
+ void nameChanged ( const QString & );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void directRDP(bool, bool);
+ void settingsChanged(const QString &, const QString &, const QString &);
+ #endif
+--- a/src/settingswidget.cpp
++++ b/src/settingswidget.cpp
+@@ -199,7 +199,7 @@
+ setLay->addWidget ( dgb );
+ setLay->addWidget ( clipGr );
+ setLay->addWidget ( kgb );
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ #ifdef CFGCLIENT
+ rdpBox=new QGroupBox ( tr ( "RDP client" ),this );
+ setLay->addWidget ( rdpBox );
+@@ -301,7 +301,7 @@
+ }
+
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void SettingsWidget::setDirectRdp(bool direct, bool isXDMCP)
+ {
+ clipGr->setVisible(!direct);
+@@ -415,7 +415,7 @@
+ displayNumber->setValue(1);
+ }
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ #ifdef CFGCLIENT
+ maxRes->setChecked(st.setting()->value ( sessionId+"/maxdim", false).toBool());
+ QString client=st.setting()->value ( sessionId+"/rdpclient","rdesktop").toString();
+@@ -551,7 +551,7 @@
+ st.setting()->setValue ( sessionId+"/display",
+ ( QVariant ) displayNumber->value() );
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ #ifdef CFGCLIENT
+ st.setting()->setValue ( sessionId+"/maxdim",
+ ( QVariant ) maxRes->isChecked() );
+@@ -661,7 +661,7 @@
+ st.setting()->sync();
+ }
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void SettingsWidget::setServerSettings(QString server, QString port, QString user)
+ {
+ this->server=server;
+--- a/src/settingswidget.h
++++ b/src/settingswidget.h
+@@ -43,7 +43,7 @@
+ ~SettingsWidget();
+ void setDefaults();
+ void saveSettings();
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ void setDirectRdp(bool direct, bool isXDMCP);
+ public slots:
+ void setServerSettings(QString server, QString port, QString user);
+@@ -87,7 +87,7 @@
+ QRadioButton *rbClipClient;
+ QRadioButton *rbClipNone;
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QGroupBox *rdpBox;
+ QRadioButton* rRdesktop;
+ QRadioButton* rXfreeRDPOld;
+--- a/src/sharewidget.cpp
++++ b/src/sharewidget.cpp
+@@ -240,7 +240,7 @@
+ ( QVariant )
+ "UTF-8" ).toString();
+ #endif
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HURD)
+ QString fromCode=st.setting()->value ( sessionId+"/iconvfrom",
+ ( QVariant ) tr (
+ "ISO8859-1" ) ).toString();
diff --git a/debian/patches/series b/debian/patches/series
index ecf6e36..0949c03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
1001_deprecated-apache2-config.patch
+1002_fix-ftbfs-on-non-linux.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/x2goclient.git
More information about the pkg-remote-commits
mailing list