summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-07-04 09:50:32 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:44:13 +0100
commit0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (patch)
treedbf652bc6adf22bc60c0fc5f9d77f21de9f5fa5b
parent262fa7ee4608c02e41092d3dccaf81463dd4f833 (diff)
downloadpoky-0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8.tar.gz
qt4: upgrade to 4.8.5
Removed patches integrated upstream. Added INSANE_SKIP libdir for examples packages as it includes plugin shared libraries outside of libdir. (From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools.inc2
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.bb8
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb8
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch108
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch41
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch147
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch37
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch39
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5.inc (renamed from meta/recipes-qt/qt4/qt4-4.8.4.inc)11
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0011-freetype-host-includes.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0012-Add-2bpp-support.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0013-configure-add-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0014-translations-fix-phony-translation-linking-error.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0015-configure-add-nostrip-for-debug-packages.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0016-configure-eval-QMAKE_CXX.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0018-configure-make-pulseaudio-a-configurable-option.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0020-webkit-disable-the-fuse-ld-gold-flag.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0021-configure-make-qt4-native-work-with-long-building-pa.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0027-tools.pro-disable-qmeegographicssystemhelper.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/g++.conf (renamed from meta/recipes-qt/qt4/qt4-4.8.4/g++.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/linux.conf (renamed from meta/recipes-qt/qt4/qt4-4.8.4/linux.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/qte.sh (renamed from meta/recipes-qt/qt4/qt4-4.8.4/qte.sh)0
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb (renamed from meta/recipes-qt/qt4/qt4-embedded_4.8.4.bb)0
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc3
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.4.bb8
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.5.bb8
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb (renamed from meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb)0
-rw-r--r--meta/recipes-qt/qt4/qt4.inc2
40 files changed, 23 insertions, 399 deletions
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index 3a825d8db4..a9ec61e08f 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -10,7 +10,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
10 10
11inherit nativesdk qmake2 11inherit nativesdk qmake2
12 12
13SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 13SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \
14 file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 14 file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
15 file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ 15 file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
16 file://0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch \ 16 file://0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch \
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
deleted file mode 100644
index 27d58d13f0..0000000000
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.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] = "89c5ecba180cae74c66260ac732dc5cb"
8SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270"
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb
new file mode 100644
index 0000000000..6a7eefe24e
--- /dev/null
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.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] = "1864987bdbb2f58f8ae8b350dfdbe133"
8SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch
deleted file mode 100644
index 8caef97405..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch
+++ /dev/null
@@ -1,108 +0,0 @@
1From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001
2From: Peter Hartmann <phartmann@rim.com>
3Date: Fri, 4 Jan 2013 11:06:14 +0100
4Subject: [PATCH] SSL certificates: blacklist mis-issued Turktrust certificates
5
6Those certificates have erroneously set the CA attribute to true,
7meaning everybody in possesion of their keys can issue certificates on
8their own.
9
10backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase
11
12Task-number: QTBUG-28937
13Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23
14Reviewed-by: Richard J. Moore <rich@kde.org>
15
16Upstream-Status: Accepted https://codereview.qt-project.org/#change,43968
17---
18 src/network/ssl/qsslcertificate.cpp | 3 ++
19 ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++
20 .../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++
21 3 files changed, 58 insertions(+), 0 deletions(-)
22 create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem
23 create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem
24
25diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
26index 038187f..37799d1 100644
27--- a/src/network/ssl/qsslcertificate.cpp
28+++ b/src/network/ssl/qsslcertificate.cpp
29@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = {
30
31 "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust
32 "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust
33+
34+ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate
35+ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate
36 0
37 };
38
39diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem
40new file mode 100644
41index 0000000..33f2ef4
42--- /dev/null
43+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem
44@@ -0,0 +1,24 @@
45+-----BEGIN CERTIFICATE-----
46+MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD
47+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl
48+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
49+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo
50+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow
51+gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr
52+b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz
53+bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA
54+a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
55+CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5
56+GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R
57+rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa
58+tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r
59+Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF
60+9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw
61+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K
62+JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l
63+zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA
64+l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8
65+3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp
66+Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC
67+pWfGWA==
68+-----END CERTIFICATE-----
69diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem
70new file mode 100644
71index 0000000..e9d048f
72--- /dev/null
73+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem
74@@ -0,0 +1,31 @@
75+-----BEGIN CERTIFICATE-----
76+MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD
77+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl
78+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
79+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo
80+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow
81+bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB
82+MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE
83+AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
84+v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V
85+50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF
86+Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO
87+wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q
88+blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N
89+Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS
90+29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G
91+A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF
92+BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF
93+MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t
94+LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd
95+MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy
96+dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz
97+aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy
98+a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn
99+vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV
100+gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj
101+7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU
102+h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1
103+Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I
104+hQ==
105+-----END CERTIFICATE-----
106--
1071.7.1
108
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch
deleted file mode 100644
index 54171f7647..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 180bf94c241728dd6d6f100437914d3cb11cbc30 Mon Sep 17 00:00:00 2001
2From: Martin Petersson <Martin.Petersson@nokia.com>
3Date: Wed, 7 Mar 2012 12:05:59 +0100
4Subject: [PATCH] QtNetwork: blacklist two more certificates
5
6The comodogate 72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0
7certificate is a test certificate and the MD5 Collisions was created
8as a proof of concept deliberately made to be expired at the time
9of it's creation.
10
11Task-number: QTBUG-24654
12(cherry picked from commit 4c0df9feb2b44d0c4fcaa5076f00aa08fbc1dda5)
13
14Signed-off-by: Peter Hartmann <phartmann@rim.com>
15
16Apparently this commit was forgotten to cherry-pick to Qt 4.
17
18Change-Id: I86949eaa3c02483b0b66b4a620bfa88aaa9aa99b
19Reviewed-by: Richard J. Moore <rich@kde.org>
20
21Upstream-Status: Accepted https://codereview.qt-project.org/#change,43992
22---
23 src/network/ssl/qsslcertificate.cpp | 2 ++
24 1 files changed, 2 insertions(+), 0 deletions(-)
25
26diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
27index 37799d1..300a261 100644
28--- a/src/network/ssl/qsslcertificate.cpp
29+++ b/src/network/ssl/qsslcertificate.cpp
30@@ -825,6 +825,8 @@ static const char *certificate_blacklist[] = {
31
32 "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust
33 "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust
34+ "72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0", "UTN-USERFirst-Hardware", // comodogate test certificate
35+ "41", "MD5 Collisions Inc. (http://www.phreedom.org/md5)", // http://www.phreedom.org/research/rogue-ca/
36
37 "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate
38 "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate
39--
401.7.1
41
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch
deleted file mode 100644
index 6c796a36c9..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch
+++ /dev/null
@@ -1,147 +0,0 @@
1From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001
2From: Thiago Macieira <thiago.macieira@intel.com>
3Date: Sat, 22 Dec 2012 08:32:12 -0800
4Subject: [PATCH] Change all shmget calls to user-only memory
5
6Drop the read and write permissions for group and other users in the
7system.
8
9Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
10(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
11Reviewed-by: Richard J. Moore <rich@kde.org>
12
13Upstream-Status: Accepted http://qt.gitorious.org/qt/qt/commit/20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c
14---
15 src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++---
16 src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++--
17 src/gui/image/qnativeimage.cpp | 2 +-
18 src/gui/image/qpixmap_x11.cpp | 2 +-
19 src/plugins/platforms/xcb/qxcbwindowsurface.cpp | 2 +-
20 src/plugins/platforms/xlib/qxlibwindowsurface.cpp | 2 +-
21 .../auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp | 2 +-
22 tools/qvfb/qvfbshmem.cpp | 4 ++--
23 8 files changed, 12 insertions(+), 12 deletions(-)
24
25diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
26index 20d76e3..4cf3acf 100644
27--- a/src/corelib/kernel/qsharedmemory_unix.cpp
28+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
29@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size)
30 }
31
32 // create
33- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) {
34+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) {
35 QString function = QLatin1String("QSharedMemory::create");
36 switch (errno) {
37 case EINVAL:
38@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode)
39 {
40 #ifndef QT_POSIX_IPC
41 // grab the shared memory segment id
42- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660));
43+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600));
44 if (-1 == id) {
45 setErrorString(QLatin1String("QSharedMemory::attach (shmget)"));
46 return false;
47@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach()
48 size = 0;
49
50 // Get the number of current attachments
51- int id = shmget(unix_key, 0, 0444);
52+ int id = shmget(unix_key, 0, 0400);
53 cleanHandle();
54
55 struct shmid_ds shmid_ds;
56diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp
57index fad9acc..e77456b 100644
58--- a/src/corelib/kernel/qsystemsemaphore_unix.cpp
59+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp
60@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
61 }
62
63 // Get semaphore
64- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL);
65+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL);
66 if (-1 == semaphore) {
67 if (errno == EEXIST)
68- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT);
69+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT);
70 if (-1 == semaphore) {
71 setErrorString(QLatin1String("QSystemSemaphore::handle"));
72 cleanHandle();
73diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
74index 9654afe..fef38c5 100644
75--- a/src/gui/image/qnativeimage.cpp
76+++ b/src/gui/image/qnativeimage.cpp
77@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
78
79 bool ok;
80 xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height,
81- IPC_CREAT | 0777);
82+ IPC_CREAT | 0700);
83 ok = xshminfo.shmid != -1;
84 if (ok) {
85 xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
86diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
87index 280d8bd..88c9b7b 100644
88--- a/src/gui/image/qpixmap_x11.cpp
89+++ b/src/gui/image/qpixmap_x11.cpp
90@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h)
91 bool ok;
92 xshminfo.shmid = shmget(IPC_PRIVATE,
93 xshmimg->bytes_per_line * xshmimg->height,
94- IPC_CREAT | 0777);
95+ IPC_CREAT | 0700);
96 ok = xshminfo.shmid != -1;
97 if (ok) {
98 xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
99diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
100index b6a42d8..0d56821 100644
101--- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
102+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
103@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI
104 0);
105
106 m_shm_info.shmid = shmget (IPC_PRIVATE,
107- m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777);
108+ m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600);
109
110 m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0);
111 m_shm_info.shmseg = xcb_generate_id(xcb_connection());
112diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
113index bf003eb..46a2f97 100644
114--- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
115+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
116@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height)
117
118
119 image_info->shminfo.shmid = shmget (IPC_PRIVATE,
120- image->bytes_per_line * image->height, IPC_CREAT|0777);
121+ image->bytes_per_line * image->height, IPC_CREAT|0700);
122
123 image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0);
124 image_info->shminfo.readOnly = False;
125diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp
126index 7f9671f..84b6ebe 100644
127--- a/tools/qvfb/qvfbshmem.cpp
128+++ b/tools/qvfb/qvfbshmem.cpp
129@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s,
130 uint data_offset_value = sizeof(QVFbHeader);
131
132 int dataSize = bpl * h + data_offset_value;
133- shmId = shmget(key, dataSize, IPC_CREAT | 0666);
134+ shmId = shmget(key, dataSize, IPC_CREAT | 0600);
135 if (shmId != -1)
136 data = (unsigned char *)shmat(shmId, 0, 0);
137 else {
138 struct shmid_ds shm;
139 shmctl(shmId, IPC_RMID, &shm);
140- shmId = shmget(key, dataSize, IPC_CREAT | 0666);
141+ shmId = shmget(key, dataSize, IPC_CREAT | 0600);
142 if (shmId == -1) {
143 perror("QShMemViewProtocol::QShMemViewProtocol");
144 qFatal("Cannot get shared memory 0x%08x", key);
145--
1461.7.1
147
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch
deleted file mode 100644
index 498f14f69a..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From https://codereview.qt-project.org/p/qt/qt
2 * branch refs/changes/22/53322/2 -> FETCH_HEAD
3From 28524b867ee8c9784f00eec0f07e4d9491a651b8 Mon Sep 17 00:00:00 2001
4From: Thiago Macieira <thiago.macieira@intel.com>
5Date: Tue, 9 Apr 2013 16:41:23 -0700
6Subject: [PATCH] Remove unnecessary typedef, found by GCC 4.8
7
8qtconcurrentfilter.h:108:47: warning: typedef 'Iterator' locally defined but not used [-Wunused-local-typedefs]
9
10Qt5 commit: d4c241a98059edaa7a4b15beb1cfd16ed041284e (qtbase)
11Task-number: QTBUG-30594
12Change-Id: Icc69e41c2d4e11962f0c8434236d4847b46e7d9d
13
14Upstream-Status: Pending for 4.8.5 [1]
15
16[1] https://codereview.qt-project.org/#change,53322
17
18Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
19---
20 src/corelib/concurrent/qtconcurrentfilter.h | 1 -
21 1 files changed, 0 insertions(+), 1 deletions(-)
22
23diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h
24index 50b58bd..5a70182 100644
25--- a/src/corelib/concurrent/qtconcurrentfilter.h
26+++ b/src/corelib/concurrent/qtconcurrentfilter.h
27@@ -105,7 +105,6 @@ namespace QtConcurrent {
28 template <typename Sequence, typename KeepFunctor, typename ReduceFunctor>
29 ThreadEngineStarter<void> filterInternal(Sequence &sequence, KeepFunctor keep, ReduceFunctor reduce)
30 {
31- typedef typename Sequence::const_iterator Iterator;
32 typedef FilterKernel<Sequence, KeepFunctor, ReduceFunctor> KernelType;
33 return startThreadEngine(new KernelType(sequence, keep, reduce));
34 }
35--
361.7.4.4
37
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch
deleted file mode 100644
index a37e35f980..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 1c75ea0332054c420efd676c147e45eee43e0118 Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Thu, 6 Jun 2013 12:42:13 +1000
4Subject: [PATCH] Don't overwrite QMAKE_QT_CONFIG with empty value
5
6If the mkspec sets QMAKE_QT_CONFIG, QMAKE_QT_CONFIG may be overwritten
7with an empty value from .qmake.cache. Avoid this by first checking
8if the value from .qmake.cache is not empty before assigning it to
9QMAKE_QT_CONFIG.
10
11Upstream-Status: Submitted
12https://codereview.qt-project.org/#change,58109
13
14Change-Id: I95fa630139b8798156a2fb15d0dde630a0a53a0a
15Signed-off-by: Jonathan Liu <net147@gmail.com>
16---
17 mkspecs/features/qt_config.prf | 6 +++++-
18 1 file changed, 5 insertions(+), 1 deletion(-)
19
20diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
21index fc14cdd..e059b7e 100644
22--- a/mkspecs/features/qt_config.prf
23+++ b/mkspecs/features/qt_config.prf
24@@ -1,7 +1,11 @@
25 # This file is loaded by the mkspecs, before .qmake.cache has been loaded.
26 # Consequently, we have to do some stunts to get values out of the cache.
27
28-exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG)
29+exists($$_QMAKE_CACHE_) {
30+ qdd = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG)
31+ !isEmpty(qdd): QMAKE_QT_CONFIG = $$qdd
32+ unset(qdd)
33+}
34 isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
35 qdd = $$QT_BUILD_TREE
36 isEmpty(qdd):exists($$_QMAKE_CACHE_): qdd = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
37--
381.8.2.3
39
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4.inc b/meta/recipes-qt/qt4/qt4-4.8.5.inc
index 0a8e00b16b..810a01b654 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.5.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
5 5
6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" 6FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
7 7
8SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 8SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \
9 file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ 9 file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
10 file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ 10 file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
11 file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \ 11 file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
@@ -21,18 +21,13 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
21 file://0018-configure-make-pulseaudio-a-configurable-option.patch \ 21 file://0018-configure-make-pulseaudio-a-configurable-option.patch \
22 file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ 22 file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
23 file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \ 23 file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \
24 file://0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch \
25 file://0023-qtnetwork-blacklist-two-more-certificates.patch \
26 file://0024-Change-all-shmget-calls-to-user-only-memory.patch \
27 file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \
28 file://0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch \
29 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ 24 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
30 file://g++.conf \ 25 file://g++.conf \
31 file://linux.conf \ 26 file://linux.conf \
32 " 27 "
33 28
34SRC_URI[md5sum] = "89c5ecba180cae74c66260ac732dc5cb" 29SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133"
35SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270" 30SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
36 31
37S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" 32S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
38 33
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index d8b0a09d17..d8b0a09d17 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
index 98fc88738f..98fc88738f 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
index ecaea51e08..ecaea51e08 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
index 1eb8a5843a..1eb8a5843a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
index 1a8f2b7f94..1a8f2b7f94 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
index 90ebf75095..90ebf75095 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
index 7d3b336f77..7d3b336f77 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
index ec07f41403..ec07f41403 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch
index 45b8c10fbe..45b8c10fbe 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
index 1d2ddab490..1d2ddab490 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0011-freetype-host-includes.patch
index e0879c5615..e0879c5615 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0011-freetype-host-includes.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0012-Add-2bpp-support.patch
index 8402eab635..8402eab635 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0012-Add-2bpp-support.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0013-configure-add-crossarch-option.patch
index aa464fd1ed..aa464fd1ed 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0013-configure-add-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0014-translations-fix-phony-translation-linking-error.patch
index 66724a8ecf..66724a8ecf 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0014-translations-fix-phony-translation-linking-error.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0015-configure-add-nostrip-for-debug-packages.patch
index b5db49128c..b5db49128c 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0015-configure-add-nostrip-for-debug-packages.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0016-configure-eval-QMAKE_CXX.patch
index 9c3de47b4b..9c3de47b4b 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0016-configure-eval-QMAKE_CXX.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
index 9471966660..9471966660 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0018-configure-make-pulseaudio-a-configurable-option.patch
index 19cdd4c57d..19cdd4c57d 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0018-configure-make-pulseaudio-a-configurable-option.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
index a83d2470a1..a83d2470a1 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0020-webkit-disable-the-fuse-ld-gold-flag.patch
index 92eddebaec..92eddebaec 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0020-webkit-disable-the-fuse-ld-gold-flag.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0021-configure-make-qt4-native-work-with-long-building-pa.patch
index dbc90227a5..dbc90227a5 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0021-configure-make-qt4-native-work-with-long-building-pa.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0027-tools.pro-disable-qmeegographicssystemhelper.patch
index 6e30aeed02..6e30aeed02 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/0027-tools.pro-disable-qmeegographicssystemhelper.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0027-tools.pro-disable-qmeegographicssystemhelper.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.5/g++.conf
index 8755031017..8755031017 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/g++.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.5/linux.conf
index 86703813ca..86703813ca 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.5/qte.sh
index 21d6ecbd6a..21d6ecbd6a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.4/qte.sh
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/qte.sh
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb
index c08927edff..c08927edff 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index a153a37fba..ddb790d3fd 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -13,12 +13,11 @@ INC_PR = "r20"
13 13
14inherit native 14inherit native
15 15
16SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 16SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \
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://0021-configure-make-qt4-native-work-with-long-building-pa.patch \ 20 file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \
21 file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \
22 file://g++.conf \ 21 file://g++.conf \
23 file://linux.conf \ 22 file://linux.conf \
24 " 23 "
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.4.bb b/meta/recipes-qt/qt4/qt4-native_4.8.4.bb
deleted file mode 100644
index 3932b3c24e..0000000000
--- a/meta/recipes-qt/qt4/qt4-native_4.8.4.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] = "89c5ecba180cae74c66260ac732dc5cb"
8SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270"
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.5.bb b/meta/recipes-qt/qt4/qt4-native_4.8.5.bb
new file mode 100644
index 0000000000..85ca0f8d97
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.5.bb
@@ -0,0 +1,8 @@
1require qt4-native.inc
2
3PR = "${INC_PR}.0"
4
5TOBUILD := "src/tools/bootstrap ${TOBUILD}"
6
7SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133"
8SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb
index d6edef9442..d6edef9442 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index ebe0ea501b..81866ea6e9 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -185,6 +185,8 @@ FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*"
185FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" 185FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*"
186FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" 186FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*"
187FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" 187FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug"
188INSANE_SKIP_${QT_BASE_NAME}-examples += "libdir"
189INSANE_SKIP_${QT_BASE_NAME}-examples-dbg += "libdir"
188 190
189# License options, to be set by the recipe if different values are needed 191# License options, to be set by the recipe if different values are needed
190QT_LICENSE_FILE ?= "" 192QT_LICENSE_FILE ?= ""