[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-3-13-g305335a

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 305335a840676cc10fb9b72f37185dd8ec0c6c78
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Nov 1 21:10:26 2015 +0300

    Drop one of two hurd-forkfd patches.
    
    For some reason I did not notice that there is already one when I was
    adding the second one.
---
 debian/changelog                |  3 +++
 debian/patches/hurd-forkfd.diff | 26 --------------------------
 debian/patches/series           |  1 -
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58b5519..efa6ac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.5.1+dfsg-6) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Drop hurd-forkfd.diff, we do not need to have two patches for the same
+    thing (the second one is hurd_forkfd.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Nov 2015 21:08:40 +0300
 
diff --git a/debian/patches/hurd-forkfd.diff b/debian/patches/hurd-forkfd.diff
deleted file mode 100644
index 486feef..0000000
--- a/debian/patches/hurd-forkfd.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
----
- src/3rdparty/forkfd/forkfd.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/src/3rdparty/forkfd/forkfd.c
-+++ b/src/3rdparty/forkfd/forkfd.c
-@@ -54,6 +54,9 @@
- #    define HAVE_PIPE2    1
- #  endif
- #endif
-+#ifdef __GNU__
-+#  undef HAVE_WAITID
-+#endif
- 
- #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
- #  define HAVE_WAITID   1
diff --git a/debian/patches/series b/debian/patches/series
index c1c5afc..2e7cbe0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,4 @@ hurd_forkfd.diff
 gnukfreebsd.diff
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff
-hurd-forkfd.diff
 link_fbclient.diff

-- 
qtbase packaging