[Pkg-voip-commits] [twinkle] 66/73: Fix detection of <linux/errqueue.h>

[Peter Colberg]

This is an automated email from the git hooks/post-receive script.

pc-guest pushed a commit to branch master
in repository twinkle.

commit ef3763a7f69db28333d0b1038dc43b03675f34ee
Author: Peter Colberg <peter at colberg.org>
Date:   Tue Dec 29 22:23:48 2015 -0500

    Fix detection of <linux/errqueue.h>
---
 debian/patches/include-linux-errqueue.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/include-linux-errqueue.patch b/debian/patches/include-linux-errqueue.patch
new file mode 100644
index 0000000..f639f74
--- /dev/null
+++ b/debian/patches/include-linux-errqueue.patch
@@ -0,0 +1,26 @@
+Description: Fix detection of <linux/errqueue.h>
+ Linux ≥ 3.17 requires the definition of `struct timespec`.
+Author: Peter Colberg <peter at colberg.org>
+Forwarded: https://github.com/LubosD/twinkle/pull/42
+Last-Update: 2015-12-30
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,6 +23,7 @@ if (WITH_QT4 AND WITH_QT5)
+ endif (WITH_QT4 AND WITH_QT5)
+ 
+ include (CheckIncludeFile)
++include (CheckIncludeFiles)
+ 
+ find_package(LibXml2 REQUIRED)
+ find_package(LibMagic REQUIRED)
+@@ -130,7 +131,7 @@ endif (WITH_G729)
+ 
+ check_include_file(unistd.h HAVE_UNISTD_H)
+ check_include_file(linux/types.h HAVE_LINUX_TYPES_H)
+-check_include_file(linux/errqueue.h HAVE_LINUX_ERRQUEUE_H)
++check_include_files("sys/socket.h;linux/errqueue.h" HAVE_LINUX_ERRQUEUE_H)
+ 
+ set(datadir "${CMAKE_INSTALL_PREFIX}/share/twinkle")
+ configure_file(twinkle_config.h.in twinkle_config.h)
diff --git a/debian/patches/series b/debian/patches/series
index 554bef8..34122fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 desktop-entry-contains-encoding-key.patch
 libgsm.patch
+include-linux-errqueue.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git