[SCM] qtbase packaging branch, experimental, updated. debian/5.3.2+dfsg-4-21-gec47d01

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit cb5f4e5262051dd2696527ab39ffc0eb0513fd93
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 16 13:34:21 2014 +0300

    Add a patch to fix qstorageinfo_unix.cpp build on kFreeBSD.
---
 debian/changelog               |  2 ++
 debian/patches/bsd_statfs.diff | 15 +++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 18ff6b7..130932f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtbase-opensource-src (5.4.0+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add a patch to fix qstorageinfo_unix.cpp build on kFreeBSD.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 16 Dec 2014 13:32:15 +0300
 
diff --git a/debian/patches/bsd_statfs.diff b/debian/patches/bsd_statfs.diff
new file mode 100644
index 0000000..1c3fe13
--- /dev/null
+++ b/debian/patches/bsd_statfs.diff
@@ -0,0 +1,15 @@
+Description: add a missing include to use statfs on kFreeBSD
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-yet
+Last-Update: 2014-12-16
+
+--- a/src/corelib/io/qstorageinfo_unix.cpp
++++ b/src/corelib/io/qstorageinfo_unix.cpp
+@@ -51,6 +51,7 @@
+ #include <sys/stat.h>
+ 
+ #if defined(Q_OS_BSD4)
++#  include <sys/param.h>
+ #  include <sys/mount.h>
+ #elif defined(Q_OS_ANDROID)
+ #  include <sys/mount.h>
diff --git a/debian/patches/series b/debian/patches/series
index 48eafbe..b04ccfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ remove_icon_from_example.patch
 hurd_opengl_incldir.diff
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
+bsd_statfs.diff
 
 # Debian specific.
 remove_google_adsense.patch

-- 
qtbase packaging