summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-03-31 17:34:48 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-04 16:17:53 (GMT)
commit30b2b8fdf10dd1f62d47c944d15ea893d8cf448c (patch)
tree71574b902337c97d208e1408e7825e6962727339 /meta/recipes-qt
parent6228ba684841dfcea1f0a3b2c63bdeaf568e3cdd (diff)
downloadpoky-30b2b8fdf10dd1f62d47c944d15ea893d8cf448c.tar.gz
qt-mobility: Fix build with gcc 4.7
C getpid needs unistd.h for getting its signature (From OE-Core rev: da89bb83298eaf28faebcc8782f207927fbe190a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/gcc-scope.patch48
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc6
2 files changed, 52 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/files/gcc-scope.patch b/meta/recipes-qt/qt4/files/gcc-scope.patch
new file mode 100644
index 0000000..f01ee9f
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/gcc-scope.patch
@@ -0,0 +1,48 @@
1
2Fixes issues like below
3
4| qaudiooutput_pulse.cpp: In member function 'bool QPulseAudioOutput::open()':
5| qaudiooutput_pulse.cpp:255:75: error: '::getpid' has not been declared
6| make[3]: *** [../../../build/Debug/qtmedia_pulse/qaudiooutput_pulse.o] Error 1
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: Pending
11
12Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
13===================================================================
14--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-03-31 07:26:24.457018348 -0700
15+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-03-31 07:27:53.309022654 -0700
16@@ -46,7 +46,7 @@
17 #include "qaudiodeviceinfo_pulse.h"
18 #include "qpulseaudioengine.h"
19 #include "qpulsehelpers.h"
20-
21+#include <unistd.h>
22 QT_BEGIN_NAMESPACE
23
24 const int PeriodTimeMs = 20;
25Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
26===================================================================
27--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-03-31 07:29:19.997026831 -0700
28+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-03-31 07:29:39.541027625 -0700
29@@ -46,6 +46,7 @@
30 #include "qaudiodeviceinfo_pulse.h"
31 #include "qpulseaudioengine.h"
32 #include "qpulsehelpers.h"
33+#include <unistd.h>
34
35 QT_BEGIN_NAMESPACE
36
37Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
38===================================================================
39--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-03-31 07:33:24.805038719 -0700
40+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-03-31 07:33:46.889039783 -0700
41@@ -46,6 +46,7 @@
42 #include "qaudiodeviceinfo_pulse.h"
43 #include "qaudiooutput_pulse.h"
44 #include "qpulsehelpers.h"
45+#include <unistd.h>
46
47 QT_BEGIN_NAMESPACE
48
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index 3e50b2d..e612adb 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -9,12 +9,14 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t
9 file://qt-mobility-configure.patch \ 9 file://qt-mobility-configure.patch \
10 file://0001-gstvideoconnector-fixed-buffers-allocation.patch \ 10 file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
11 file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \ 11 file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \
12 file://qt-mobility-no-opengl.patch" 12 file://qt-mobility-no-opengl.patch \
13 file://gcc-scope.patch \
14 "
13 15
14SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 16SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
15SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" 17SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
16 18
17PR = "r4" 19PR = "r5"
18 20
19S = "${WORKDIR}/qt-mobility-opensource-src-${PV}" 21S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
20 22