[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.0+dfsg-4-61-gfdfaff5

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 3141aa260f8c7df92916bcfdefb4ac71f2629ab3
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Oct 15 10:51:31 2015 +0000

    Refresh hurd-forkfd.diff
---
 debian/patches/hurd-forkfd.diff | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/patches/hurd-forkfd.diff b/debian/patches/hurd-forkfd.diff
index fdf6984..b2b901f 100644
--- a/debian/patches/hurd-forkfd.diff
+++ b/debian/patches/hurd-forkfd.diff
@@ -8,15 +8,17 @@ Description: Disable use of waitid() on Hurd
 Forwarded: no (possibly not needed)
 Last-Update: 2015-07-04
 
---- a/src/3rdparty/forkfd/forkfd.c
-+++ b/src/3rdparty/forkfd/forkfd.c
-@@ -53,6 +53,9 @@
- #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
- #  define HAVE_WAITID   1
+Index: qtbase-opensource-src-5.5.1/src/3rdparty/forkfd/forkfd.c
+===================================================================
+--- qtbase-opensource-src-5.5.1.orig/src/3rdparty/forkfd/forkfd.c
++++ qtbase-opensource-src-5.5.1/src/3rdparty/forkfd/forkfd.c
+@@ -54,6 +54,9 @@
+ #    define HAVE_PIPE2    1
+ #  endif
  #endif
 +#ifdef __GNU__
 +#  undef HAVE_WAITID
 +#endif
  
- #if defined(__APPLE__)
- /* Up until OS X 10.7, waitid(P_ALL, ...) will return success, but will not
+ #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
+ #  define HAVE_WAITID   1

-- 
qtbase packaging