[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-12-g344626d

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 344626d0360f4093add96ea82131de9e983e2ec2
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 4 17:49:21 2015 +0200

    Fix build on Hurd
    
    temporarly disable waitid() in forkfd code
---
 debian/changelog                |  4 ++++
 debian/patches/hurd-forkfd.diff | 22 ++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index de19ca4..3c14762 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
   * Refresh gnukfreebsd.diff.
   * Update install files for already present packages.
 
+  [ Pino Toscano ]
+  * Fix build on Hurd, by temporarly disabling waitid() in forkfd code;
+    patch hurd-forkfd.diff.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jun 2015 14:41:08 +0300
 
 qtbase-opensource-src (5.4.2+dfsg-4) unstable; urgency=medium
diff --git a/debian/patches/hurd-forkfd.diff b/debian/patches/hurd-forkfd.diff
new file mode 100644
index 0000000..fdf6984
--- /dev/null
+++ b/debian/patches/hurd-forkfd.diff
@@ -0,0 +1,22 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Disable use of waitid() on Hurd
+ The forkfd implementation with waitid uses flags not yet available on the
+ Hurd; thus temporarly disable that, as the forkfd implementation works fine
+ without too.
+ .
+ Most probably not upstreamable.
+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
+ #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
diff --git a/debian/patches/series b/debian/patches/series
index 7f33290..46c7375 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ gnukfreebsd.diff
 revert_upstream_bsymbolic_change.patch
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff
+hurd-forkfd.diff

-- 
qtbase packaging