summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-12-05 22:59:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-11 15:54:37 +0000
commit89230eaa76edf2477af3f9bc31efe904d80ab71e (patch)
treee559c839558d0f9d7037979c65de64e49d2f75aa /meta
parent348897358736c28240c084affaca5b4e2fbe499a (diff)
downloadpoky-89230eaa76edf2477af3f9bc31efe904d80ab71e.tar.gz
qt4: upgrade to 4.8.4
* changes in licenses are only s/Nokia/Digia/ (From OE-Core rev: 5d898695ab3ce368a1d1f2066bb980ee829ae077) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools.inc4
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb8
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.bb8
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4.inc (renamed from meta/recipes-qt/qt4/qt4-4.8.3.inc)8
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch)8
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch)8
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch)6
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch)8
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch)8
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch)10
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch)10
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch)6
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch)6
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch)10
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch)6
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch)16
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch)14
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch)6
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch)8
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-eval-QMAKE_CXX.patch)17
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch)10
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0018-configure-make-pulseaudio-a-configurable-option.patch)12
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch)6
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch)6
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.3/0001-make-qt4-native-work-with-long-building-path.patch)22
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/g++.conf (renamed from meta/recipes-qt/qt4/qt4-4.8.3/g++.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/linux.conf (renamed from meta/recipes-qt/qt4/qt4-4.8.3/linux.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/qte.sh (renamed from meta/recipes-qt/qt4/qt4-4.8.3/qte.sh)0
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.4.bb (renamed from meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb)0
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc6
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.3.bb8
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.4.bb8
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb (renamed from meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb)0
33 files changed, 133 insertions, 120 deletions
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 1199a8ab76..85c7eabbc3 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -23,8 +23,8 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
23S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" 23S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
24 24
25LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ 25LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
26 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 26 file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \
27 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 27 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
28 28
29require qt4_arch.inc 29require qt4_arch.inc
30 30
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
deleted file mode 100644
index 51afe130f8..0000000000
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require nativesdk-qt4-tools.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
6
7SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b"
8SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728"
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.bb
new file mode 100644
index 0000000000..27d58d13f0
--- /dev/null
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.bb
@@ -0,0 +1,8 @@
1require nativesdk-qt4-tools.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
6
7SRC_URI[md5sum] = "89c5ecba180cae74c66260ac732dc5cb"
8SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3.inc b/meta/recipes-qt/qt4/qt4-4.8.4.inc
index 4b80c6c334..08173a1d14 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.4.inc
@@ -1,7 +1,7 @@
1LICENSE = "LGPLv2.1 | GPLv3" 1LICENSE = "LGPLv2.1 | GPLv3"
2LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ 2LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 3 file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \
4 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 4 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
5 5
6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" 6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
7 7
@@ -25,8 +25,8 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
25 file://linux.conf \ 25 file://linux.conf \
26 " 26 "
27 27
28SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b" 28SRC_URI[md5sum] = "89c5ecba180cae74c66260ac732dc5cb"
29SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728" 29SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270"
30 30
31S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" 31S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
32 32
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index e7eb52c8ea..d8b0a09d17 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,7 +1,7 @@
1From 89349d565cf03f3a2c09fe235ac6c75e415859bd Mon Sep 17 00:00:00 2001 1From 55097d27e8b746b3d5ff437939caf1fa43c0d62b Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 01/20] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH 01/21] qlibraryinfo: allow to set qt.conf from the outside
5 using the environment 5 using the environment
6 6
7Allow to set a qt.conf from the outside using the environment. This allows 7Allow to set a qt.conf from the outside using the environment. This allows
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 1 file changed, 5 insertions(+) 16 1 file changed, 5 insertions(+)
17 17
18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
19index 91d2dfc..41045b3 100644 19index 180dc39..4adad35 100644
20--- a/src/corelib/global/qlibraryinfo.cpp 20--- a/src/corelib/global/qlibraryinfo.cpp
21+++ b/src/corelib/global/qlibraryinfo.cpp 21+++ b/src/corelib/global/qlibraryinfo.cpp
22@@ -54,6 +54,7 @@ 22@@ -54,6 +54,7 @@
@@ -39,5 +39,5 @@ index 91d2dfc..41045b3 100644
39 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { 39 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
40 #ifdef Q_OS_MAC 40 #ifdef Q_OS_MAC
41-- 41--
421.7.12 421.8.0
43 43
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
index fbda9c4f16..98fc88738f 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
@@ -1,7 +1,7 @@
1From fe15b966616cc2d2f2f071474a3414fd03ee473e Mon Sep 17 00:00:00 2001 1From 5e6b1051afa3099a02a758b0596236759d70670e Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com> 2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Wed, 26 Sep 2012 20:18:08 +0200 3Date: Wed, 26 Sep 2012 20:18:08 +0200
4Subject: [PATCH 02/20] qkbdtty_qws: fix build with old kernel headers 4Subject: [PATCH 02/21] qkbdtty_qws: fix build with old kernel headers
5 5
6This issue is that with C++ compiler process an old version of kernel 6This issue is that with C++ compiler process an old version of kernel
7header file, coincidently that file has a variable named 'new': 7header file, coincidently that file has a variable named 'new':
@@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21 1 file changed, 12 insertions(+) 21 1 file changed, 12 insertions(+)
22 22
23diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp 23diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
24index c629fa3..47fd3f7 100644 24index a46811b..762138f 100644
25--- a/src/gui/embedded/qkbdtty_qws.cpp 25--- a/src/gui/embedded/qkbdtty_qws.cpp
26+++ b/src/gui/embedded/qkbdtty_qws.cpp 26+++ b/src/gui/embedded/qkbdtty_qws.cpp
27@@ -54,8 +54,20 @@ 27@@ -54,8 +54,20 @@
@@ -46,5 +46,5 @@ index c629fa3..47fd3f7 100644
46 # include "qwindowsystem_qws.h" 46 # include "qwindowsystem_qws.h"
47 # include "qapplication.h" 47 # include "qapplication.h"
48-- 48--
491.7.12 491.8.0
50 50
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
index 66a7db1dd2..ecaea51e08 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
@@ -1,7 +1,7 @@
1From f7eb6d336d30da7b8193f1d1ab6142293e3966da Mon Sep 17 00:00:00 2001 1From b6805e883c078f7647d9234aca4e3513ebd1c9bf Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 1 May 2012 07:48:15 +0200 3Date: Tue, 1 May 2012 07:48:15 +0200
4Subject: [PATCH 03/20] webkit2: set OUTPUT_DIR value if empty 4Subject: [PATCH 03/21] webkit2: set OUTPUT_DIR value if empty
5 5
6Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem 6Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
7now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl 7now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
@@ -30,5 +30,5 @@ index 006a88c..5e17193 100644
30 isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated 30 isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
31 isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated 31 isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
32-- 32--
331.7.12 331.8.0
34 34
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
index 56bb8c37e0..1eb8a5843a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
@@ -1,7 +1,7 @@
1From 53a20e5f7f790d047b67b1631e1d4acc9a86906a Mon Sep 17 00:00:00 2001 1From af699c6e8cf9fb28d6f8b789bf33d53b47edaec7 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Wed, 26 Sep 2012 20:24:20 +0200 3Date: Wed, 26 Sep 2012 20:24:20 +0200
4Subject: [PATCH 04/20] configure: qmake is already built in qt4-tools-native, 4Subject: [PATCH 04/21] configure: qmake is already built in qt4-tools-native,
5 so disable it 5 so disable it
6 6
7Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/configure b/configure 14diff --git a/configure b/configure
15index d19f443..59bdb63 100755 15index e3d464b..cc04b27 100755
16--- a/configure 16--- a/configure
17+++ b/configure 17+++ b/configure
18@@ -4899,7 +4899,7 @@ setBootstrapVariable() 18@@ -4899,7 +4899,7 @@ setBootstrapVariable()
@@ -25,5 +25,5 @@ index d19f443..59bdb63 100755
25 25
26 OLD_QCONFIG_H= 26 OLD_QCONFIG_H=
27-- 27--
281.7.12 281.8.0
29 29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
index 4e310c2c61..1a8f2b7f94 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
@@ -1,7 +1,7 @@
1From 5641d763180e7f848f5d39588417292b6b8df88e Mon Sep 17 00:00:00 2001 1From ac93237bc90ea7773c0ef5275962baba01d4a9c7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org> 2From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
3Date: Wed, 26 Sep 2012 20:27:44 +0200 3Date: Wed, 26 Sep 2012 20:27:44 +0200
4Subject: [PATCH 05/20] configure: set LFLAGS to pick up zlib from staging 4Subject: [PATCH 05/21] configure: set LFLAGS to pick up zlib from staging
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/configure b/configure 13diff --git a/configure b/configure
14index 59bdb63..cc08b71 100755 14index cc04b27..5a7c4ee 100755
15--- a/configure 15--- a/configure
16+++ b/configure 16+++ b/configure
17@@ -690,7 +690,7 @@ fi 17@@ -690,7 +690,7 @@ fi
@@ -24,5 +24,5 @@ index 59bdb63..cc08b71 100755
24 qmakevarname="${varname}" 24 qmakevarname="${varname}"
25 # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS 25 # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
26-- 26--
271.7.12 271.8.0
28 28
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
index 21d5b4da19..90ebf75095 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
@@ -1,7 +1,7 @@
1From fa9e376ff72f488608c8fc635ec669fc00c3c1ea Mon Sep 17 00:00:00 2001 1From 0bc0db83812b5900dc4e6ffa96bdeab46b6adcae Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:29:09 +0200 3Date: Wed, 26 Sep 2012 20:29:09 +0200
4Subject: [PATCH 06/20] configure: Use OE_QMAKE_* values to specify Qt utility 4Subject: [PATCH 06/21] configure: Use OE_QMAKE_* values to specify Qt utility
5 paths 5 paths
6 6
7Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13 1 file changed, 5 insertions(+), 5 deletions(-) 13 1 file changed, 5 insertions(+), 5 deletions(-)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index cc08b71..958b884 100755 16index 5a7c4ee..db4d044 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -8612,11 +8612,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE 19@@ -8683,11 +8683,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
20 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc 20 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
21 21
22 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR 22 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -34,5 +34,5 @@ index cc08b71..958b884 100755
34 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib 34 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
35 35
36-- 36--
371.7.12 371.8.0
38 38
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
index 1ce3dbb913..7d3b336f77 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
@@ -1,7 +1,7 @@
1From db3c7b5710ee14280b51c355487dabe21eff60b4 Mon Sep 17 00:00:00 2001 1From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001
2From: Pavel Heimlich <tropikhajma@gmail.com> 2From: Pavel Heimlich <tropikhajma@gmail.com>
3Date: Wed, 26 Sep 2012 20:31:10 +0200 3Date: Wed, 26 Sep 2012 20:31:10 +0200
4Subject: [PATCH 07/20] dbus: Remove "const" usage that causes compile failure 4Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure
5 building nativesdk-qt4-tools 5 building nativesdk-qt4-tools
6 6
7Patch has apparently been rejected upstream, not because it is invalid 7Patch has apparently been rejected upstream, not because it is invalid
@@ -17,10 +17,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp 19diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
20index 0bf62de..e53620f 100644 20index 0f0b647..aa4cbab 100644
21--- a/src/dbus/qdbusintegrator.cpp 21--- a/src/dbus/qdbusintegrator.cpp
22+++ b/src/dbus/qdbusintegrator.cpp 22+++ b/src/dbus/qdbusintegrator.cpp
23@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE 23@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
24 static bool isDebugging; 24 static bool isDebugging;
25 #define qDBusDebug if (!::isDebugging); else qDebug 25 #define qDBusDebug if (!::isDebugging); else qDebug
26 26
@@ -30,5 +30,5 @@ index 0bf62de..e53620f 100644
30 static inline QString dbusServiceString() 30 static inline QString dbusServiceString()
31 { return *orgFreedesktopDBusString(); } 31 { return *orgFreedesktopDBusString(); }
32-- 32--
331.7.12 331.8.0
34 34
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
index d945025eba..ec07f41403 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
@@ -1,7 +1,7 @@
1From dacee47b11fc7cf89cdb8ddeeac9e6b64320ec8b Mon Sep 17 00:00:00 2001 1From 64ce5d0e7c19436b928a2a0d9d192f56be3c9bb2 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:32:41 +0200 3Date: Wed, 26 Sep 2012 20:32:41 +0200
4Subject: [PATCH 08/20] qmake.pro: Allow building a separate qmake for the 4Subject: [PATCH 08/21] qmake.pro: Allow building a separate qmake for the
5 target 5 target
6 6
7Upstream-Status: Inappropriate [config] 7Upstream-Status: Inappropriate [config]
@@ -25,5 +25,5 @@ index 38e0fce..53b1ffb 100644
25 OBJECTS_DIR = . 25 OBJECTS_DIR = .
26 MOC_DIR = . 26 MOC_DIR = .
27-- 27--
281.7.12 281.8.0
29 29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch
index 9616a5b2f8..45b8c10fbe 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0009-qmake-fix-source-file-references-in-qmake.pri.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch
@@ -1,7 +1,7 @@
1From 08ec0f7ac7438e6f5b506b23fb52fe086078308b Mon Sep 17 00:00:00 2001 1From e129dc0d6cde69dd15d1836c4111e0526fc29161 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:33:49 +0200 3Date: Wed, 26 Sep 2012 20:33:49 +0200
4Subject: [PATCH 09/20] qmake: fix source file references in qmake.pri 4Subject: [PATCH 09/21] qmake: fix source file references in qmake.pri
5 5
6Fix duplicate entries in SOURCES and HEADERS, and fix the source file 6Fix duplicate entries in SOURCES and HEADERS, and fix the source file
7list for the split of qlocale.cpp. 7list for the split of qlocale.cpp.
@@ -48,5 +48,5 @@ index 31f67f4..9081669 100644
48 qmap.cpp \ 48 qmap.cpp \
49 qmetatype.cpp \ 49 qmetatype.cpp \
50-- 50--
511.7.12 511.8.0
52 52
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
index f3674e8108..1d2ddab490 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
@@ -1,7 +1,7 @@
1From d9544b4a079f3c66d15f973c5d1526df2fe49d40 Mon Sep 17 00:00:00 2001 1From 4888791d1899f781af710dd8813887dea52fda59 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 20:36:38 +0200 3Date: Wed, 26 Sep 2012 20:36:38 +0200
4Subject: [PATCH 10/20] configure: Hack to not use the pg_config of the host 4Subject: [PATCH 10/21] configure: Hack to not use the pg_config of the host
5 system which will add /usr/include 5 system which will add /usr/include
6 6
7pg_config is a native binary so using that when cross compiling 7pg_config is a native binary so using that when cross compiling
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 4 insertions(+), 4 deletions(-) 19 1 file changed, 4 insertions(+), 4 deletions(-)
20 20
21diff --git a/configure b/configure 21diff --git a/configure b/configure
22index 958b884..24cbb2a 100755 22index db4d044..35a8fe7 100755
23--- a/configure 23--- a/configure
24+++ b/configure 24+++ b/configure
25@@ -5441,10 +5441,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 25@@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
26 psql) 26 psql)
27 if [ "$CFG_SQL_psql" != "no" ]; then 27 if [ "$CFG_SQL_psql" != "no" ]; then
28 # Be careful not to use native pg_config when cross building. 28 # Be careful not to use native pg_config when cross building.
@@ -38,5 +38,5 @@ index 958b884..24cbb2a 100755
38 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" 38 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
39 # But, respect PSQL_LIBS if set 39 # But, respect PSQL_LIBS if set
40-- 40--
411.7.12 411.8.0
42 42
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch
index 60acb803a4..e0879c5615 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0011-freetype-host-includes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch
@@ -1,7 +1,7 @@
1From 95cbbdaaf543bb5747b535b5e4b02114f3d821d6 Mon Sep 17 00:00:00 2001 1From 3fcffa79e6a5f0448cbfe2bb33fe1218f5dae61d Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 4 Jun 2007 14:48:50 +0200 3Date: Mon, 4 Jun 2007 14:48:50 +0200
4Subject: [PATCH 11/20] freetype host includes 4Subject: [PATCH 11/21] freetype host includes
5 5
6Host include path should not be used in cross compiling case. 6Host include path should not be used in cross compiling case.
7 7
@@ -25,5 +25,5 @@ index 7ef1cf9..b362fcd 100644
25 linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH 25 linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
26 for(p, TRY_INCLUDEPATHS) { 26 for(p, TRY_INCLUDEPATHS) {
27-- 27--
281.7.12 281.8.0
29 29
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch
index 019b9f4be7..8402eab635 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0012-Add-2bpp-support.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch
@@ -1,7 +1,7 @@
1From a8233fddb36592361910d967664e5b546ac4cc3e Mon Sep 17 00:00:00 2001 1From 8744273fc452eb54bbeeb7d15823009ce926c6fa Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org> 2From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
3Date: Wed, 26 Sep 2012 20:39:21 +0200 3Date: Wed, 26 Sep 2012 20:39:21 +0200
4Subject: [PATCH 12/20] Add 2bpp support 4Subject: [PATCH 12/21] Add 2bpp support
5 5
6Submitted upstream but rejected as being "out of scope": 6Submitted upstream but rejected as being "out of scope":
7http://bugreports.qt.nokia.com/browse/QTBUG-3468 7http://bugreports.qt.nokia.com/browse/QTBUG-3468
@@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 3 files changed, 216 insertions(+), 4 deletions(-) 16 3 files changed, 216 insertions(+), 4 deletions(-)
17 17
18diff --git a/configure b/configure 18diff --git a/configure b/configure
19index 24cbb2a..cd66d05 100755 19index 35a8fe7..79c1c7b 100755
20--- a/configure 20--- a/configure
21+++ b/configure 21+++ b/configure
22@@ -6999,6 +6999,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then 22@@ -7063,6 +7063,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
23 echo "Choose pixel-depths to support:" 23 echo "Choose pixel-depths to support:"
24 echo 24 echo
25 echo " 1. 1bpp, black/white" 25 echo " 1. 1bpp, black/white"
@@ -27,7 +27,7 @@ index 24cbb2a..cd66d05 100755
27 echo " 4. 4bpp, grayscale" 27 echo " 4. 4bpp, grayscale"
28 echo " 8. 8bpp, paletted" 28 echo " 8. 8bpp, paletted"
29 echo " 12. 12bpp, rgb 4-4-4" 29 echo " 12. 12bpp, rgb 4-4-4"
30@@ -7017,11 +7018,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then 30@@ -7081,11 +7082,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
31 fi 31 fi
32 if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then 32 if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
33 if [ "$CFG_QWS_DEPTHS" = "all" ]; then 33 if [ "$CFG_QWS_DEPTHS" = "all" ]; then
@@ -42,7 +42,7 @@ index 24cbb2a..cd66d05 100755
42 esac 42 esac
43 done 43 done
44diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp 44diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
45index d2ad851..d25fc87 100644 45index b307bf2..88950b3 100644
46--- a/src/gui/embedded/qscreen_qws.cpp 46--- a/src/gui/embedded/qscreen_qws.cpp
47+++ b/src/gui/embedded/qscreen_qws.cpp 47+++ b/src/gui/embedded/qscreen_qws.cpp
48@@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color, 48@@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color,
@@ -299,7 +299,7 @@ index d2ad851..d25fc87 100644
299 } else if(d==4) { 299 } else if(d==4) {
300 return true; 300 return true;
301diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp 301diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
302index 04abcd4..06dea6d 100644 302index 6f3caad..14159ee 100644
303--- a/src/gui/embedded/qscreenlinuxfb_qws.cpp 303--- a/src/gui/embedded/qscreenlinuxfb_qws.cpp
304+++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp 304+++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp
305@@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec) 305@@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec)
@@ -314,5 +314,5 @@ index 04abcd4..06dea6d 100644
314 ::fb_cmap startcmap; 314 ::fb_cmap startcmap;
315 startcmap.start=0; 315 startcmap.start=0;
316-- 316--
3171.7.12 3171.8.0
318 318
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch
index c216c8586e..aa464fd1ed 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0013-configure-add-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch
@@ -1,7 +1,7 @@
1From 8785f376533ffdcf4c32b53274e8c40f567d7fd5 Mon Sep 17 00:00:00 2001 1From 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001
2From: Michael Lauer <mickey@vanille-media.de> 2From: Michael Lauer <mickey@vanille-media.de>
3Date: Wed, 26 Sep 2012 20:41:32 +0200 3Date: Wed, 26 Sep 2012 20:41:32 +0200
4Subject: [PATCH 13/20] configure: add "-crossarch" option 4Subject: [PATCH 13/21] configure: add "-crossarch" option
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11 1 file changed, 6 insertions(+), 1 deletion(-) 11 1 file changed, 6 insertions(+), 1 deletion(-)
12 12
13diff --git a/configure b/configure 13diff --git a/configure b/configure
14index cd66d05..f2c0725 100755 14index 79c1c7b..7983c3d 100755
15--- a/configure 15--- a/configure
16+++ b/configure 16+++ b/configure
17@@ -1141,7 +1141,7 @@ while [ "$#" -gt 0 ]; do 17@@ -1153,7 +1153,7 @@ while [ "$#" -gt 0 ]; do
18 shift 18 shift
19 VAL=$1 19 VAL=$1
20 ;; 20 ;;
@@ -23,7 +23,7 @@ index cd66d05..f2c0725 100755
23 VAR=`echo $1 | sed "s,^-\(.*\),\1,"` 23 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
24 shift 24 shift
25 VAL="$1" 25 VAL="$1"
26@@ -1697,6 +1697,9 @@ while [ "$#" -gt 0 ]; do 26@@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do
27 DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` 27 DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
28 DeviceVar set $DEV_VAR $DEV_VAL 28 DeviceVar set $DEV_VAR $DEV_VAL
29 ;; 29 ;;
@@ -33,7 +33,7 @@ index cd66d05..f2c0725 100755
33 debug-and-release) 33 debug-and-release)
34 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 34 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
35 CFG_DEBUG_RELEASE="$VAL" 35 CFG_DEBUG_RELEASE="$VAL"
36@@ -3297,6 +3300,8 @@ arm*) 36@@ -3324,6 +3327,8 @@ arm*)
37 ;; 37 ;;
38 esac 38 esac
39 39
@@ -43,5 +43,5 @@ index cd66d05..f2c0725 100755
43 if [ "$OPT_VERBOSE" = "yes" ]; then 43 if [ "$OPT_VERBOSE" = "yes" ]; then
44 echo " '$CFG_ARCH' is supported" 44 echo " '$CFG_ARCH' is supported"
45-- 45--
461.7.12 461.8.0
47 47
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch
index 0874c8442d..66724a8ecf 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0014-translations-fix-phony-translation-linking-error.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch
@@ -1,7 +1,7 @@
1From 851eb73f7c2d3fa8dc017c3fb4f448b522cd9873 Mon Sep 17 00:00:00 2001 1From 21af8f6d21b28a53041affb11b58d6316023fa92 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 26 Sep 2012 20:45:10 +0200 3Date: Wed, 26 Sep 2012 20:45:10 +0200
4Subject: [PATCH 14/20] translations: fix phony translation linking error 4Subject: [PATCH 14/21] translations: fix phony translation linking error
5 5
6 | .../usr/lib/crt1.o: In function `_start': 6 | .../usr/lib/crt1.o: In function `_start':
7 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' 7 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
@@ -37,5 +37,5 @@ index dc99beb..0d98829 100644
37 phony_src.CONFIG += combine 37 phony_src.CONFIG += combine
38 QMAKE_EXTRA_COMPILERS += phony_src 38 QMAKE_EXTRA_COMPILERS += phony_src
39-- 39--
401.7.12 401.8.0
41 41
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch
index fc13b08854..b5db49128c 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0015-configure-add-nostrip-for-debug-packages.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch
@@ -1,7 +1,7 @@
1From 1c42c9c5f02845ea4c5b82638b7b2ed4d3dca0ff Mon Sep 17 00:00:00 2001 1From 9250fed086a4a8a645a972764a9bf34e4566ec2e Mon Sep 17 00:00:00 2001
2From: Fathi Boudra <fabo@debian.org> 2From: Fathi Boudra <fabo@debian.org>
3Date: Wed, 26 Sep 2012 20:46:14 +0200 3Date: Wed, 26 Sep 2012 20:46:14 +0200
4Subject: [PATCH 15/20] configure: add nostrip for debug packages 4Subject: [PATCH 15/21] configure: add nostrip for debug packages
5 5
6Qt is built in release mode and strip files by default. 6Qt is built in release mode and strip files by default.
7Set CONFIG+=nostrip to avoid the stripping and 7Set CONFIG+=nostrip to avoid the stripping and
@@ -15,7 +15,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15 1 file changed, 2 insertions(+) 15 1 file changed, 2 insertions(+)
16 16
17diff --git a/configure b/configure 17diff --git a/configure b/configure
18index f2c0725..d1a0dfd 100755 18index 7983c3d..d02824b 100755
19--- a/configure 19--- a/configure
20+++ b/configure 20+++ b/configure
21@@ -710,6 +710,8 @@ mkdir -p "$outpath/config.tests" 21@@ -710,6 +710,8 @@ mkdir -p "$outpath/config.tests"
@@ -28,5 +28,5 @@ index f2c0725..d1a0dfd 100755
28 QMakeVar add decorations "default windows styled" 28 QMakeVar add decorations "default windows styled"
29 QMakeVar add mouse-drivers "pc" 29 QMakeVar add mouse-drivers "pc"
30-- 30--
311.7.12 311.8.0
32 32
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch
index 87966be879..9c3de47b4b 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0016-configure-eval-QMAKE_CXX.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch
@@ -1,7 +1,7 @@
1From ec9d722e08c636e0c672b0adc3b54569367c6502 Mon Sep 17 00:00:00 2001 1From 8403634a71f067eec514b6d2193cf41e281dff8e Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:47:08 +0200 3Date: Wed, 26 Sep 2012 20:47:08 +0200
4Subject: [PATCH 16/20] configure: eval QMAKE_CXX 4Subject: [PATCH 16/21] configure: eval QMAKE_CXX
5 5
6Allow expansion of $(...) references in QMAKE_CXX (currently its value 6Allow expansion of $(...) references in QMAKE_CXX (currently its value
7is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed 7is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
@@ -15,22 +15,23 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15Conflicts: 15Conflicts:
16 configure 16 configure
17--- 17---
18 configure | 2 ++ 18 configure | 3 ++-
19 1 file changed, 2 insertions(+) 19 1 file changed, 2 insertions(+), 1 deletion(-)
20 20
21diff --git a/configure b/configure 21diff --git a/configure b/configure
22index d1a0dfd..9f59e1a 100755 22index d02824b..891d6e7 100755
23--- a/configure 23--- a/configure
24+++ b/configure 24+++ b/configure
25@@ -3438,6 +3438,7 @@ else 25@@ -3409,7 +3409,8 @@ else
26 CFG_FRAMEWORK=no
26 fi 27 fi
27 28
28-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` 29-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
29+QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` 30+QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
30+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` 31+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
31 TEST_COMPILER="$CXX" 32 TEST_COMPILER="$CXX"
32 33
33 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER 34 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
34-- 35--
351.7.12 361.8.0
36 37
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
index ef32932eef..9471966660 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
@@ -1,7 +1,7 @@
1From 5945025c96fd25880565819881b8ef48e1baa3ce Mon Sep 17 00:00:00 2001 1From d2bb701b551402f0befddd0e906423596bdc0df7 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:48:37 +0200 3Date: Wed, 26 Sep 2012 20:48:37 +0200
4Subject: [PATCH 17/20] configure: ensure we identify the compiler as g++ in 4Subject: [PATCH 17/21] configure: ensure we identify the compiler as g++ in
5 configure 5 configure
6 6
7Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure 7Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
@@ -28,10 +28,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
28 1 file changed, 3 insertions(+) 28 1 file changed, 3 insertions(+)
29 29
30diff --git a/configure b/configure 30diff --git a/configure b/configure
31index 9f59e1a..6989962 100755 31index 891d6e7..7031898 100755
32--- a/configure 32--- a/configure
33+++ b/configure 33+++ b/configure
34@@ -7527,6 +7527,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then 34@@ -7592,6 +7592,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
35 else 35 else
36 COMPILER=`echo $PLATFORM | cut -f 2- -d-` 36 COMPILER=`echo $PLATFORM | cut -f 2- -d-`
37 fi 37 fi
@@ -42,5 +42,5 @@ index 9f59e1a..6989962 100755
42 CFG_EXCEPTIONS=no 42 CFG_EXCEPTIONS=no
43 fi 43 fi
44-- 44--
451.7.12 451.8.0
46 46
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0018-configure-make-pulseaudio-a-configurable-option.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch
index f3c17a583b..19cdd4c57d 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0018-configure-make-pulseaudio-a-configurable-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch
@@ -1,7 +1,7 @@
1From 5da434f2a61ca819ff9a9b0a84de8c2307f9d41b Mon Sep 17 00:00:00 2001 1From d6dc1a7d6594d7e395347732a3e553fc82ccab3d Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000 3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH 18/20] configure: make pulseaudio a configurable option 4Subject: [PATCH 18/21] configure: make pulseaudio a configurable option
5 5
6Allows disabling pulseaudio support within phonon at configure time. 6Allows disabling pulseaudio support within phonon at configure time.
7(This is the Qt 4.8.0 version.) 7(This is the Qt 4.8.0 version.)
@@ -15,10 +15,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15 1 file changed, 8 insertions(+), 1 deletion(-) 15 1 file changed, 8 insertions(+), 1 deletion(-)
16 16
17diff --git a/configure b/configure 17diff --git a/configure b/configure
18index 6989962..58fcedd 100755 18index 7031898..a4a42f1 100755
19--- a/configure 19--- a/configure
20+++ b/configure 20+++ b/configure
21@@ -1127,7 +1127,7 @@ while [ "$#" -gt 0 ]; do 21@@ -1139,7 +1139,7 @@ while [ "$#" -gt 0 ]; do
22 VAL=no 22 VAL=no
23 ;; 23 ;;
24 #Qt style yes options 24 #Qt style yes options
@@ -27,7 +27,7 @@ index 6989962..58fcedd 100755
27 VAR=`echo $1 | sed "s,^-\(.*\),\1,"` 27 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
28 VAL=yes 28 VAL=yes
29 ;; 29 ;;
30@@ -2101,6 +2101,13 @@ while [ "$#" -gt 0 ]; do 30@@ -2120,6 +2120,13 @@ while [ "$#" -gt 0 ]; do
31 UNKNOWN_OPT=yes 31 UNKNOWN_OPT=yes
32 fi 32 fi
33 ;; 33 ;;
@@ -42,5 +42,5 @@ index 6989962..58fcedd 100755
42 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 42 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
43 CFG_QGTKSTYLE="$VAL" 43 CFG_QGTKSTYLE="$VAL"
44-- 44--
451.7.12 451.8.0
46 46
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
index 9f4adabd4f..a83d2470a1 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
@@ -1,7 +1,7 @@
1From 915ea240e03f04c6ae788cf369b13afe5d9bfc45 Mon Sep 17 00:00:00 2001 1From 1f1da2f24d3028b250dbc2e98e2b7e37862b3771 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 26 Sep 2012 20:54:38 +0200 3Date: Wed, 26 Sep 2012 20:54:38 +0200
4Subject: [PATCH 19/20] Fixes for gcc 4.7.0, particularly on qemux86 4Subject: [PATCH 19/21] Fixes for gcc 4.7.0, particularly on qemux86
5 5
6Origin: upstream, http://trac.webkit.org/changeset/93631 6Origin: upstream, http://trac.webkit.org/changeset/93631
7Origin: upstream, http://trac.webkit.org/changeset/113848 7Origin: upstream, http://trac.webkit.org/changeset/113848
@@ -59,5 +59,5 @@ index 6087ec3..6d748f6 100644
59 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0; 59 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
60 virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0; 60 virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
61-- 61--
621.7.12 621.8.0
63 63
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch
index 1e07a54290..92eddebaec 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch
@@ -1,7 +1,7 @@
1From a10ba547001f4a4ba0ae313a4e9c2c0b5bb36a09 Mon Sep 17 00:00:00 2001 1From d90b496f9ffdc828928ef84afad43260ea67ec1f Mon Sep 17 00:00:00 2001
2From: Ken Werner <ken.werner@linaro.org> 2From: Ken Werner <ken.werner@linaro.org>
3Date: Wed, 26 Sep 2012 20:55:21 +0200 3Date: Wed, 26 Sep 2012 20:55:21 +0200
4Subject: [PATCH 20/20] webkit: disable the -fuse-ld=gold flag 4Subject: [PATCH 20/21] webkit: disable the -fuse-ld=gold flag
5 5
6This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error. 6This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error.
7 7
@@ -37,5 +37,5 @@ index 0f62e14..d81a1f0 100644
37 # We use this flag on production branches 37 # We use this flag on production branches
38 # See https://bugs.webkit.org/show_bug.cgi?id=60824 38 # See https://bugs.webkit.org/show_bug.cgi?id=60824
39-- 39--
401.7.12 401.8.0
41 41
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0001-make-qt4-native-work-with-long-building-path.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch
index e004745d2f..dbc90227a5 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/0001-make-qt4-native-work-with-long-building-path.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch
@@ -1,15 +1,24 @@
1From 6742ac7ea6fd1e9c82ecb5305f84e721242f857d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 5 Dec 2012 07:48:15 +0200
4Subject: [PATCH 21/21] configure: make qt4-native work with long building
5 path.
6
1Upstream-Status: Submitted 7Upstream-Status: Submitted
2 8
3Make qt4-native work with long building path.
4Reference: https://bugreports.qt-project.org/browse/QTBUG-28292 9Reference: https://bugreports.qt-project.org/browse/QTBUG-28292
5 10
6Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 configure | 52 ++++++++++++++++++++++++++--------------------------
15 1 file changed, 26 insertions(+), 26 deletions(-)
7 16
8Index: configure 17diff --git a/configure b/configure
9===================================================================== 18index a4a42f1..2358563 100755
10--- a/configure 19--- a/configure
11+++ b/configure 20+++ b/configure
12@@ -4764,8 +4764,8 @@ DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INST 21@@ -4779,8 +4779,8 @@ DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INST
13 TODAY=`date +%Y-%m-%d` 22 TODAY=`date +%Y-%m-%d`
14 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF 23 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
15 /* License Info */ 24 /* License Info */
@@ -20,7 +29,7 @@ Index: configure
20 29
21 /* Installation date */ 30 /* Installation date */
22 static const char qt_configure_installation [12+11] = "qt_instdate=$TODAY"; 31 static const char qt_configure_installation [12+11] = "qt_instdate=$TODAY";
23@@ -4790,36 +4790,36 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then 32@@ -4805,36 +4805,36 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then
24 33
25 #if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE) 34 #if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE)
26 /* Installation Info */ 35 /* Installation Info */
@@ -81,3 +90,6 @@ Index: configure
81 EOF 90 EOF
82 91
83 if [ ! -z "$QT_HOST_PREFIX" ]; then 92 if [ ! -z "$QT_HOST_PREFIX" ]; then
93--
941.8.0
95
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf
index e58fb15718..e58fb15718 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/g++.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf
index 86703813ca..86703813ca 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh
index 21d6ecbd6a..21d6ecbd6a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/qte.sh
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.4.bb
index 187de7394f..187de7394f 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.3.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.4.bb
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 0dab3641e8..7645232208 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -6,8 +6,8 @@ PROVIDES = "qt4-tools-native"
6 6
7LICENSE = "LGPLv2.1 | GPLv3" 7LICENSE = "LGPLv2.1 | GPLv3"
8LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ 8LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 9 file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \
10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 10 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
11 11
12INC_PR = "r19" 12INC_PR = "r19"
13 13
@@ -17,7 +17,7 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
17 file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 17 file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
18 file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \ 18 file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \
19 file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ 19 file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
20 file://0001-make-qt4-native-work-with-long-building-path.patch \ 20 file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \
21 file://g++.conf \ 21 file://g++.conf \
22 file://linux.conf \ 22 file://linux.conf \
23 " 23 "
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.3.bb b/meta/recipes-qt/qt4/qt4-native_4.8.3.bb
deleted file mode 100644
index afae0aec32..0000000000
--- a/meta/recipes-qt/qt4/qt4-native_4.8.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require qt4-native.inc
2
3PR = "${INC_PR}.0"
4
5TOBUILD := "src/tools/bootstrap ${TOBUILD}"
6
7SRC_URI[md5sum] = "a663b6c875f8d7caa8ac9c30e4a4ec3b"
8SRC_URI[sha256sum] = "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728"
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.4.bb b/meta/recipes-qt/qt4/qt4-native_4.8.4.bb
new file mode 100644
index 0000000000..3932b3c24e
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.4.bb
@@ -0,0 +1,8 @@
1require qt4-native.inc
2
3PR = "${INC_PR}.0"
4
5TOBUILD := "src/tools/bootstrap ${TOBUILD}"
6
7SRC_URI[md5sum] = "89c5ecba180cae74c66260ac732dc5cb"
8SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb
index bedd201350..bedd201350 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.3.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb