[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-2-6-gae41d62

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ae41d626af4c292068fe94871e67c6126886f85a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Dec 19 14:43:40 2014 +0300

    Update bsd_statfs with an attempt to fix Hurd as well.
---
 debian/patches/bsd_statfs.diff | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/patches/bsd_statfs.diff b/debian/patches/bsd_statfs.diff
index a3ed76c..9f80617 100644
--- a/debian/patches/bsd_statfs.diff
+++ b/debian/patches/bsd_statfs.diff
@@ -1,10 +1,26 @@
-Description: fix qstorageinfo build failure on kFreeBSD
+Description: fix qstorageinfo build failure on kFreeBSD and Hurd
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-yet
-Last-Update: 2014-12-18
+Last-Update: 2014-12-19
 
 --- a/src/corelib/io/qstorageinfo_unix.cpp
 +++ b/src/corelib/io/qstorageinfo_unix.cpp
+@@ -56,13 +56,13 @@
+ #  include <sys/mount.h>
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+-#elif defined(Q_OS_QNX)
+-#  include <sys/statvfs.h>
+ #elif defined(Q_OS_LINUX)
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #elif defined(Q_OS_SOLARIS)
+ #  include <sys/mnttab.h>
++#else
++#  include <sys/statvfs.h>
+ #endif
+ 
+ #if defined(Q_OS_BSD4)
 @@ -118,7 +118,7 @@
      inline QByteArray device() const;
  private:

-- 
qtbase packaging