[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-2-23-gb010a21

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit fefca552fcf5b9795c4c5d409e7e142252eae2c8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 23 11:10:39 2015 +0300

    Add a patch to fix QStorageInfo implementation for BSD4 systems.
---
 debian/changelog                   |  2 ++
 debian/patches/bsd_volumeinfo.diff | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  3 +++
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b50b9eb..2d7146b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtbase-opensource-src (5.5.1+dfsg-3) UNRELEASED; urgency=medium
   * Make qtbase5-private-dev depend on libinput-dev and libxkbcommon-dev,
     as these packages are needed to link to libQt5PlatformSupport.a static
     library (closes: #802704).
+  * Add a patch to fix QStorageInfo implementation for BSD4 systems
+    (bsd_volumeinfo.diff), to fix the build failure on kfreebsd.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add qtwayland5 as a libqt5gui5 suggestion. We want people trying to
diff --git a/debian/patches/bsd_volumeinfo.diff b/debian/patches/bsd_volumeinfo.diff
new file mode 100644
index 0000000..a603e7f
--- /dev/null
+++ b/debian/patches/bsd_volumeinfo.diff
@@ -0,0 +1,37 @@
+Description: fix QStorageInfo on BSD4 systems
+ - On NetBSD, the defines were not properly defined;
+ - On all other BSD systems, we use statfs which does not have
+   f_frsize memeber, revert to using f_bsize there.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-yet
+Last-Update: 2015-10-23
+
+--- a/src/corelib/io/qstorageinfo_unix.cpp
++++ b/src/corelib/io/qstorageinfo_unix.cpp
+@@ -68,8 +68,8 @@
+ 
+ #if defined(Q_OS_BSD4)
+ #  if defined(Q_OS_NETBSD)
+-     define QT_STATFSBUF struct statvfs
+-     define QT_STATFS    ::statvfs
++#    define QT_STATFSBUF struct statvfs
++#    define QT_STATFS    ::statvfs
+ #  else
+ #    define QT_STATFSBUF struct statfs
+ #    define QT_STATFS    ::statfs
+@@ -506,9 +506,15 @@
+         valid = true;
+         ready = true;
+ 
++#if defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)
++        bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize;
++        bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize;
++        bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize;
++#else
+         bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize;
+         bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize;
+         bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize;
++#endif
+ #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4)
+ #if defined(_STATFS_F_FLAGS)
+         readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;
diff --git a/debian/patches/series b/debian/patches/series
index a971ca7..5fc0b8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,9 @@
 Fix-compile-error-on-big-endian.patch
 set_positionautomatic.diff
 
+# To be forwarded upstream
+bsd_volumeinfo.diff
+
 # Debian specific.
 gnukfreebsd.diff
 no_htmlinfo_example.diff

-- 
qtbase packaging