[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-2-23-gb010a21

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=b57f088

The following commit has been merged in the master branch:
commit b57f088bee675df0dd6691400952a60f2975105a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 23 11:31:17 2015 +0300

    Add a patch to undef HAVE_WAITID if needed constants are not defined.
    
    This should fix the build on hurd-i386.
---
 debian/changelog                |  2 ++
 debian/patches/hurd_forkfd.diff | 17 +++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2d7146b..e2ce777 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ qtbase-opensource-src (5.5.1+dfsg-3) UNRELEASED; urgency=medium
     library (closes: #802704).
   * Add a patch to fix QStorageInfo implementation for BSD4 systems
     (bsd_volumeinfo.diff), to fix the build failure on kfreebsd.
+  * Add a patch to undef HAVE_WAITID if needed constants are not defined
+    (hurd_forkfd.diff), to fix the build failure on hurd.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add qtwayland5 as a libqt5gui5 suggestion. We want people trying to
diff --git a/debian/patches/hurd_forkfd.diff b/debian/patches/hurd_forkfd.diff
new file mode 100644
index 0000000..b6b2190
--- /dev/null
+++ b/debian/patches/hurd_forkfd.diff
@@ -0,0 +1,17 @@
+Description: undef HAVE_WAITID if needed constants are not defined
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-yet
+Last-Update: 2015-10-23
+
+--- a/src/3rdparty/forkfd/forkfd.c
++++ b/src/3rdparty/forkfd/forkfd.c
+@@ -58,6 +58,9 @@
+ #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
+ #  define HAVE_WAITID   1
+ #endif
++#if !defined(WEXITED) || !defined(WNOWAIT)
++#  undef HAVE_WAITID
++#endif
+ 
+ #if defined(__FreeBSD__)
+ #  define HAVE_PIPE2    1
diff --git a/debian/patches/series b/debian/patches/series
index 5fc0b8e..66c0341 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ set_positionautomatic.diff
 
 # To be forwarded upstream
 bsd_volumeinfo.diff
+hurd_forkfd.diff
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging