[SCM] Qt Mobility packaging branch, master, updated. debian/1.2.0-2-4-gdebb046

[Fathi Boudra]

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

The following commit has been merged in the master branch:
commit debb0462becce8f007718baec4a5dc118a9f6cf5
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed May 2 09:23:06 2012 +0300

    Add gcc-4.7_unistd.patch - fix ftbfs with GCC 4.7. (Closes: #667344)
---
 debian/changelog                    |    1 +
 debian/patches/gcc-4.7_unistd.patch |   40 +++++++++++++++++++++++++++++++++++
 debian/patches/series               |    1 +
 3 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ca1802..d33c71f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtmobility (1.2.0-3) unstable; urgency=low
     - bump Qt build dependency to 4:4.8.1.
     - bump Standards-Version to 3.9.3 (no changes needed).
   * Update imports paths.
+  * Add gcc-4.7_unistd.patch - fix ftbfs with GCC 4.7. (Closes: #667344)
 
  -- Fathi Boudra <fabo at debian.org>  Tue, 01 May 2012 21:44:58 +0300
 
diff --git a/debian/patches/gcc-4.7_unistd.patch b/debian/patches/gcc-4.7_unistd.patch
new file mode 100644
index 0000000..1c19157
--- /dev/null
+++ b/debian/patches/gcc-4.7_unistd.patch
@@ -0,0 +1,40 @@
+
+---
+ plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp  |    2 ++
+ plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp |    2 ++
+ plugins/multimedia/pulseaudio/qpulseaudioengine.cpp  |    2 ++
+ 3 files changed, 6 insertions(+)
+
+--- a/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
++++ b/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
+@@ -39,6 +39,8 @@
+ **
+ ****************************************************************************/
+ 
++#include <unistd.h>
++
+ #include <QtCore/qcoreapplication.h>
+ #include <QtCore/qdebug.h>
+ 
+--- a/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
++++ b/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
+@@ -39,6 +39,8 @@
+ **
+ ****************************************************************************/
+ 
++#include <unistd.h>
++
+ #include <QtCore/qcoreapplication.h>
+ #include <QtCore/qdebug.h>
+ 
+--- a/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
++++ b/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
+@@ -39,6 +39,8 @@
+ **
+ ****************************************************************************/
+ 
++#include <unistd.h>
++
+ #include <QtCore/qdebug.h>
+ 
+ #include <qaudiodeviceinfo.h>
diff --git a/debian/patches/series b/debian/patches/series
index 1932c7f..ad2eef2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Fix_4.8_4.7_linux_build-f9c87a7.patch
 no_rpath.patch
 fix_translations_install_path.patch
 use_isabspath.patch
+gcc-4.7_unistd.patch

-- 
Qt Mobility packaging