[SCM] krdc packaging branch, master, updated. debian/4.13.1-1-6-gda139d9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/krdc.git;a=commitdiff;h=8006080

The following commit has been merged in the master branch:
commit 80060805c44e01c4acc3179b455b21af56c4baf8
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Aug 26 23:18:23 2014 +0200

    New patch: fix_kfreebsd_ftbfs (Closes: #754687)
---
 debian/changelog                  |  2 +-
 debian/patches/fix_kfreebsd_ftbfs | 28 ++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 924c145..d2e2494 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 krdc (4:4.13.1-2) UNRELEASED; urgency=medium
 
-  * 
+  * New patch: fix_kfreebsd_ftbfs (Closes: #754687)
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 26 Aug 2014 23:15:54 +0200
 
diff --git a/debian/patches/fix_kfreebsd_ftbfs b/debian/patches/fix_kfreebsd_ftbfs
new file mode 100644
index 0000000..2352ba5
--- /dev/null
+++ b/debian/patches/fix_kfreebsd_ftbfs
@@ -0,0 +1,28 @@
+Index: krdc/vnc/vncclientthread.cpp
+===================================================================
+--- krdc.orig/vnc/vncclientthread.cpp	2014-08-26 23:05:50.606094524 +0200
++++ krdc/vnc/vncclientthread.cpp	2014-08-26 23:13:29.107290324 +0200
+@@ -26,6 +26,7 @@
+ #include <cerrno>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
++#include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <QMutexLocker>
+@@ -606,6 +607,7 @@
+         return;
+     }
+ 
++#if !defined(__FreeBSD__) || __FreeBSD__ >= 10
+     optval = m_keepalive.intervalSeconds;
+     if (setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) {
+         kError(5011) << "setsockopt(TCP_KEEPIDLE)" << strerror(errno);
+@@ -623,6 +625,7 @@
+         kError(5011) << "setsockopt(TCP_KEEPCNT)" << strerror(errno);
+         return;
+     }
++#endif
+     m_keepalive.set = true;
+     kDebug(5011) << "TCP keepalive set";
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0e18d41
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_kfreebsd_ftbfs

-- 
krdc packaging