[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit cbbd26972022cc0837cb89b304b32d4171017f2e
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 14 10:29:19 2013 +0100

    include sys/utsname.h for uname(3)
---
 debian/changelog                  |  1 +
 debian/patches/series             |  1 +
 debian/patches/uname_include.diff | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 21c96b0..da5e71a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.2.0+dfsg-2) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Simplify and sort qtbase5-dev.install-armel and qtbase5-dev.install-armhf.
+  * Include sys/utsname.h for uname(3); patch uname_include.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Dec 2013 10:06:56 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index a09c2da..d9493d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,6 @@ linux_no_perf.diff
 hurd_opengl_incldir.diff
 fix_power_atomic_code.patch
 support_mips_atomic_on_pre-mips32_archs.patch
+uname_include.diff
 
 # Debian specific.
diff --git a/debian/patches/uname_include.diff b/debian/patches/uname_include.diff
new file mode 100644
index 0000000..5222b01
--- /dev/null
+++ b/debian/patches/uname_include.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: include sys/utsname.h on Unix
+ It is needed for using uname(3).
+Last-Update: 2013-12-14
+Forwarded: no
+
+--- a/src/corelib/io/qfileselector.cpp
++++ b/src/corelib/io/qfileselector.cpp
+@@ -50,6 +50,9 @@
+ #include <QtCore/QFileInfo>
+ #include <QtCore/QLocale>
+ #include <QtCore/QDebug>
++#if defined(Q_OS_UNIX)
++# include <sys/utsname.h>
++#endif
+ 
+ QT_BEGIN_NAMESPACE
+ 

-- 
qtbase packaging