[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-4-25-g199b71b
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Wed Feb 18 17:51:35 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=5f35334
The following commit has been merged in the kubuntu_unstable branch:
commit 5f35334b9a71b11fcd16df019d6b9b03fd4eb615
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Dec 18 11:53:34 2014 +0300
debian/patches/bsd_statfs.diff: Second attempt to fix the build failure.
---
debian/changelog | 2 ++
debian/patches/bsd_statfs.diff | 19 ++++++++++---------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 121c67d..2dcc2b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtbase-opensource-src (5.4.0+dfsg-3) UNRELEASED; urgency=medium
* Drop remove_icon_from_example.patch and remove_google_adsense.patch,
no longer needed with the above change.
* Update symbols files with buildds’ logs.
+ * debian/patches/bsd_statfs.diff: Second attempt to fix the build
+ failure.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 17 Dec 2014 21:05:31 +0300
diff --git a/debian/patches/bsd_statfs.diff b/debian/patches/bsd_statfs.diff
index 1c3fe13..a3ed76c 100644
--- a/debian/patches/bsd_statfs.diff
+++ b/debian/patches/bsd_statfs.diff
@@ -1,15 +1,16 @@
-Description: add a missing include to use statfs on kFreeBSD
+Description: fix qstorageinfo build failure on kFreeBSD
Author: Dmitry Shachnev <mitya57 at debian.org>
Forwarded: not-yet
-Last-Update: 2014-12-16
+Last-Update: 2014-12-18
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
-@@ -51,6 +51,7 @@
- #include <sys/stat.h>
-
+@@ -118,7 +118,7 @@
+ inline QByteArray device() const;
+ private:
#if defined(Q_OS_BSD4)
-+# include <sys/param.h>
- # include <sys/mount.h>
- #elif defined(Q_OS_ANDROID)
- # include <sys/mount.h>
+- statfs *stat_buf;
++ struct statfs *stat_buf;
+ int entryCount;
+ int currentIndex;
+ #elif defined(Q_OS_SOLARIS)
--
qtbase packaging
More information about the pkg-kde-commits
mailing list