[pkg-remote-commits] [x2goclient] 04/07: debian/patches: Update 1002_fix-ftbfs-on-non-linux.patch. Spot another location where to drop inclusion of sys/mount.h.
Mike Gabriel
sunweaver at debian.org
Mon Feb 19 22:46:15 UTC 2018
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository x2goclient.
commit 355ca223d6d2a92a8a9d41b3ec64c7d54b0a94ed
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Feb 19 23:13:10 2018 +0100
debian/patches: Update 1002_fix-ftbfs-on-non-linux.patch. Spot another location where to drop inclusion of sys/mount.h.
---
debian/patches/1002_fix-ftbfs-on-non-linux.patch | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/patches/1002_fix-ftbfs-on-non-linux.patch b/debian/patches/1002_fix-ftbfs-on-non-linux.patch
index 75e99fa..2938a8b 100644
--- a/debian/patches/1002_fix-ftbfs-on-non-linux.patch
+++ b/debian/patches/1002_fix-ftbfs-on-non-linux.patch
@@ -458,10 +458,11 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
#ifdef Q_OS_WIN
--- a/src/onmainwindow_privat.h
+++ b/src/onmainwindow_privat.h
-@@ -85,10 +85,9 @@
+@@ -84,11 +84,9 @@
+ #include "contest.h"
#if !defined Q_OS_WIN
- #include <sys/mount.h>
+-#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>
@@ -470,7 +471,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
#endif // Q_OS_LINUX
#endif // !defined Q_OS_WIN
-@@ -150,7 +149,7 @@
+@@ -150,7 +148,7 @@
#include <QHostInfo>
#endif
@@ -479,7 +480,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
#if QT_VERSION < 0x050000
#include <QX11Info>
#else
-@@ -161,7 +160,7 @@
+@@ -161,7 +159,7 @@
#endif
#ifdef CFGPLUGIN
--
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