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

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 80d08aae7ba4f6a02358c05c57c6348bddae88fd
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 30 23:58:16 2014 +0100

    replace bsd_statfs.diff with upstream commit
    
    backport upstream commit 13972476ad2c3178fe89f2d96f398de10394c6f6
---
 debian/changelog                                   |  3 ++
 debian/patches/bsd_statfs.diff                     | 37 --------------
 debian/patches/series                              |  2 +-
 ...o_unix.cpp-Fix-build-on-BSD-and-other-uni.patch | 57 ++++++++++++++++++++++
 4 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9c5f0a..9db1663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   * Replace patch mips_more_pre-mips32.diff with
     upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch,
     backport of upstream commit 7ec14ae0b267780d6bfa5c7453c906caeee3bc00.
+  * Replace patch bsd_statfs.diff with
+    upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch,
+    backport of upstream commit 13972476ad2c3178fe89f2d96f398de10394c6f6.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Dec 2014 23:42:00 +0100
 
diff --git a/debian/patches/bsd_statfs.diff b/debian/patches/bsd_statfs.diff
deleted file mode 100644
index 9e1d8da..0000000
--- a/debian/patches/bsd_statfs.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: fix qstorageinfo build failure on kFreeBSD and Hurd
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-yet
-Last-Update: 2014-12-20
-
---- a/src/corelib/io/qstorageinfo_unix.cpp
-+++ b/src/corelib/io/qstorageinfo_unix.cpp
-@@ -52,17 +52,18 @@
- 
- #if defined(Q_OS_BSD4)
- #  include <sys/mount.h>
-+#  include <sys/statvfs.h>
- #elif defined(Q_OS_ANDROID)
- #  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 +119,7 @@
-     inline QByteArray device() const;
- private:
- #if defined(Q_OS_BSD4)
--    statfs *stat_buf;
-+    struct statfs *stat_buf;
-     int entryCount;
-     int currentIndex;
- #elif defined(Q_OS_SOLARIS)
diff --git a/debian/patches/series b/debian/patches/series
index cdfcd6d..69a0d94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
+upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch
 gnukfreebsd.diff
-bsd_statfs.diff
 bigendian_qimage_conversions.diff
 
 # Debian specific.
diff --git a/debian/patches/upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch b/debian/patches/upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch
new file mode 100644
index 0000000..cce71b3
--- /dev/null
+++ b/debian/patches/upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch
@@ -0,0 +1,57 @@
+From 13972476ad2c3178fe89f2d96f398de10394c6f6 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at gmail.com>
+Date: Mon, 22 Dec 2014 13:44:45 +0300
+Subject: [PATCH] qstorageinfo_unix.cpp: Fix build on BSD and other unices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Include statvfs.h on all non-Linux and non-Solaris systems.
+* Fix type of stat_buf structure on BSD.
+
+Change-Id: I6336503082fafd7f6108cf95c079bdd329d2ea0f
+Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich at theqtcompany.com>
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+Reviewed-by: Shawn Rutledge <shawn.rutledge at digia.com>
+---
+ src/corelib/io/qstorageinfo_unix.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
+index e82737c..857464f 100644
+--- a/src/corelib/io/qstorageinfo_unix.cpp
++++ b/src/corelib/io/qstorageinfo_unix.cpp
+@@ -52,17 +52,18 @@
+ 
+ #if defined(Q_OS_BSD4)
+ #  include <sys/mount.h>
++#  include <sys/statvfs.h>
+ #elif defined(Q_OS_ANDROID)
+ #  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 +119,7 @@ public:
+     inline QByteArray device() const;
+ private:
+ #if defined(Q_OS_BSD4)
+-    statfs *stat_buf;
++    struct statfs *stat_buf;
+     int entryCount;
+     int currentIndex;
+ #elif defined(Q_OS_SOLARIS)
+-- 
+2.1.4
+

-- 
qtbase packaging