[SCM] qtbase packaging branch, experimental, updated. debian/5.5.0+dfsg-6-8-g2b9e394

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit e77cbc994d5c88c0315ce42536bffc244ac7d10a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Oct 9 18:39:51 2015 -0300

    Refresh hurd-forkfd.diff.
---
 debian/changelog                |  4 +++-
 debian/patches/hurd-forkfd.diff | 14 +++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22d9027..098734e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,9 @@ qtbase-opensource-src (5.5.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump qtbase-abi to 5-5-1.
   * Remove screen_crash.patch, already present upstream.
-  * Refresh Fix-compile-error-on-big-endian.patch.
+  * Refresh pacthes:
+    - Fix-compile-error-on-big-endian.patch
+    - hurd-forkfd.diff
 
  -- Sune Vuorela <sune at debian.org>  Tue, 22 Sep 2015 08:28:30 +0200
 
diff --git a/debian/patches/hurd-forkfd.diff b/debian/patches/hurd-forkfd.diff
index fdf6984..486feef 100644
--- a/debian/patches/hurd-forkfd.diff
+++ b/debian/patches/hurd-forkfd.diff
@@ -8,15 +8,19 @@ Description: Disable use of waitid() on Hurd
 Forwarded: no (possibly not needed)
 Last-Update: 2015-07-04
 
+---
+ src/3rdparty/forkfd/forkfd.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- 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
+@@ -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