* [PATCH 1/2] qt4: add blacklist-diginotar-certs patch
@ 2011-09-10 20:07 Eric Bénard
2011-09-10 20:07 ` [PATCH 2/2] qt4: update to latest version 4.7.4 Eric Bénard
` (2 more replies)
0 siblings, 3 replies; 38+ messages in thread
From: Eric Bénard @ 2011-09-10 20:07 UTC (permalink / raw)
To: openembedded-core
- this patch comes from Nokia and blacklist all DigiNotar intermediates
and root certificates, more details are available here :
http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
.../qt4/files/blacklist-diginotar-certs.diff | 95 ++++++++++++++++++++
meta/recipes-qt/qt4/qt-4.7.3.inc | 1 +
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-native.inc | 2 +-
meta/recipes-qt/qt4/qt4-native_4.7.3.bb | 2 +
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 2 +-
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 2 +
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
8 files changed, 104 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
diff --git a/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff b/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
new file mode 100644
index 0000000..657a4c8
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
@@ -0,0 +1,95 @@
+http://labs.qt.nokia.com/2011/09/02/what-the-diginotar-security-breach-means-for-qt-users/
+http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
+
+Original Author:Nokia
+Upstream-Status: Integrated in upcoming versions
+
+diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
+index 328c5c2..1ae98f4 100644
+--- a/src/network/ssl/qsslcertificate.cpp
++++ b/src/network/ssl/qsslcertificate.cpp
+@@ -803,22 +803,47 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
+ // These certificates are known to be fraudulent and were created during the comodo
+ // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
+ static const char *certificate_blacklist[] = {
+- "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
+- "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
+- "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
+- "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
+- "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
+- "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
+- "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
+- "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
+- "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
++ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
++ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
++ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
++ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
++ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
++ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
++ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
++ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
++ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
++
++ "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar
++ "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root
++ "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root
++ "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root
++ "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA
++ "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2"
++ "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root
++
++ "1184640176", "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust
++ "120000525", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
++ "120000505", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
++ "120000515", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
++ "20015536", "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government
++ "20001983", "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government
++ "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root
++ "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate
++// "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate
++// "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach
++// "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach
++ "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
++ "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
+ 0
+ };
+
+ bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
+ {
+ for (int a = 0; certificate_blacklist[a] != 0; a++) {
+- if (certificate.serialNumber() == certificate_blacklist[a])
++ QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]);
++ if (certificate.serialNumber() == certificate_blacklist[a++] &&
++ (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName ||
++ certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName))
+ return true;
+ }
+ return false;
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index 141d80a..b8e6c4c 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
++++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake()
+ X509 *x509 = q_SSL_get_peer_certificate(ssl);
+ configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
+ q_X509_free(x509);
+- if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
+- q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
+- q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
+- emit q->error(QAbstractSocket::SslHandshakeFailedError);
+- plainSocket->disconnectFromHost();
+- return false;
++
++ // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
++ foreach (const QSslCertificate &cert, configuration.peerCertificateChain) {
++ if (QSslCertificatePrivate::isBlacklisted(cert)) {
++ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
++ q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
++ emit q->error(QAbstractSocket::SslHandshakeFailedError);
++ plainSocket->disconnectFromHost();
++ return false;
++ }
+ }
+
+ // Start translating errors.
diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc
index c58679f..a5b8b05 100644
--- a/meta/recipes-qt/qt4/qt-4.7.3.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.3.inc
@@ -12,6 +12,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://0008-qt-lib-infix.patch \
file://0009-support-2bpp.patch \
file://0001-Added-Openembedded-crossarch-option.patch \
+ file://blacklist-diginotar-certs.diff \
file://g++.conf \
file://linux.conf \
"
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index d464a1d..9914c61 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r29"
+INC_PR = "r30"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 7ed6a63..59c0059 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-INC_PR = "r11"
+INC_PR = "r12"
inherit native
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
index 5c84d4d..e90a7ba 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
@@ -2,6 +2,8 @@ require qt4-native.inc
PR = "${INC_PR}.1"
+SRC_URI += "file://blacklist-diginotar-certs.diff"
+
# Find the g++.conf/linux.conf in the right directory.
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 0ae0af6..097fadc 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r5"
+INC_PR = "r6"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
index d61f312..e2a4539 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
@@ -2,5 +2,7 @@ require qt4-tools-nativesdk.inc
PR = "${INC_PR}.0"
+SRC_URI += "file://blacklist-diginotar-certs.diff"
+
SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 234cb89..0a714be 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r26"
+INC_PR = "r27"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
--
1.7.6
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 2/2] qt4: update to latest version 4.7.4
2011-09-10 20:07 [PATCH 1/2] qt4: add blacklist-diginotar-certs patch Eric Bénard
@ 2011-09-10 20:07 ` Eric Bénard
2011-09-11 17:22 ` Anders Darander
2011-09-12 10:34 ` [PATCH 1/2] qt4: add blacklist-diginotar-certs patch Paul Eggleton
2011-09-15 17:34 ` Saul Wold
2 siblings, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-10 20:07 UTC (permalink / raw)
To: openembedded-core
- 4.7.4 was release on the 1st of september, the changelog is available
here : http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4
and mostly contains bug fix.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 32 +++++-----
meta/recipes-qt/qt4/qt-4.7.3.inc | 61 ------------------
.../0001-Added-Openembedded-crossarch-option.patch | 47 --------------
meta/recipes-qt/qt4/qt-4.7.3/g++.conf | 60 ------------------
.../qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | 31 ---------
meta/recipes-qt/qt4/qt-4.7.3/linux.conf | 66 --------------------
meta/recipes-qt/qt4/qt-4.7.4.inc | 61 ++++++++++++++++++
.../0001-Added-Openembedded-crossarch-option.patch | 47 ++++++++++++++
meta/recipes-qt/qt4/qt-4.7.4/g++.conf | 60 ++++++++++++++++++
.../qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch | 31 +++++++++
meta/recipes-qt/qt4/qt-4.7.4/linux.conf | 66 ++++++++++++++++++++
meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb | 10 ---
meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 10 +++
meta/recipes-qt/qt4/qt4-native_4.7.3.bb | 15 -----
meta/recipes-qt/qt4/qt4-native_4.7.4.bb | 15 +++++
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 8 ---
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 8 +++
meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb | 12 ----
meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 12 ++++
19 files changed, 326 insertions(+), 326 deletions(-)
delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3.inc
delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3/g++.conf
delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3/linux.conf
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4.inc
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/g++.conf
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/linux.conf
delete mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
create mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.7.3.bb
create mode 100644 meta/recipes-qt/qt4/qt4-native_4.7.4.bb
delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
delete mode 100644 meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
create mode 100644 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 6f1a462..599406b 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3406,32 +3406,32 @@ RECIPE_LAST_UPDATE_pn-imake = "Nov 21, 2010"
RECIPE_MAINTAINER_pn-imake = "Yu Ke <ke.yu@intel.com>"
RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
-RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-tools-native = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-tools-native = "September 10, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton <paul.eggleton@linux.intel.com>"
DISTRO_PN_ALIAS_pn-qt4-tools-native = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
-RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "September 10, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <paul.eggleton@linux.intel.com>"
RECIPE_STATUS_pn-qt4-embedded = "green"
-RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-embedded = "September 10, 2011"
RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <paul.eggleton@linux.intel.com>"
RECIPE_STATUS_pn-qt4-x11-free = "green"
-RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-x11-free = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-x11-free = "September 10, 2011"
RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton <paul.eggleton@linux.intel.com"
DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"
diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc
deleted file mode 100644
index a5b8b05..0000000
--- a/meta/recipes-qt/qt4/qt-4.7.3.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-LICENSE = "LGPLv2.1 | GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
- file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
- file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-
-FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
-
-SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://0004-no-qmake.patch \
- file://hack-out-pg2-4.7.0.patch \
- file://0006-freetype-host-includes.patch \
- file://0008-qt-lib-infix.patch \
- file://0009-support-2bpp.patch \
- file://0001-Added-Openembedded-crossarch-option.patch \
- file://blacklist-diginotar-certs.diff \
- file://g++.conf \
- file://linux.conf \
- "
-
-SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
-SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
-
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-
-FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
-
-do_configure_prepend() {
- for pro in $(find ${S} -name "*.pro") ; do
- sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
- done
-
- sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
- sed -i \
- -e /QMAKE_MOC\ /d \
- -e /QMAKE_UIC\ /d \
- -e /QMAKE_UIC3\ /d \
- -e /QMAKE_RCC\ /d \
- ${S}/configure
-}
-
-do_configure_append() {
- sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
-}
-
-QT_GLFLAGS ?= ""
-QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
-
-do_compile() {
- # Fixup missing wsegl header in some SGX SDKs
- if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
- cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
- fi
-
- unset CFLAGS CXXFLAGS
- install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
- install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
-
- oe_runmake ${EXTRA_ENV}
-}
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
deleted file mode 100644
index f302c5b..0000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
-From: Matthias Günther <matgnt@gmail.com>
-Date: Wed, 12 May 2010 16:52:45 +0200
-Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
-
-Original Author: Michael Lauer <mickey@vanille-media.de>
-Upstream-Status: Pending
-
----
- configure | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index facd192..9d15136 100755
---- a/configure
-+++ b/configure
-@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
- shift
- VAL=$1
- ;;
-- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
-+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
- VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
- shift
- VAL="$1"
-@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
- xplatform)
- XPLATFORM="$VAL"
- ;;
-+ crossarch)
-+ CROSSARCH="$VAL"
-+ ;;
- debug-and-release)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_DEBUG_RELEASE="$VAL"
-@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
- CFG_ARCH=$CFG_HOST_ARCH
- fi
-
-+CFG_ARCH="$CROSSARCH"
-+
- if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$CFG_ARCH' is supported"
---
-1.7.0.4
-
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/g++.conf b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
deleted file mode 100644
index 80f925c..0000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# qmake configuration for common gcc
-#
-
-QMAKE_CC = $(OE_QMAKE_CC)
-QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
-QMAKE_CFLAGS_DEPS += -M
-QMAKE_CFLAGS_WARN_ON += -Wall -W
-QMAKE_CFLAGS_WARN_OFF += -w
-QMAKE_CFLAGS_RELEASE +=
-QMAKE_CFLAGS_DEBUG += -g
-QMAKE_CFLAGS_SHLIB += -fPIC
-QMAKE_CFLAGS_STATIC_LIB += -fPIC
-QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
-QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
-QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
-
-QMAKE_CXX = $(OE_QMAKE_CXX)
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
-QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
-QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
-QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-
-QMAKE_LINK = $(OE_QMAKE_LINK)
-QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
-QMAKE_LINK_C = $(OE_QMAKE_LINK)
-QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
-QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
-QMAKE_LFLAGS_RELEASE +=
-QMAKE_LFLAGS_DEBUG +=
-QMAKE_LFLAGS_APP +=
-QMAKE_LFLAGS_SHLIB += -shared
-QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME += -Wl,-soname,
-QMAKE_LFLAGS_THREAD +=
-QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
-QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
-
-QMAKE_PCH_OUTPUT_EXT = .gch
-
-# -Bsymbolic-functions (ld) support
-QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
-QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
-
-# some linking helper...
-CONFIG += rpath_libdirs
-
-# for the SDK
-isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
deleted file mode 100644
index 39c5f4a..0000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Hack to not use the pg_config of the host system which will add /usr/include
-
-pg_config is a native binary so using that when cross compiling
-will always fail. The commented out fix would do, but for OE
-our -platform and -xplatform is the same so we are actually not
-really cross compiling. Just comment out the test, we are passing
-the location to the postgres headers and if they are okay we
-will pad.
-
-Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
-Upstream-Status: Inappropriate [configuration]
-
-Index: qt-everywhere-opensource-src-4.7.0/configure
-===================================================================
---- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
-+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
-@@ -4921,10 +4921,10 @@
- psql)
- if [ "$CFG_SQL_psql" != "no" ]; then
- # Be careful not to use native pg_config when cross building.
-- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
-- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
-- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
-- fi
-+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
-+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
-+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
-+# fi
- [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
- [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
- # But, respect PSQL_LIBS if set
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/linux.conf b/meta/recipes-qt/qt4/qt-4.7.3/linux.conf
deleted file mode 100644
index a541355..0000000
--- a/meta/recipes-qt/qt4/qt-4.7.3/linux.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# qmake configuration for common linux
-#
-
-QMAKE_CFLAGS_THREAD += -D_REENTRANT
-QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR =
-QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 =
-QMAKE_LIBDIR_X11 =
-QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
-QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
-QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL =
-QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_EGL =
-QMAKE_LIBDIR_EGL =
-QMAKE_INCDIR_OPENVG =
-QMAKE_LIBDIR_OPENVG =
-
-
-QMAKE_LIBS =
-QMAKE_LIBS_DYNLOAD = -ldl
-QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
-QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
-QMAKE_LIBS_NIS = -lnsl
-QMAKE_LIBS_EGL = -lEGL
-QMAKE_LIBS_OPENGL = -lGLU -lGL
-QMAKE_LIBS_OPENGL_QT = -lGL
-QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
-QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
-QMAKE_LIBS_OPENVG = -lOpenVG
-QMAKE_LIBS_THREAD = -lpthread
-
-QMAKE_MOC = $(OE_QMAKE_MOC)
-QMAKE_UIC = $(OE_QMAKE_UIC)
-QMAKE_UIC3 = $(OE_QMAKE_UIC3)
-QMAKE_RCC = $(OE_QMAKE_RCC)
-QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
-QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
-
-QMAKE_AR = $(OE_QMAKE_AR) cqs
-QMAKE_OBJCOPY = objcopy
-QMAKE_RANLIB =
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_COPY_FILE = $(COPY)
-QMAKE_COPY_DIR = $(COPY) -r
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP = $(OE_QMAKE_STRIP)
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
-QMAKE_INSTALL_FILE = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
-
-include(unix.conf)
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
new file mode 100644
index 0000000..ac5da9f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -0,0 +1,61 @@
+LICENSE = "LGPLv2.1 | GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+ file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
+ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
+
+SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://0004-no-qmake.patch \
+ file://hack-out-pg2-4.7.0.patch \
+ file://0006-freetype-host-includes.patch \
+ file://0008-qt-lib-infix.patch \
+ file://0009-support-2bpp.patch \
+ file://0001-Added-Openembedded-crossarch-option.patch \
+ file://blacklist-diginotar-certs.diff \
+ file://g++.conf \
+ file://linux.conf \
+ "
+
+SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
+SRC_URI[sha256sum] = "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf"
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
+
+do_configure_prepend() {
+ for pro in $(find ${S} -name "*.pro") ; do
+ sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+ done
+
+ sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
+ sed -i \
+ -e /QMAKE_MOC\ /d \
+ -e /QMAKE_UIC\ /d \
+ -e /QMAKE_UIC3\ /d \
+ -e /QMAKE_RCC\ /d \
+ ${S}/configure
+}
+
+do_configure_append() {
+ sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
+}
+
+QT_GLFLAGS ?= ""
+QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
+
+do_compile() {
+ # Fixup missing wsegl header in some SGX SDKs
+ if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
+ cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
+ fi
+
+ unset CFLAGS CXXFLAGS
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
+
+ oe_runmake ${EXTRA_ENV}
+}
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
new file mode 100644
index 0000000..f302c5b
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
@@ -0,0 +1,47 @@
+From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
+From: Matthias Günther <matgnt@gmail.com>
+Date: Wed, 12 May 2010 16:52:45 +0200
+Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
+
+Original Author: Michael Lauer <mickey@vanille-media.de>
+Upstream-Status: Pending
+
+---
+ configure | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index facd192..9d15136 100755
+--- a/configure
++++ b/configure
+@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
+ shift
+ VAL=$1
+ ;;
+- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
+ VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+ shift
+ VAL="$1"
+@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
+ xplatform)
+ XPLATFORM="$VAL"
+ ;;
++ crossarch)
++ CROSSARCH="$VAL"
++ ;;
+ debug-and-release)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_DEBUG_RELEASE="$VAL"
+@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
+ CFG_ARCH=$CFG_HOST_ARCH
+ fi
+
++CFG_ARCH="$CROSSARCH"
++
+ if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " '$CFG_ARCH' is supported"
+--
+1.7.0.4
+
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/g++.conf b/meta/recipes-qt/qt4/qt-4.7.4/g++.conf
new file mode 100644
index 0000000..80f925c
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/g++.conf
@@ -0,0 +1,60 @@
+#
+# qmake configuration for common gcc
+#
+
+QMAKE_CC = $(OE_QMAKE_CC)
+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
+QMAKE_CFLAGS_DEPS += -M
+QMAKE_CFLAGS_WARN_ON += -Wall -W
+QMAKE_CFLAGS_WARN_OFF += -w
+QMAKE_CFLAGS_RELEASE +=
+QMAKE_CFLAGS_DEBUG += -g
+QMAKE_CFLAGS_SHLIB += -fPIC
+QMAKE_CFLAGS_STATIC_LIB += -fPIC
+QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
+QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+QMAKE_CXX = $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+
+QMAKE_LINK = $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
+QMAKE_LINK_C = $(OE_QMAKE_LINK)
+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
+QMAKE_LFLAGS_RELEASE +=
+QMAKE_LFLAGS_DEBUG +=
+QMAKE_LFLAGS_APP +=
+QMAKE_LFLAGS_SHLIB += -shared
+QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME += -Wl,-soname,
+QMAKE_LFLAGS_THREAD +=
+QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
+QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
+
+QMAKE_PCH_OUTPUT_EXT = .gch
+
+# -Bsymbolic-functions (ld) support
+QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
+QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
+
+# some linking helper...
+CONFIG += rpath_libdirs
+
+# for the SDK
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
new file mode 100644
index 0000000..39c5f4a
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
@@ -0,0 +1,31 @@
+Hack to not use the pg_config of the host system which will add /usr/include
+
+pg_config is a native binary so using that when cross compiling
+will always fail. The commented out fix would do, but for OE
+our -platform and -xplatform is the same so we are actually not
+really cross compiling. Just comment out the test, we are passing
+the location to the postgres headers and if they are okay we
+will pad.
+
+Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
+Upstream-Status: Inappropriate [configuration]
+
+Index: qt-everywhere-opensource-src-4.7.0/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
++++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
+@@ -4921,10 +4921,10 @@
+ psql)
+ if [ "$CFG_SQL_psql" != "no" ]; then
+ # Be careful not to use native pg_config when cross building.
+- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
+- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
+- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
+- fi
++# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
++# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
++# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
++# fi
+ [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+ [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+ # But, respect PSQL_LIBS if set
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/linux.conf b/meta/recipes-qt/qt4/qt-4.7.4/linux.conf
new file mode 100644
index 0000000..a541355
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/linux.conf
@@ -0,0 +1,66 @@
+#
+# qmake configuration for common linux
+#
+
+QMAKE_CFLAGS_THREAD += -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR =
+QMAKE_LIBDIR =
+QMAKE_INCDIR_X11 =
+QMAKE_LIBDIR_X11 =
+QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL =
+QMAKE_LIBDIR_OPENGL =
+QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_EGL =
+QMAKE_LIBDIR_EGL =
+QMAKE_INCDIR_OPENVG =
+QMAKE_LIBDIR_OPENVG =
+
+
+QMAKE_LIBS =
+QMAKE_LIBS_DYNLOAD = -ldl
+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
+QMAKE_LIBS_NIS = -lnsl
+QMAKE_LIBS_EGL = -lEGL
+QMAKE_LIBS_OPENGL = -lGLU -lGL
+QMAKE_LIBS_OPENGL_QT = -lGL
+QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
+QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
+QMAKE_LIBS_OPENVG = -lOpenVG
+QMAKE_LIBS_THREAD = -lpthread
+
+QMAKE_MOC = $(OE_QMAKE_MOC)
+QMAKE_UIC = $(OE_QMAKE_UIC)
+QMAKE_UIC3 = $(OE_QMAKE_UIC3)
+QMAKE_RCC = $(OE_QMAKE_RCC)
+QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
+QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
+
+QMAKE_AR = $(OE_QMAKE_AR) cqs
+QMAKE_OBJCOPY = objcopy
+QMAKE_RANLIB =
+
+QMAKE_TAR = tar -cf
+QMAKE_GZIP = gzip -9f
+
+QMAKE_COPY = cp -f
+QMAKE_COPY_FILE = $(COPY)
+QMAKE_COPY_DIR = $(COPY) -r
+QMAKE_MOVE = mv -f
+QMAKE_DEL_FILE = rm -f
+QMAKE_DEL_DIR = rmdir
+QMAKE_STRIP = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_CHK_DIR_EXISTS = test -d
+QMAKE_MKDIR = mkdir -p
+QMAKE_INSTALL_FILE = install -m 644 -p
+QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+include(unix.conf)
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
deleted file mode 100644
index c3f6713..0000000
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require qt-${PV}.inc
-require qt4-embedded.inc
-
-PR = "${INC_PR}.1"
-
-QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
-
-QT_CONFIG_FLAGS += " \
- -exceptions \
-"
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
new file mode 100644
index 0000000..c3f6713
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -0,0 +1,10 @@
+require qt-${PV}.inc
+require qt4-embedded.inc
+
+PR = "${INC_PR}.1"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+QT_CONFIG_FLAGS += " \
+ -exceptions \
+"
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
deleted file mode 100644
index e90a7ba..0000000
--- a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require qt4-native.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://blacklist-diginotar-certs.diff"
-
-# Find the g++.conf/linux.conf in the right directory.
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
-
-EXTRA_OECONF += " -no-fast -silent -no-rpath"
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
-SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
new file mode 100644
index 0000000..ffa5f2a
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
@@ -0,0 +1,15 @@
+require qt4-native.inc
+
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://blacklist-diginotar-certs.diff"
+
+# Find the g++.conf/linux.conf in the right directory.
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
+
+EXTRA_OECONF += " -no-fast -silent -no-rpath"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
+
+SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
+SRC_URI[sha256sum] = "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
deleted file mode 100644
index e2a4539..0000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://blacklist-diginotar-certs.diff"
-
-SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
-SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
new file mode 100644
index 0000000..9d95eeb
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
@@ -0,0 +1,8 @@
+require qt4-tools-nativesdk.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://blacklist-diginotar-certs.diff"
+
+SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
+SRC_URI[sha256sum] = "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
deleted file mode 100644
index 75c6314..0000000
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require qt4-x11-free.inc
-require qt-${PV}.inc
-
-PR = "${INC_PR}.1"
-
-QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
-
-QT_CONFIG_FLAGS += " \
- -no-embedded \
- -xrandr \
- -x11"
-
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
new file mode 100644
index 0000000..75c6314
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -0,0 +1,12 @@
+require qt4-x11-free.inc
+require qt-${PV}.inc
+
+PR = "${INC_PR}.1"
+
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
+
+QT_CONFIG_FLAGS += " \
+ -no-embedded \
+ -xrandr \
+ -x11"
+
--
1.7.6
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH 2/2] qt4: update to latest version 4.7.4
2011-09-10 20:07 ` [PATCH 2/2] qt4: update to latest version 4.7.4 Eric Bénard
@ 2011-09-11 17:22 ` Anders Darander
2011-09-11 17:33 ` [PATCH] " Eric Bénard
0 siblings, 1 reply; 38+ messages in thread
From: Anders Darander @ 2011-09-11 17:22 UTC (permalink / raw)
To: openembedded-core
* Eric Bénard <eric@eukrea.com> [110910 22:08]:
> - 4.7.4 was release on the 1st of september, the changelog is available
> here : http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4
> and mostly contains bug fix.
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 8 +++
> meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb | 12 ----
> meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 12 ++++
> 19 files changed, 326 insertions(+), 326 deletions(-)
> delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3.inc
> delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
> delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3/g++.conf
> delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
> delete mode 100644 meta/recipes-qt/qt4/qt-4.7.3/linux.conf
> create mode 100644 meta/recipes-qt/qt4/qt-4.7.4.inc
> create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
> create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/g++.conf
> create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
> create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/linux.conf
> delete mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
> create mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
> delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> create mode 100644 meta/recipes-qt/qt4/qt4-native_4.7.4.bb
> delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
> create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
> delete mode 100644 meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
> create mode 100644 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
Could you redo the patch, and try to make git detect renames? I'd guess
that a lot of the changes above are only a rename, possibly with a few
lines modified. That would make the review of the patch a lot easier...
The create-pull-request script ought to have found most, if not all, of
the renames in this patch. Otherwise, please, modify that -M option to
some suitable value.
Regards,
Anders
--
Anders Darander
ChargeStorm AB / eStorm AB
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH] qt4: update to latest version 4.7.4
2011-09-11 17:22 ` Anders Darander
@ 2011-09-11 17:33 ` Eric Bénard
2011-09-12 10:34 ` Paul Eggleton
0 siblings, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-11 17:33 UTC (permalink / raw)
To: openembedded-core
- 4.7.4 was release on the 1st of september, the changelog is available
here : http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4
and mostly contains bug fix.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 32 ++++++++++----------
meta/recipes-qt/qt4/{qt-4.7.3.inc => qt-4.7.4.inc} | 4 +-
.../0001-Added-Openembedded-crossarch-option.patch | 0
.../recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/g++.conf | 0
.../hack-out-pg2-4.7.0.patch | 0
.../qt4/{qt-4.7.3 => qt-4.7.4}/linux.conf | 0
...qt4-embedded_4.7.3.bb => qt4-embedded_4.7.4.bb} | 0
.../{qt4-native_4.7.3.bb => qt4-native_4.7.4.bb} | 4 +-
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 8 -----
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 8 +++++
...qt4-x11-free_4.7.3.bb => qt4-x11-free_4.7.4.bb} | 0
11 files changed, 28 insertions(+), 28 deletions(-)
rename meta/recipes-qt/qt4/{qt-4.7.3.inc => qt-4.7.4.inc} (93%)
rename meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/0001-Added-Openembedded-crossarch-option.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/g++.conf (100%)
rename meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/hack-out-pg2-4.7.0.patch (100%)
rename meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/linux.conf (100%)
rename meta/recipes-qt/qt4/{qt4-embedded_4.7.3.bb => qt4-embedded_4.7.4.bb} (100%)
rename meta/recipes-qt/qt4/{qt4-native_4.7.3.bb => qt4-native_4.7.4.bb} (67%)
delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
rename meta/recipes-qt/qt4/{qt4-x11-free_4.7.3.bb => qt4-x11-free_4.7.4.bb} (100%)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 6f1a462..599406b 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3406,32 +3406,32 @@ RECIPE_LAST_UPDATE_pn-imake = "Nov 21, 2010"
RECIPE_MAINTAINER_pn-imake = "Yu Ke <ke.yu@intel.com>"
RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
-RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-tools-native = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-tools-native = "September 10, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton <paul.eggleton@linux.intel.com>"
DISTRO_PN_ALIAS_pn-qt4-tools-native = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
-RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "September 10, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <paul.eggleton@linux.intel.com>"
RECIPE_STATUS_pn-qt4-embedded = "green"
-RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-embedded = "September 10, 2011"
RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <paul.eggleton@linux.intel.com>"
RECIPE_STATUS_pn-qt4-x11-free = "green"
-RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-x11-free = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-x11-free = "September 10, 2011"
RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton <paul.eggleton@linux.intel.com"
DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"
diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
similarity index 93%
rename from meta/recipes-qt/qt4/qt-4.7.3.inc
rename to meta/recipes-qt/qt4/qt-4.7.4.inc
index a5b8b05..ac5da9f 100644
--- a/meta/recipes-qt/qt4/qt-4.7.3.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -17,8 +17,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://linux.conf \
"
-SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
-SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
+SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
+SRC_URI[sha256sum] = "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf"
S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
rename to meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/g++.conf b/meta/recipes-qt/qt4/qt-4.7.4/g++.conf
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.3/g++.conf
rename to meta/recipes-qt/qt4/qt-4.7.4/g++.conf
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
rename to meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/linux.conf b/meta/recipes-qt/qt4/qt-4.7.4/linux.conf
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.3/linux.conf
rename to meta/recipes-qt/qt4/qt-4.7.4/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
similarity index 100%
rename from meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
rename to meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
similarity index 67%
rename from meta/recipes-qt/qt4/qt4-native_4.7.3.bb
rename to meta/recipes-qt/qt4/qt4-native_4.7.4.bb
index e90a7ba..ffa5f2a 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
@@ -11,5 +11,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
-SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
+SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
+SRC_URI[sha256sum] = "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
deleted file mode 100644
index e2a4539..0000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://blacklist-diginotar-certs.diff"
-
-SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
-SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
new file mode 100644
index 0000000..9d95eeb
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
@@ -0,0 +1,8 @@
+require qt4-tools-nativesdk.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://blacklist-diginotar-certs.diff"
+
+SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
+SRC_URI[sha256sum] = "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
similarity index 100%
rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
--
1.7.6
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] qt4: add blacklist-diginotar-certs patch
2011-09-10 20:07 [PATCH 1/2] qt4: add blacklist-diginotar-certs patch Eric Bénard
2011-09-10 20:07 ` [PATCH 2/2] qt4: update to latest version 4.7.4 Eric Bénard
@ 2011-09-12 10:34 ` Paul Eggleton
2011-09-15 17:34 ` Saul Wold
2 siblings, 0 replies; 38+ messages in thread
From: Paul Eggleton @ 2011-09-12 10:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Saturday 10 September 2011 21:07:45 Eric Bénard wrote:
> - this patch comes from Nokia and blacklist all DigiNotar intermediates
> and root certificates, more details are available here :
> http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-mean
> s-for-qt-users-continued/
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
> .../qt4/files/blacklist-diginotar-certs.diff | 95
> ++++++++++++++++++++ meta/recipes-qt/qt4/qt-4.7.3.inc |
> 1 +
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4-native.inc | 2 +-
> meta/recipes-qt/qt4/qt4-native_4.7.3.bb | 2 +
> meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 2 +-
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 2 +
> meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
> 8 files changed, 104 insertions(+), 4 deletions(-)
> create mode 100644
> meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
>
> diff --git a/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
> b/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff new file mode
> 100644
> index 0000000..657a4c8
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
> @@ -0,0 +1,95 @@
> +http://labs.qt.nokia.com/2011/09/02/what-the-diginotar-security-breach-mea
> ns-for-qt-users/
> +http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-me
> ans-for-qt-users-continued/ +
> +Original Author:Nokia
> +Upstream-Status: Integrated in upcoming versions
> +
> +diff --git a/src/network/ssl/qsslcertificate.cpp
> b/src/network/ssl/qsslcertificate.cpp +index 328c5c2..1ae98f4 100644
> +--- a/src/network/ssl/qsslcertificate.cpp
> ++++ b/src/network/ssl/qsslcertificate.cpp
> +@@ -803,22 +803,47 @@ QList<QSslCertificate>
> QSslCertificatePrivate::certificatesFromDer(const QByteAr + // These
> certificates are known to be fraudulent and were created during the comodo
> + // compromise. See
> http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html + static const
> char *certificate_blacklist[] = {
> +- "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
> +- "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
> +- "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
> +- "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
> +- "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
> +- "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
> +- "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
> +- "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
> +- "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
> ++ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com",
> // Comodo ++ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
> "www.google.com", // Comodo ++
> "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", //
> Comodo ++ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
> "login.yahoo.com", // Comodo ++
> "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", //
> Comodo ++ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
> "login.skype.com", // Comodo ++
> "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org",
> // Comodo ++ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
> "login.live.com", // Comodo ++
> "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", //
> Comodo ++
> ++ "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", //
> leaf certificate issued by DigiNotar ++
> "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", //
> DigiNotar root ++ "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49",
> "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar
> Root ++ "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar
> Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root ++
> "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA
> G2", // other DigiNotar Root CA ++
> "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise
> Certificate Authority", // DigiNotar intermediate signed by "DigiNotar
> Root CA G2" ++ "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41",
> "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar
> Root ++
> ++ "1184640176", "DigiNotar
> Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust ++
> "120000525", "DigiNotar Cyber CA",
> // DigiNotar intermediate cross-signed by CyberTrust ++ "120000505",
> "DigiNotar Cyber CA", // DigiNotar
> intermediate cross-signed by CyberTrust ++ "120000515",
> "DigiNotar Cyber CA", // DigiNotar intermediate
> cross-signed by CyberTrust ++ "20015536",
> "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar
> intermediate cross-signed by the Dutch government ++ "20001983",
> "DigiNotar PKIoverheid CA Organisatie -
> G2", // DigiNotar intermediate cross-signed by the Dutch government ++
> "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended
> Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root ++
> "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA
> 2025", // DigiNotar intermediate ++// "(has not been seen in the wild
> so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate ++//
> "(has not been seen in the wild so far)", "Koninklijke Notariele
> Beroepsorganisatie CA", // compromised during DigiNotar breach ++//
> "(has not been seen in the wild so far)", "Stichting TTP Infos CA," //
> compromised during DigiNotar breach ++ "1184640175", "DigiNotar Root
> CA", // DigiNotar intermediate cross-signed by Entrust ++ "1184644297",
> "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust +
> 0
> + };
> +
> + bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate
> &certificate) + {
> + for (int a = 0; certificate_blacklist[a] != 0; a++) {
> +- if (certificate.serialNumber() == certificate_blacklist[a])
> ++ QString blacklistedCommonName =
> QString::fromUtf8(certificate_blacklist[(a+1)]); ++ if
> (certificate.serialNumber() == certificate_blacklist[a++] && ++
> (certificate.subjectInfo(QSslCertificate::CommonName) ==
> blacklistedCommonName || ++
> certificate.issuerInfo(QSslCertificate::CommonName) ==
> blacklistedCommonName)) + return true;
> + }
> + return false;
> +diff --git a/src/network/ssl/qsslsocket_openssl.cpp
> b/src/network/ssl/qsslsocket_openssl.cpp +index 141d80a..b8e6c4c 100644
> +--- a/src/network/ssl/qsslsocket_openssl.cpp
> ++++ b/src/network/ssl/qsslsocket_openssl.cpp
> +@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake()
> + X509 *x509 = q_SSL_get_peer_certificate(ssl);
> + configuration.peerCertificate =
> QSslCertificatePrivate::QSslCertificate_from_X509(x509); +
> q_X509_free(x509);
> +- if
> (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
> +- q->setErrorString(QSslSocket::tr("The peer certificate is
> blacklisted")); +-
> q->setSocketError(QAbstractSocket::SslHandshakeFailedError); +-
> emit q->error(QAbstractSocket::SslHandshakeFailedError); +-
> plainSocket->disconnectFromHost();
> +- return false;
> ++
> ++ // check the whole chain for blacklisting (including root, as we
> check for subjectInfo and issuer) ++ foreach (const QSslCertificate
> &cert, configuration.peerCertificateChain) { ++ if
> (QSslCertificatePrivate::isBlacklisted(cert)) {
> ++ q->setErrorString(QSslSocket::tr("The peer certificate is
> blacklisted")); ++
> q->setSocketError(QAbstractSocket::SslHandshakeFailedError); ++
> emit q->error(QAbstractSocket::SslHandshakeFailedError); ++
> plainSocket->disconnectFromHost();
> ++ return false;
> ++ }
> + }
> +
> + // Start translating errors.
> diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc
> b/meta/recipes-qt/qt4/qt-4.7.3.inc index c58679f..a5b8b05 100644
> --- a/meta/recipes-qt/qt4/qt-4.7.3.inc
> +++ b/meta/recipes-qt/qt4/qt-4.7.3.inc
> @@ -12,6 +12,7 @@ SRC_URI =
> "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
> file://0008-qt-lib-infix.patch \
> file://0009-support-2bpp.patch \
> file://0001-Added-Openembedded-crossarch-option.patch \
> + file://blacklist-diginotar-certs.diff \
> file://g++.conf \
> file://linux.conf \
> "
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc
> b/meta/recipes-qt/qt4/qt4-embedded.inc index d464a1d..9914c61 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded.inc
> +++ b/meta/recipes-qt/qt4/qt4-embedded.inc
> @@ -3,7 +3,7 @@ SECTION = "libs"
> LICENSE = "LGPLv2.1 | GPLv3"
> HOMEPAGE = "http://qt.nokia.com"
> DEPENDS += "directfb tslib"
> -INC_PR = "r29"
> +INC_PR = "r30"
>
> QT_BASE_NAME ?= "qt4-embedded"
> QT_BASE_LIB ?= "libqt-embedded"
> diff --git a/meta/recipes-qt/qt4/qt4-native.inc
> b/meta/recipes-qt/qt4/qt4-native.inc index 7ed6a63..59c0059 100644
> --- a/meta/recipes-qt/qt4/qt4-native.inc
> +++ b/meta/recipes-qt/qt4/qt4-native.inc
> @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
> "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
> file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
> file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
>
> -INC_PR = "r11"
> +INC_PR = "r12"
>
> inherit native
>
> diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb index 5c84d4d..e90a7ba 100644
> --- a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> +++ b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> @@ -2,6 +2,8 @@ require qt4-native.inc
>
> PR = "${INC_PR}.1"
>
> +SRC_URI += "file://blacklist-diginotar-certs.diff"
> +
> # Find the g++.conf/linux.conf in the right directory.
> FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
>
> diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
> b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index 0ae0af6..097fadc
> 100644
> --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
> +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
> @@ -4,7 +4,7 @@ SECTION = "libs"
> HOMEPAGE = "http://qt.nokia.com"
> LICENSE = "LGPLv2.1 | GPLv3"
>
> -INC_PR = "r5"
> +INC_PR = "r6"
>
> FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
>
> diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb index d61f312..e2a4539
> 100644
> --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
> +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
> @@ -2,5 +2,7 @@ require qt4-tools-nativesdk.inc
>
> PR = "${INC_PR}.0"
>
> +SRC_URI += "file://blacklist-diginotar-certs.diff"
> +
> SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> SRC_URI[sha256sum] =
> "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" diff
> --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
> b/meta/recipes-qt/qt4/qt4-x11-free.inc index 234cb89..0a714be 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
> SECTION = "x11/libs"
> DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext
> libxrender libxrandr libxcursor"
>
> -INC_PR = "r26"
> +INC_PR = "r27"
>
> QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl',
> '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl"
Thanks Eric, tested OK.
Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-11 17:33 ` [PATCH] " Eric Bénard
@ 2011-09-12 10:34 ` Paul Eggleton
2011-09-14 11:11 ` Koen Kooi
0 siblings, 1 reply; 38+ messages in thread
From: Paul Eggleton @ 2011-09-12 10:34 UTC (permalink / raw)
To: openembedded-core
On Sunday 11 September 2011 18:33:35 Eric Bénard wrote:
> - 4.7.4 was release on the 1st of september, the changelog is available
> here :
> http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/chang
> es-4.7.4 and mostly contains bug fix.
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
> .../conf/distro/include/distro_tracking_fields.inc | 32
> ++++++++++---------- meta/recipes-qt/qt4/{qt-4.7.3.inc => qt-4.7.4.inc} |
> 4 +-
> .../0001-Added-Openembedded-crossarch-option.patch | 0
> .../recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/g++.conf | 0
> .../hack-out-pg2-4.7.0.patch | 0
> .../qt4/{qt-4.7.3 => qt-4.7.4}/linux.conf | 0
> ...qt4-embedded_4.7.3.bb => qt4-embedded_4.7.4.bb} | 0
> .../{qt4-native_4.7.3.bb => qt4-native_4.7.4.bb} | 4 +-
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 8 -----
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 8 +++++
> ...qt4-x11-free_4.7.3.bb => qt4-x11-free_4.7.4.bb} | 0
> 11 files changed, 28 insertions(+), 28 deletions(-)
> rename meta/recipes-qt/qt4/{qt-4.7.3.inc => qt-4.7.4.inc} (93%)
> rename meta/recipes-qt/qt4/{qt-4.7.3 =>
> qt-4.7.4}/0001-Added-Openembedded-crossarch-option.patch (100%) rename
> meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/g++.conf (100%) rename
> meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/hack-out-pg2-4.7.0.patch (100%)
> rename meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/linux.conf (100%) rename
> meta/recipes-qt/qt4/{qt4-embedded_4.7.3.bb => qt4-embedded_4.7.4.bb}
> (100%) rename meta/recipes-qt/qt4/{qt4-native_4.7.3.bb =>
> qt4-native_4.7.4.bb} (67%) delete mode 100644
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb create mode 100644
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb rename
> meta/recipes-qt/qt4/{qt4-x11-free_4.7.3.bb => qt4-x11-free_4.7.4.bb}
> (100%)
>
> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc
> b/meta/conf/distro/include/distro_tracking_fields.inc index
> 6f1a462..599406b 100644
> --- a/meta/conf/distro/include/distro_tracking_fields.inc
> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> @@ -3406,32 +3406,32 @@ RECIPE_LAST_UPDATE_pn-imake = "Nov 21, 2010"
> RECIPE_MAINTAINER_pn-imake = "Yu Ke <ke.yu@intel.com>"
>
> RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
> -RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.3"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "2 months"
> -RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/05/04"
> -RECIPE_LAST_UPDATE_pn-qt4-tools-native = "May 12, 2011"
> +RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.4"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
> +RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/09/01"
> +RECIPE_LAST_UPDATE_pn-qt4-tools-native = "September 10, 2011"
> RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton
> <paul.eggleton@linux.intel.com>" DISTRO_PN_ALIAS_pn-qt4-tools-native =
> "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
>
> RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
> -RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.3"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
> -RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
> -RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
> +RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.4"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
> +RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/09/01"
> +RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "September 10, 2011"
> RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton
> <paul.eggleton@linux.intel.com>"
>
> RECIPE_STATUS_pn-qt4-embedded = "green"
> -RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
> -RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
> -RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
> +RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.4"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
> +RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/09/01"
> +RECIPE_LAST_UPDATE_pn-qt4-embedded = "September 10, 2011"
> RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton
> <paul.eggleton@linux.intel.com>"
>
> RECIPE_STATUS_pn-qt4-x11-free = "green"
> -RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "2 months"
> -RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/05/04"
> -RECIPE_LAST_UPDATE_pn-qt4-x11-free = "May 12, 2011"
> +RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.4"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
> +RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/09/01"
> +RECIPE_LAST_UPDATE_pn-qt4-x11-free = "September 10, 2011"
> RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton
> <paul.eggleton@linux.intel.com" DISTRO_PN_ALIAS_pn-qt4-x11-free =
> "Ubuntu=qt-x11-free Debian=qt-x11-free"
>
> diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc
> b/meta/recipes-qt/qt4/qt-4.7.4.inc similarity index 93%
> rename from meta/recipes-qt/qt4/qt-4.7.3.inc
> rename to meta/recipes-qt/qt4/qt-4.7.4.inc
> index a5b8b05..ac5da9f 100644
> --- a/meta/recipes-qt/qt4/qt-4.7.3.inc
> +++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
> @@ -17,8 +17,8 @@ SRC_URI =
> "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
> file://linux.conf \
> "
>
> -SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> -SRC_URI[sha256sum] =
> "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
> +SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
> +SRC_URI[sha256sum] =
> "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf"
>
> S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
>
> diff --git
> a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.pa
> tch
> b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.pa
> tch similarity index 100%
> rename from
> meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patc
> h rename to
> meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patc
> h diff --git a/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
> b/meta/recipes-qt/qt4/qt-4.7.4/g++.conf similarity index 100%
> rename from meta/recipes-qt/qt4/qt-4.7.3/g++.conf
> rename to meta/recipes-qt/qt4/qt-4.7.4/g++.conf
> diff --git a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
> b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch similarity index
> 100%
> rename from meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
> rename to meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
> diff --git a/meta/recipes-qt/qt4/qt-4.7.3/linux.conf
> b/meta/recipes-qt/qt4/qt-4.7.4/linux.conf similarity index 100%
> rename from meta/recipes-qt/qt4/qt-4.7.3/linux.conf
> rename to meta/recipes-qt/qt4/qt-4.7.4/linux.conf
> diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb similarity index 100%
> rename from meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
> rename to meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
> diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb similarity index 67%
> rename from meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> rename to meta/recipes-qt/qt4/qt4-native_4.7.4.bb
> index e90a7ba..ffa5f2a 100644
> --- a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> +++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
> @@ -11,5 +11,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
>
> TOBUILD := "src/tools/bootstrap ${TOBUILD}"
>
> -SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> -SRC_URI[sha256sum] =
> "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
> +SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
> +SRC_URI[sha256sum] =
> "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf" diff
> --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb deleted file mode
> 100644
> index e2a4539..0000000
> --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -require qt4-tools-nativesdk.inc
> -
> -PR = "${INC_PR}.0"
> -
> -SRC_URI += "file://blacklist-diginotar-certs.diff"
> -
> -SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> -SRC_URI[sha256sum] =
> "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" diff
> --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
> b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb new file mode 100644
> index 0000000..9d95eeb
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
> @@ -0,0 +1,8 @@
> +require qt4-tools-nativesdk.inc
> +
> +PR = "${INC_PR}.0"
> +
> +SRC_URI += "file://blacklist-diginotar-certs.diff"
> +
> +SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
> +SRC_URI[sha256sum] =
> "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf" diff
> --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb similarity index 100%
> rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
> rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
Thanks Eric, tested OK.
Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-12 10:34 ` Paul Eggleton
@ 2011-09-14 11:11 ` Koen Kooi
2011-09-14 13:09 ` Eric Bénard
2011-09-15 17:32 ` Saul Wold
0 siblings, 2 replies; 38+ messages in thread
From: Koen Kooi @ 2011-09-14 11:11 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 12 sep. 2011, om 12:34 heeft Paul Eggleton het volgende geschreven:
> On Sunday 11 September 2011 18:33:35 Eric Bénard wrote:
>> - 4.7.4 was release on the 1st of september, the changelog is available
>> here :
>> http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/chang
>> es-4.7.4 and mostly contains bug fix.
>>
>> Signed-off-by: Eric Bénard <eric@eukrea.com>
>> ---
>> .../conf/distro/include/distro_tracking_fields.inc | 32
>> ++++++++++---------- meta/recipes-qt/qt4/{qt-4.7.3.inc => qt-4.7.4.inc} |
>> 4 +-
>> .../0001-Added-Openembedded-crossarch-option.patch | 0
>>
[..]
>> rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
>
> Thanks Eric, tested OK.
>
> Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Saul, Richard,
Could you please give us an heads-up when this is going in, since it needs matching commits to meta-oe and meta-angstrom as well to keep the .bbappends working. If we don't succeed in merging the bbappend changes into oe-core we should consider breaking the 'git mv oldrecipe newrecipe' into an add and delete spaced a day apart.
regards,
Koen
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-14 11:11 ` Koen Kooi
@ 2011-09-14 13:09 ` Eric Bénard
2011-09-14 15:34 ` Otavio Salvador
2011-09-14 17:03 ` Koen Kooi
2011-09-15 17:32 ` Saul Wold
1 sibling, 2 replies; 38+ messages in thread
From: Eric Bénard @ 2011-09-14 13:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi,
Le 14/09/2011 13:11, Koen Kooi a écrit :
>
> Could you please give us an heads-up when this is going in, since it needs matching commits to meta-oe and meta-angstrom as well to keep the .bbappends working. If we don't succeed in merging the bbappend changes into oe-core we should consider breaking the 'git mv oldrecipe newrecipe' into an add and delete spaced a day apart.
>
I sent patches to update meta-oe, meta-angstrom & meta-intel : did you get them ?
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-14 13:09 ` Eric Bénard
@ 2011-09-14 15:34 ` Otavio Salvador
2011-09-15 7:57 ` Eric Bénard
2011-09-14 17:03 ` Koen Kooi
1 sibling, 1 reply; 38+ messages in thread
From: Otavio Salvador @ 2011-09-14 15:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, Sep 14, 2011 at 10:09, Eric Bénard <eric@eukrea.com> wrote:
> I sent patches to update meta-oe, meta-angstrom & meta-intel : did you get
> them ?
The md5sum of the tarball doesn't match. GNUtoo is aware of the issue.
Please hold the patch merging until a new patchset is send with the
fixes md5sum hashes.
Cheers,
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-14 13:09 ` Eric Bénard
2011-09-14 15:34 ` Otavio Salvador
@ 2011-09-14 17:03 ` Koen Kooi
1 sibling, 0 replies; 38+ messages in thread
From: Koen Kooi @ 2011-09-14 17:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 14 sep 2011, om 15:09 heeft Eric Bénard het volgende geschreven:
> Hi,
>
> Le 14/09/2011 13:11, Koen Kooi a écrit :
>>
>> Could you please give us an heads-up when this is going in, since
>> it needs matching commits to meta-oe and meta-angstrom as well to
>> keep the .bbappends working. If we don't succeed in merging the
>> bbappend changes into oe-core we should consider breaking the 'git
>> mv oldrecipe newrecipe' into an add and delete spaced a day apart.
>>
> I sent patches to update meta-oe, meta-angstrom & meta-intel : did
> you get them ?
I did, hence my request for a heads-up :)
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-14 15:34 ` Otavio Salvador
@ 2011-09-15 7:57 ` Eric Bénard
2011-09-15 15:07 ` Otavio Salvador
0 siblings, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-15 7:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Otavio,
Le 14/09/2011 17:34, Otavio Salvador a écrit :
> On Wed, Sep 14, 2011 at 10:09, Eric Bénard<eric@eukrea.com> wrote:
>> I sent patches to update meta-oe, meta-angstrom& meta-intel : did you
>> get them ?
>
> The md5sum of the tarball doesn't match. GNUtoo is aware of the issue.
>
> Please hold the patch merging until a new patchset is send with the fixes
> md5sum hashes.
>
OK we have checked that and it seems they updated the archive on the 12 of
september without any change in the changelog which explains the md5sum diff !
The diff between old and new qt 4.7.4 leads to a 154MB diff which seems to
concern the documentation and src/corelib/global/qglobal.h wich says :
-#define QT_PACKAGEDATE_STR "2011-08-23"
+#define QT_PACKAGEDATE_STR "2011-09-12"
Best regards,
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-15 7:57 ` Eric Bénard
@ 2011-09-15 15:07 ` Otavio Salvador
0 siblings, 0 replies; 38+ messages in thread
From: Otavio Salvador @ 2011-09-15 15:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Sep 15, 2011 at 04:57, Eric Bénard <eric@eukrea.com> wrote:
> OK we have checked that and it seems they updated the archive on the 12 of
> september without any change in the changelog which explains the md5sum diff
> !
>
> The diff between old and new qt 4.7.4 leads to a 154MB diff which seems to
> concern the documentation and src/corelib/global/qglobal.h wich says :
> -#define QT_PACKAGEDATE_STR "2011-08-23"
> +#define QT_PACKAGEDATE_STR "2011-09-12"
Awesome!
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-14 11:11 ` Koen Kooi
2011-09-14 13:09 ` Eric Bénard
@ 2011-09-15 17:32 ` Saul Wold
2011-09-15 18:41 ` Eric Bénard
1 sibling, 1 reply; 38+ messages in thread
From: Saul Wold @ 2011-09-15 17:32 UTC (permalink / raw)
To: Koen Kooi; +Cc: Patches and discussions about the oe-core layer
On Wed, 2011-09-14 at 13:11 +0200, Koen Kooi wrote:
> Op 12 sep. 2011, om 12:34 heeft Paul Eggleton het volgende geschreven:
>
> > On Sunday 11 September 2011 18:33:35 Eric Bénard wrote:
> >> - 4.7.4 was release on the 1st of september, the changelog is available
> >> here :
> >> http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/chang
> >> es-4.7.4 and mostly contains bug fix.
> >>
> >> Signed-off-by: Eric Bénard <eric@eukrea.com>
> >> ---
> >> .../conf/distro/include/distro_tracking_fields.inc | 32
> >> ++++++++++---------- meta/recipes-qt/qt4/{qt-4.7.3.inc => qt-4.7.4.inc} |
> >> 4 +-
> >> .../0001-Added-Openembedded-crossarch-option.patch | 0
> >>
>
> [..]
>
> >> rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
> >
> > Thanks Eric, tested OK.
> >
> > Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
>
> Saul, Richard,
>
> Could you please give us an heads-up when this is going in, since it needs matching commits to meta-oe and meta-angstrom as well to keep the .bbappends working. If we don't succeed in merging the bbappend changes into oe-core we should consider breaking the 'git mv oldrecipe newrecipe' into an add and delete spaced a day apart.
>
Koen,
We are going to hold off on this one until we complete the 1.1 RC
branching and open master up for development again.
Thanks
Sau!
> regards,
>
> Koen
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] qt4: add blacklist-diginotar-certs patch
2011-09-10 20:07 [PATCH 1/2] qt4: add blacklist-diginotar-certs patch Eric Bénard
2011-09-10 20:07 ` [PATCH 2/2] qt4: update to latest version 4.7.4 Eric Bénard
2011-09-12 10:34 ` [PATCH 1/2] qt4: add blacklist-diginotar-certs patch Paul Eggleton
@ 2011-09-15 17:34 ` Saul Wold
2 siblings, 0 replies; 38+ messages in thread
From: Saul Wold @ 2011-09-15 17:34 UTC (permalink / raw)
To: Eric Bénard; +Cc: openembedded-core
On Sat, 2011-09-10 at 22:07 +0200, Eric Bénard wrote:
> - this patch comes from Nokia and blacklist all DigiNotar intermediates
> and root certificates, more details are available here :
> http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
> .../qt4/files/blacklist-diginotar-certs.diff | 95 ++++++++++++++++++++
> meta/recipes-qt/qt4/qt-4.7.3.inc | 1 +
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4-native.inc | 2 +-
> meta/recipes-qt/qt4/qt4-native_4.7.3.bb | 2 +
> meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 2 +-
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 2 +
> meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
> 8 files changed, 104 insertions(+), 4 deletions(-)
> create mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
>
Merged this into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-15 17:32 ` Saul Wold
@ 2011-09-15 18:41 ` Eric Bénard
2011-09-15 20:06 ` Otavio Salvador
0 siblings, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-15 18:41 UTC (permalink / raw)
To: sgw, Patches and discussions about the oe-core layer; +Cc: Koen Kooi
Hi Saul,
Le 15/09/2011 19:32, Saul Wold a écrit :
>> Could you please give us an heads-up when this is going in, since it needs matching commits to meta-oe and meta-angstrom as well to keep the .bbappends working. If we don't succeed in merging the bbappend changes into oe-core we should consider breaking the 'git mv oldrecipe newrecipe' into an add and delete spaced a day apart.
>>
> Koen,
>
> We are going to hold off on this one until we complete the 1.1 RC
> branching and open master up for development again.
>
Does that mean we have to wait the 5th of october to get this merged in oe-core ?
In that case, maybe we could have a dev or testing branch in oe-core in order
to have a more reactive development than Yocto ?
Btw, this patch is only a minor update of qt so this would be interesting to
have it into the 1.1 release imho.
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-15 18:41 ` Eric Bénard
@ 2011-09-15 20:06 ` Otavio Salvador
2011-09-16 11:12 ` Paul Eggleton
0 siblings, 1 reply; 38+ messages in thread
From: Otavio Salvador @ 2011-09-15 20:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On Thu, Sep 15, 2011 at 15:41, Eric Bénard <eric@eukrea.com> wrote:
...
> Btw, this patch is only a minor update of qt so this would be interesting to
> have it into the 1.1 release imho.
I agree with Eric that this is important to have into the release; rc
is OK to skip it but for final seems good to have it in.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-15 20:06 ` Otavio Salvador
@ 2011-09-16 11:12 ` Paul Eggleton
2011-09-16 12:22 ` Eric Bénard
0 siblings, 1 reply; 38+ messages in thread
From: Paul Eggleton @ 2011-09-16 11:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi, Eric
On Thursday 15 September 2011 21:06:22 Otavio Salvador wrote:
> On Thu, Sep 15, 2011 at 15:41, Eric Bénard <eric@eukrea.com> wrote:
> ...
>
> > Btw, this patch is only a minor update of qt so this would be interesting
> > to have it into the 1.1 release imho.
>
> I agree with Eric that this is important to have into the release; rc
> is OK to skip it but for final seems good to have it in.
Considering there is at least one reported regression in 4.7.4, I'm not sure
it would be a good idea to rush into it right now:
https://bugreports.qt.nokia.com/browse/QTBUG-20925
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-16 11:12 ` Paul Eggleton
@ 2011-09-16 12:22 ` Eric Bénard
2011-09-16 12:54 ` Phil Blundell
2011-09-16 13:11 ` Otavio Salvador
0 siblings, 2 replies; 38+ messages in thread
From: Eric Bénard @ 2011-09-16 12:22 UTC (permalink / raw)
To: Paul Eggleton; +Cc: Koen Kooi, Patches and discussions about the oe-core layer
Hi,
Le 16/09/2011 13:12, Paul Eggleton a écrit :
> On Thursday 15 September 2011 21:06:22 Otavio Salvador wrote:
>> On Thu, Sep 15, 2011 at 15:41, Eric Bénard<eric@eukrea.com> wrote:
>> ...
>>
>>> Btw, this patch is only a minor update of qt so this would be interesting
>>> to have it into the 1.1 release imho.
>>
>> I agree with Eric that this is important to have into the release; rc
>> is OK to skip it but for final seems good to have it in.
>
> Considering there is at least one reported regression in 4.7.4, I'm not sure
> it would be a good idea to rush into it right now:
>
> https://bugreports.qt.nokia.com/browse/QTBUG-20925
>
We could also say that qt 4.7.4 fix many qt 4.7.3 bugs and integrate the patch
fixing this one and in the end get an improvement.
I don't understand why oe-core's development has to be stopped by yocto's
releases process but I may not have found the right page on the wiki
explaining all the details : may you please give me some links concerning this
policy ?
Maybe yocto could consider oe-core as an incubator instead of a follower else
I don't really see why we need to have the same project managed by the same
peoples with 2 different names.
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-16 12:22 ` Eric Bénard
@ 2011-09-16 12:54 ` Phil Blundell
2011-09-16 16:46 ` Richard Purdie
2011-09-16 13:11 ` Otavio Salvador
1 sibling, 1 reply; 38+ messages in thread
From: Phil Blundell @ 2011-09-16 12:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-09-16 at 14:22 +0200, Eric Bénard wrote:
> I don't understand why oe-core's development has to be stopped by yocto's
> releases process but I may not have found the right page on the wiki
> explaining all the details : may you please give me some links concerning this
> policy ?
It does seem a little bit strange, yes. If it's just a short period
then I don't think there should be any real problem with granting yocto
a short freeze in oe-core so that they can do their branching.
Of course, this isn't going to scale very well if every user of oe-core
starts asking for a development freeze so that they can cut their own
release branches, and it isn't totally obvious to me that yocto couldn't
just as easily have branched from some semi-arbitrary point and then
cherry-picked or reverted a few changes to get to where they wanted.
Possibly the intent is to make a standalone release of oe-core itself on
the back of whatever yocto ends up shipping, I dunno. That seems like
it might be a reasonable enough way to get a version of OE-core that
other people can build on without having to repeat all the QA and
release engineering work that yocto are presumably doing for themselves.
But at the end of the day, I guess, it's Richard's tree and he is
perfectly entitled to freeze it whenever he wishes. OE-core is still
quite a young project and it seems sensible enough to try different
things and see what works.
p.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-16 12:22 ` Eric Bénard
2011-09-16 12:54 ` Phil Blundell
@ 2011-09-16 13:11 ` Otavio Salvador
2011-09-19 9:45 ` Koen Kooi
1 sibling, 1 reply; 38+ messages in thread
From: Otavio Salvador @ 2011-09-16 13:11 UTC (permalink / raw)
To: Eric Bénard
Cc: Paul Eggleton, Koen Kooi,
Patches and discussions about the oe-core layer
On Fri, Sep 16, 2011 at 09:22, Eric Bénard <eric@eukrea.com> wrote:
> We could also say that qt 4.7.4 fix many qt 4.7.3 bugs and integrate the
> patch fixing this one and in the end get an improvement.
It has a patch available that fixes the issue, so seems fine for me to
merge it and put this patch too.
Personally I also agree that getting this into the release ought to be
better; specially since it has the fix available on the bug tracking
already.
> I don't understand why oe-core's development has to be stopped by yocto's
> releases process but I may not have found the right page on the wiki
> explaining all the details : may you please give me some links concerning
> this policy ?
>
> Maybe yocto could consider oe-core as an incubator instead of a follower
> else I don't really see why we need to have the same project managed by the
> same peoples with 2 different names.
Personally I don't see it as a problem at least for now. This won't
hurt to have a stabilization work being done from time to time. Maybe
we can even use this to make oe-core releases too and get it more
widely used.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-16 12:54 ` Phil Blundell
@ 2011-09-16 16:46 ` Richard Purdie
0 siblings, 0 replies; 38+ messages in thread
From: Richard Purdie @ 2011-09-16 16:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-09-16 at 13:54 +0100, Phil Blundell wrote:
> On Fri, 2011-09-16 at 14:22 +0200, Eric Bénard wrote:
> > I don't understand why oe-core's development has to be stopped by yocto's
> > releases process but I may not have found the right page on the wiki
> > explaining all the details : may you please give me some links concerning this
> > policy ?
>
> It does seem a little bit strange, yes. If it's just a short period
> then I don't think there should be any real problem with granting yocto
> a short freeze in oe-core so that they can do their branching.
>
> Of course, this isn't going to scale very well if every user of oe-core
> starts asking for a development freeze so that they can cut their own
> release branches, and it isn't totally obvious to me that yocto couldn't
> just as easily have branched from some semi-arbitrary point and then
> cherry-picked or reverted a few changes to get to where they wanted.
>
> Possibly the intent is to make a standalone release of oe-core itself on
> the back of whatever yocto ends up shipping, I dunno. That seems like
> it might be a reasonable enough way to get a version of OE-core that
> other people can build on without having to repeat all the QA and
> release engineering work that yocto are presumably doing for themselves.
That is exactly what the thought is and its hoped that it will benefit
users. Having some changes of pace and focus (bugfix vs features) to the
development cycle will hopefully be a significant benefit although I
appreciate it will take some getting used to since we've never done it
before. Its only once every six months and only for a few weeks so I
don't think it should be too disruptive...
Cheers,
Richard
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-16 13:11 ` Otavio Salvador
@ 2011-09-19 9:45 ` Koen Kooi
2011-09-19 11:48 ` Otavio Salvador
0 siblings, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2011-09-19 9:45 UTC (permalink / raw)
To: Otavio Salvador
Cc: Paul Eggleton, Patches and discussions about the oe-core layer
Op 16 sep. 2011, om 15:11 heeft Otavio Salvador het volgende geschreven:
> On Fri, Sep 16, 2011 at 09:22, Eric Bénard <eric@eukrea.com> wrote:
>> We could also say that qt 4.7.4 fix many qt 4.7.3 bugs and integrate the
>> patch fixing this one and in the end get an improvement.
>
> It has a patch available that fixes the issue, so seems fine for me to
> merge it and put this patch too.
>
> Personally I also agree that getting this into the release ought to be
> better; specially since it has the fix available on the bug tracking
> already.
So what about this:
Send a patch that adds 4.7.4 with DEFAULT_PREFERENCE = -1, but leaves 4.7.3 intact.
That way people can migrate their bbappends without needing a flag day and it also allows people to test 4.7.4 more easily before it gets made the default.
As you might have noticed I have serious misgivings about using 'git mv' to manage qt updates.
regards,
Koen
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-19 9:45 ` Koen Kooi
@ 2011-09-19 11:48 ` Otavio Salvador
2011-09-19 12:09 ` Koen Kooi
0 siblings, 1 reply; 38+ messages in thread
From: Otavio Salvador @ 2011-09-19 11:48 UTC (permalink / raw)
To: Koen Kooi; +Cc: Paul Eggleton, Patches and discussions about the oe-core layer
On Mon, Sep 19, 2011 at 06:45, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Send a patch that adds 4.7.4 with DEFAULT_PREFERENCE = -1, but leaves 4.7.3 intact.
>
> That way people can migrate their bbappends without needing a flag day and it also allows people to test 4.7.4 more easily before it gets made the default.
I prefer to have 4.7.4 in as it ... it has been in test here, on Eric
and maybe others with no know issues so I'd prefer to have it into the
release and get done with it. 4.7.4 is the current stable release, the
only know regression has a fix available and people have been using it
locally so no reason to leave it behind.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-19 11:48 ` Otavio Salvador
@ 2011-09-19 12:09 ` Koen Kooi
2011-09-19 12:25 ` Otavio Salvador
0 siblings, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2011-09-19 12:09 UTC (permalink / raw)
To: Otavio Salvador
Cc: Paul Eggleton, Patches and discussions about the oe-core layer
Op 19 sep. 2011, om 13:48 heeft Otavio Salvador het volgende geschreven:
> On Mon, Sep 19, 2011 at 06:45, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> Send a patch that adds 4.7.4 with DEFAULT_PREFERENCE = -1, but leaves 4.7.3 intact.
>>
>> That way people can migrate their bbappends without needing a flag day and it also allows people to test 4.7.4 more easily before it gets made the default.
>
> I prefer to have 4.7.4 in as it ... it has been in test here, on Eric
> and maybe others with no know issues so I'd prefer to have it into the
> release and get done with it. 4.7.4 is the current stable release, the
> only know regression has a fix available and people have been using it
> locally so no reason to leave it behind.
I'd like to see 4.7.4 go in. Richard and Saul have made it clear that removing 4.7.3 isn't going to happen before the release, so I'm trying make a compromise here. Are you saying you would find it unacceptable for both 4.7.3 and 4.7.4 to be in OE-core for a short while?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-19 12:09 ` Koen Kooi
@ 2011-09-19 12:25 ` Otavio Salvador
2011-09-19 13:03 ` Richard Purdie
0 siblings, 1 reply; 38+ messages in thread
From: Otavio Salvador @ 2011-09-19 12:25 UTC (permalink / raw)
To: Koen Kooi; +Cc: Paul Eggleton, Patches and discussions about the oe-core layer
On Mon, Sep 19, 2011 at 09:09, Koen Kooi <koen@dominion.thruhere.net> wrote:
...
> I'd like to see 4.7.4 go in. Richard and Saul have made it clear that removing 4.7.3 isn't going to happen before the release, so I'm trying make a compromise here. Are you saying you would find it unacceptable for both 4.7.3 and 4.7.4 to be in OE-core for a short while?
Sure not. I can live with that and this is better then nothing but I
think Richard and Saul might rethink this assortment as 4.7.4 is in
use by us and proved stable too.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-19 12:25 ` Otavio Salvador
@ 2011-09-19 13:03 ` Richard Purdie
2011-09-19 19:33 ` Eric Bénard
0 siblings, 1 reply; 38+ messages in thread
From: Richard Purdie @ 2011-09-19 13:03 UTC (permalink / raw)
To: Otavio Salvador
Cc: Patches, Paul Eggleton, Koen Kooi,
and discussions about the oe-core layer
On Mon, 2011-09-19 at 09:25 -0300, Otavio Salvador wrote:
> On Mon, Sep 19, 2011 at 09:09, Koen Kooi <koen@dominion.thruhere.net> wrote:
> ...
> > I'd like to see 4.7.4 go in. Richard and Saul have made it clear that removing 4.7.3 isn't going to happen before the release, so I'm trying make a compromise here. Are you saying you would find it unacceptable for both 4.7.3 and 4.7.4 to be in OE-core for a short while?
>
> Sure not. I can live with that and this is better then nothing but I
> think Richard and Saul might rethink this assortment as 4.7.4 is in
> use by us and proved stable too.
The fact remains nobody has collected up the patches and presented
Saul/I with a pull request collecting up these pieces. I've not even
seen the patch addressing the regression posted, people just seem to
agree one exists.
So various people has tested varying combinations of patches with
varying success. This isn't the kind of patchset I like to take at -rc3
time. If it breaks the build in any way on any of the four architectures
the release gets delayed by at least a couple of weeks. I don't think
people realise how long proper QA cycles take :( I really do want to
take it but people aren't helping make this easy for me and it does
carry significant risk which I don't think people realise.
Cheers,
Richard (@Shanghai)
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-19 13:03 ` Richard Purdie
@ 2011-09-19 19:33 ` Eric Bénard
2011-09-20 21:18 ` Eric Bénard
0 siblings, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-19 19:33 UTC (permalink / raw)
To: Richard Purdie
Cc: Paul Eggleton, Koen Kooi,
Patches and discussions about the oe-core layer
Hi,
Le 19/09/2011 15:03, Richard Purdie a écrit :
> On Mon, 2011-09-19 at 09:25 -0300, Otavio Salvador wrote:
>> On Mon, Sep 19, 2011 at 09:09, Koen Kooi<koen@dominion.thruhere.net>
>> wrote: ...
>>> I'd like to see 4.7.4 go in. Richard and Saul have made it clear that
>>> removing 4.7.3 isn't going to happen before the release, so I'm trying
>>> make a compromise here. Are you saying you would find it unacceptable
>>> for both 4.7.3 and 4.7.4 to be in OE-core for a short while?
>>
>> Sure not. I can live with that and this is better then nothing but I
>> think Richard and Saul might rethink this assortment as 4.7.4 is in use
>> by us and proved stable too.
>
> The fact remains nobody has collected up the patches and presented Saul/I
> with a pull request collecting up these pieces. I've not even seen the
> patch addressing the regression posted, people just seem to agree one
> exists.
>
as said last weekend I'm working on such a patch collection (including the fix
for the regression).
I hope that to be ready tomorrow (tuesday 20) as I was afk since saturday.
Thanks,
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-19 19:33 ` Eric Bénard
@ 2011-09-20 21:18 ` Eric Bénard
2011-09-21 10:44 ` Koen Kooi
0 siblings, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-20 21:18 UTC (permalink / raw)
To: openembedded-core
Hi,
ok 2 branches are available here : git://github.com/eukrea/oe-core.git
- qt4_improve for improvement to existing qt 4.7.3,
- qt4_upgrade for adding qt 4.7.4 (with DEFAULT_PREFERENCE=-1 as suggested by
Koen.
Please test them so that we can fix potential failures and send the pull
request (I have compile test actually running with the latest changes in
qt4_upgrade branch so this one is not yet fully tested).
For more details :
** branch qt4_improve
The following changes since commit 81274f4488fbc4d68d150870735ec0181b60b451:
freetype: disable bzip2 compressed font support (2011-09-19 13:14:03 +0100)
are available in the git repository at:
git://github.com/eukrea/oe-core.git qt4_improve
Denis Carikli (3):
qt4.inc: remove the optional documentation package from the demo's
RRECOMMENDS
qt4(embedded and x11): disable neon for armv6-vfp
qt4.inc: package qtdemo's docs in a separate package
Eric Bénard (2):
qt4e-demo-image: improve image
qt4: fix generated sdk
meta/recipes-qt/images/qt4e-demo-image.bb | 2 +-
meta/recipes-qt/meta/meta-toolchain-qte.bb | 7 +++++++
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb | 4 ++--
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 22 +++++++++++-----------
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb | 4 ++--
meta/recipes-qt/qt4/qt4.inc | 7 ++++++-
8 files changed, 31 insertions(+), 19 deletions(-)
** branch qt4_upgrade :
The following changes since commit 69482033e9b5841c2bd46c86679383a52bc4abea:
qt4.inc: package qtdemo's docs in a separate package (2011-09-20 21:42:36
+0200)
are available in the git repository at:
git://github.com/eukrea/oe-core.git qt4_upgrade
Eric Bénard (1):
qt4: update to latest version 4.7.4
meta/recipes-qt/qt4/qt-4.7.4.inc | 62 ++++++++++++++++++
.../0001-Added-Openembedded-crossarch-option.patch | 47 ++++++++++++++
meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch | 56 +++++++++++++++++
meta/recipes-qt/qt4/qt-4.7.4/g++.conf | 60 ++++++++++++++++++
.../qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch | 31 +++++++++
meta/recipes-qt/qt4/qt-4.7.4/linux.conf | 66 ++++++++++++++++++++
meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 12 ++++
meta/recipes-qt/qt4/qt4-native_4.7.4.bb | 18 +++++
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 11 +++
meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 13 ++++
10 files changed, 376 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4.inc
create mode 100644
meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/g++.conf
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/linux.conf
create mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
create mode 100644 meta/recipes-qt/qt4/qt4-native_4.7.4.bb
create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
create mode 100644 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
Thanks
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-20 21:18 ` Eric Bénard
@ 2011-09-21 10:44 ` Koen Kooi
2011-09-21 12:52 ` Eric Bénard
0 siblings, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2011-09-21 10:44 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 20 sep. 2011, om 23:18 heeft Eric Bénard het volgende geschreven:
> Hi,
>
> ok 2 branches are available here : git://github.com/eukrea/oe-core.git
> - qt4_improve for improvement to existing qt 4.7.3,
> - qt4_upgrade for adding qt 4.7.4 (with DEFAULT_PREFERENCE=-1 as suggested by Koen.
>
> Please test them so that we can fix potential failures and send the pull request (I have compile test actually running with the latest changes in qt4_upgrade branch so this one is not yet fully tested).
I'm building the qt4_upgrade branch + http://patches.openembedded.org/patch/11289/ + PREFERRED_VERSION change in angstrom. If you don't hear anything the test went OK :)
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-21 10:44 ` Koen Kooi
@ 2011-09-21 12:52 ` Eric Bénard
2011-09-21 13:05 ` Koen Kooi
0 siblings, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-21 12:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Koen,
Le 21/09/2011 12:44, Koen Kooi a écrit :
> Op 20 sep. 2011, om 23:18 heeft Eric Bénard het volgende geschreven:
>> ok 2 branches are available here : git://github.com/eukrea/oe-core.git
>> - qt4_improve for improvement to existing qt 4.7.3,
>> - qt4_upgrade for adding qt 4.7.4 (with DEFAULT_PREFERENCE=-1 as suggested by Koen.
>>
>> Please test them so that we can fix potential failures and send the pull request (I have compile test actually running with the latest changes in qt4_upgrade branch so this one is not yet fully tested).
>
> I'm building the qt4_upgrade branch + http://patches.openembedded.org/patch/11289/ + PREFERRED_VERSION change in angstrom. If you don't hear anything the test went OK :)
in angstrom you also need to add :
+PREFERRED_VERSION_qt4-native = "${ANGSTROM_QT_VERSION}"
else qt4-native 4.7.3 will be used.
Eric
diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/dis
index 2fee7f1..8bbdb4d 100644
--- a/conf/distro/include/angstrom-2010-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -1,5 +1,5 @@
ANGSTROM_MESA_VERSION = "7.10.2"
-ANGSTROM_QT_VERSION ?= "4.7.3"
+ANGSTROM_QT_VERSION ?= "4.7.4"
ANGSTROM_LIBTOOL_VERSION = "2.4"
# Use new sysroot feature
LIBTOOL_HAS_SYSROOT = "yes"
@@ -49,6 +49,7 @@ PREFERRED_VERSION_pkgconfig = "0.25"
PREFERRED_VERSION_pkgconfig-native = "0.25"
PREFERRED_VERSION_pulseaudio = "0.9.23"
PREFERRED_VERSION_python-pycairo = "1.8.0"
+PREFERRED_VERSION_qt4-native = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-21 12:52 ` Eric Bénard
@ 2011-09-21 13:05 ` Koen Kooi
2011-09-21 13:16 ` Eric Bénard
0 siblings, 1 reply; 38+ messages in thread
From: Koen Kooi @ 2011-09-21 13:05 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 21 sep. 2011, om 14:52 heeft Eric Bénard het volgende geschreven:
> Hi Koen,
>
> Le 21/09/2011 12:44, Koen Kooi a écrit :
>> Op 20 sep. 2011, om 23:18 heeft Eric Bénard het volgende geschreven:
>>> ok 2 branches are available here : git://github.com/eukrea/oe-core.git
>>> - qt4_improve for improvement to existing qt 4.7.3,
>>> - qt4_upgrade for adding qt 4.7.4 (with DEFAULT_PREFERENCE=-1 as suggested by Koen.
>>>
>>> Please test them so that we can fix potential failures and send the pull request (I have compile test actually running with the latest changes in qt4_upgrade branch so this one is not yet fully tested).
>>
>> I'm building the qt4_upgrade branch + http://patches.openembedded.org/patch/11289/ + PREFERRED_VERSION change in angstrom. If you don't hear anything the test went OK :)
>
> in angstrom you also need to add :
> +PREFERRED_VERSION_qt4-native = "${ANGSTROM_QT_VERSION}"
> else qt4-native 4.7.3 will be used.
I already have that :)
So far the only bug with 4.7.4 is this:
WARNING: For recipe qt4-x11-free, the following files were installed but not shipped in any package:
WARNING: /usr/share/qt4/phrasebooks/swedish.qph
WARNING: /usr/share/qt4/phrasebooks/dutch.qph
WARNING: /usr/share/qt4/phrasebooks/german.qph
WARNING: /usr/share/qt4/phrasebooks/polish.qph
WARNING: /usr/share/qt4/phrasebooks/danish.qph
WARNING: /usr/share/qt4/phrasebooks/japanese.qph
WARNING: /usr/share/qt4/phrasebooks/finnish.qph
WARNING: /usr/share/qt4/phrasebooks/norwegian.qph
WARNING: /usr/share/qt4/phrasebooks/french.qph
WARNING: /usr/share/qt4/phrasebooks/russian.qph
WARNING: /usr/share/qt4/phrasebooks/spanish.qph
WARNING: /usr/share/qt4/phrasebooks/hungarian.qph
WARNING: /usr/share/qt4/phrasebooks/italian.qph
WARNING: /usr/lib/.debug/libQtSql.so
WARNING: /usr/lib/.debug/libQtNetwork.so
WARNING: /usr/lib/.debug/libQtTest.so
WARNING: /usr/lib/.debug/libQtXml.so
WARNING: /usr/lib/.debug/libQtDesignerComponents.so
WARNING: /usr/lib/.debug/libQtXmlPatterns.so
WARNING: /usr/lib/.debug/libQtCLucene.so
WARNING: /usr/lib/.debug/libphonon.so
WARNING: /usr/lib/.debug/libQtSvg.so
WARNING: /usr/lib/.debug/libQtMultimedia.so
WARNING: /usr/lib/.debug/libQtDBus.so
WARNING: /usr/lib/.debug/libQtScriptTools.so
WARNING: /usr/lib/.debug/libQtDeclarative.so
WARNING: /usr/lib/.debug/libQtCore.so
WARNING: /usr/lib/.debug/libQtWebKit.so
WARNING: /usr/lib/.debug/libQtDesigner.so
WARNING: /usr/lib/.debug/libQtGui.so
WARNING: /usr/lib/.debug/libQt3Support.so
WARNING: /usr/lib/.debug/libQtHelp.so
WARNING: /usr/lib/.debug/libQtScript.so
WARNING: /usr/lib/fonts/fontdir
WARNING: /usr/lib/qt4/plugins/qmltooling/.debug/libqmldbg_tcp.so
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-21 13:05 ` Koen Kooi
@ 2011-09-21 13:16 ` Eric Bénard
2011-09-28 10:11 ` Paul Eggleton
0 siblings, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-21 13:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Le 21/09/2011 15:05, Koen Kooi a écrit :
> WARNING: For recipe qt4-x11-free, the following files were installed but not shipped in any package:
> WARNING: /usr/share/qt4/phrasebooks/swedish.qph
> WARNING: /usr/share/qt4/phrasebooks/dutch.qph
> WARNING: /usr/share/qt4/phrasebooks/german.qph
> WARNING: /usr/share/qt4/phrasebooks/polish.qph
> WARNING: /usr/share/qt4/phrasebooks/danish.qph
> WARNING: /usr/share/qt4/phrasebooks/japanese.qph
> WARNING: /usr/share/qt4/phrasebooks/finnish.qph
> WARNING: /usr/share/qt4/phrasebooks/norwegian.qph
> WARNING: /usr/share/qt4/phrasebooks/french.qph
> WARNING: /usr/share/qt4/phrasebooks/russian.qph
> WARNING: /usr/share/qt4/phrasebooks/spanish.qph
> WARNING: /usr/share/qt4/phrasebooks/hungarian.qph
> WARNING: /usr/share/qt4/phrasebooks/italian.qph
OK I forget to integrate Otavio's patch which fix the translations. I'll
update tonight.
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-21 13:16 ` Eric Bénard
@ 2011-09-28 10:11 ` Paul Eggleton
2011-09-28 10:23 ` Eric Bénard
0 siblings, 1 reply; 38+ messages in thread
From: Paul Eggleton @ 2011-09-28 10:11 UTC (permalink / raw)
To: Eric Bénard; +Cc: openembedded-core
Hi Eric,
On Wednesday 21 September 2011 14:16:25 Eric Bénard wrote:
> Le 21/09/2011 15:05, Koen Kooi a écrit :
> > WARNING: For recipe qt4-x11-free, the following files were installed but
> > not shipped in any package:
> > WARNING: /usr/share/qt4/phrasebooks/swedish.qph
> > WARNING: /usr/share/qt4/phrasebooks/dutch.qph
> > WARNING: /usr/share/qt4/phrasebooks/german.qph
> > WARNING: /usr/share/qt4/phrasebooks/polish.qph
> > WARNING: /usr/share/qt4/phrasebooks/danish.qph
> > WARNING: /usr/share/qt4/phrasebooks/japanese.qph
> > WARNING: /usr/share/qt4/phrasebooks/finnish.qph
> > WARNING: /usr/share/qt4/phrasebooks/norwegian.qph
> > WARNING: /usr/share/qt4/phrasebooks/french.qph
> > WARNING: /usr/share/qt4/phrasebooks/russian.qph
> > WARNING: /usr/share/qt4/phrasebooks/spanish.qph
> > WARNING: /usr/share/qt4/phrasebooks/hungarian.qph
> > WARNING: /usr/share/qt4/phrasebooks/italian.qph
>
> OK I forget to integrate Otavio's patch which fix the translations. I'll
> update tonight.
Did you have a chance to do this? I don't see an additional commit in the
qt4_upgrade branch in your repo.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-28 10:11 ` Paul Eggleton
@ 2011-09-28 10:23 ` Eric Bénard
2011-09-28 13:11 ` Otavio Salvador
2011-09-30 11:47 ` Eric Bénard
0 siblings, 2 replies; 38+ messages in thread
From: Eric Bénard @ 2011-09-28 10:23 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
Hi Paul,
Le 28/09/2011 12:11, Paul Eggleton a écrit :
> On Wednesday 21 September 2011 14:16:25 Eric Bénard wrote:
>> Le 21/09/2011 15:05, Koen Kooi a écrit :
>>> WARNING: For recipe qt4-x11-free, the following files were installed but
>>> not shipped in any package:
>>> WARNING: /usr/share/qt4/phrasebooks/swedish.qph
>>> WARNING: /usr/share/qt4/phrasebooks/dutch.qph
>>> WARNING: /usr/share/qt4/phrasebooks/german.qph
>>> WARNING: /usr/share/qt4/phrasebooks/polish.qph
>>> WARNING: /usr/share/qt4/phrasebooks/danish.qph
>>> WARNING: /usr/share/qt4/phrasebooks/japanese.qph
>>> WARNING: /usr/share/qt4/phrasebooks/finnish.qph
>>> WARNING: /usr/share/qt4/phrasebooks/norwegian.qph
>>> WARNING: /usr/share/qt4/phrasebooks/french.qph
>>> WARNING: /usr/share/qt4/phrasebooks/russian.qph
>>> WARNING: /usr/share/qt4/phrasebooks/spanish.qph
>>> WARNING: /usr/share/qt4/phrasebooks/hungarian.qph
>>> WARNING: /usr/share/qt4/phrasebooks/italian.qph
>>
>> OK I forget to integrate Otavio's patch which fix the translations. I'll
>> update tonight.
>
> Did you have a chance to do this? I don't see an additional commit in the
> qt4_upgrade branch in your repo.
>
I have the patch locally and I will (really) work on this tonight.
Sorry for the delay I've been overbusy since last wednesday.
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-28 10:23 ` Eric Bénard
@ 2011-09-28 13:11 ` Otavio Salvador
2011-09-28 13:33 ` Richard Purdie
2011-09-30 11:47 ` Eric Bénard
1 sibling, 1 reply; 38+ messages in thread
From: Otavio Salvador @ 2011-09-28 13:11 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton
On Wed, Sep 28, 2011 at 07:23, Eric Bénard <eric@eukrea.com> wrote:
> I have the patch locally and I will (really) work on this tonight.
> Sorry for the delay I've been overbusy since last wednesday.
Now that this is going into master, I think we ought to update it
directly instead of adding the newer version.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-28 13:11 ` Otavio Salvador
@ 2011-09-28 13:33 ` Richard Purdie
0 siblings, 0 replies; 38+ messages in thread
From: Richard Purdie @ 2011-09-28 13:33 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton, Koen Kooi
On Wed, 2011-09-28 at 10:11 -0300, Otavio Salvador wrote:
> On Wed, Sep 28, 2011 at 07:23, Eric Bénard <eric@eukrea.com> wrote:
> > I have the patch locally and I will (really) work on this tonight.
> > Sorry for the delay I've been overbusy since last wednesday.
>
> Now that this is going into master, I think we ought to update it
> directly instead of adding the newer version.
What we'll do is add the new version, someone will tell me when meta-oe
is updated and then we'll remove the old one.
There are a few other pieces I think need to transition out of OE-Core
at this point:
eglibc 2.12
gcc 4.5
gnome-vfs
so if we could move them over to meta-oe at the same time I think that
would be good. If the gcc 4.5 over there already is fine, we can just
remove the OE-Core version.
Any help in sorting this out would be appreciated as the patch backlog
and release are taking up a lot of my time atm.
Cheers,
Richard
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-28 10:23 ` Eric Bénard
2011-09-28 13:11 ` Otavio Salvador
@ 2011-09-30 11:47 ` Eric Bénard
2011-09-30 16:23 ` Paul Eggleton
1 sibling, 1 reply; 38+ messages in thread
From: Eric Bénard @ 2011-09-30 11:47 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton
Hi Paul,
I've updated and tested the branches by rebasing on current oe-core and
integrating Otavio's patch concerning the translations :
https://github.com/eukrea/oe-core/tree/qt4_improve
https://github.com/eukrea/oe-core/tree/qt4_upgrade
Is that OK for you or should I rework something ?
Eric
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH] qt4: update to latest version 4.7.4
2011-09-30 11:47 ` Eric Bénard
@ 2011-09-30 16:23 ` Paul Eggleton
0 siblings, 0 replies; 38+ messages in thread
From: Paul Eggleton @ 2011-09-30 16:23 UTC (permalink / raw)
To: Eric Bénard; +Cc: openembedded-core
On Friday 30 September 2011 12:47:05 you wrote:
> I've updated and tested the branches by rebasing on current oe-core and
> integrating Otavio's patch concerning the translations :
> https://github.com/eukrea/oe-core/tree/qt4_improve
> https://github.com/eukrea/oe-core/tree/qt4_upgrade
>
> Is that OK for you or should I rework something ?
Looks pretty good. Richard has asked me to send a pull request for these with
any comments attached so I'm about to do that now.
BTW thanks for bringing these together and especially for the SDK fix in
particular, very keen to see that merged.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2011-09-30 16:28 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-10 20:07 [PATCH 1/2] qt4: add blacklist-diginotar-certs patch Eric Bénard
2011-09-10 20:07 ` [PATCH 2/2] qt4: update to latest version 4.7.4 Eric Bénard
2011-09-11 17:22 ` Anders Darander
2011-09-11 17:33 ` [PATCH] " Eric Bénard
2011-09-12 10:34 ` Paul Eggleton
2011-09-14 11:11 ` Koen Kooi
2011-09-14 13:09 ` Eric Bénard
2011-09-14 15:34 ` Otavio Salvador
2011-09-15 7:57 ` Eric Bénard
2011-09-15 15:07 ` Otavio Salvador
2011-09-14 17:03 ` Koen Kooi
2011-09-15 17:32 ` Saul Wold
2011-09-15 18:41 ` Eric Bénard
2011-09-15 20:06 ` Otavio Salvador
2011-09-16 11:12 ` Paul Eggleton
2011-09-16 12:22 ` Eric Bénard
2011-09-16 12:54 ` Phil Blundell
2011-09-16 16:46 ` Richard Purdie
2011-09-16 13:11 ` Otavio Salvador
2011-09-19 9:45 ` Koen Kooi
2011-09-19 11:48 ` Otavio Salvador
2011-09-19 12:09 ` Koen Kooi
2011-09-19 12:25 ` Otavio Salvador
2011-09-19 13:03 ` Richard Purdie
2011-09-19 19:33 ` Eric Bénard
2011-09-20 21:18 ` Eric Bénard
2011-09-21 10:44 ` Koen Kooi
2011-09-21 12:52 ` Eric Bénard
2011-09-21 13:05 ` Koen Kooi
2011-09-21 13:16 ` Eric Bénard
2011-09-28 10:11 ` Paul Eggleton
2011-09-28 10:23 ` Eric Bénard
2011-09-28 13:11 ` Otavio Salvador
2011-09-28 13:33 ` Richard Purdie
2011-09-30 11:47 ` Eric Bénard
2011-09-30 16:23 ` Paul Eggleton
2011-09-12 10:34 ` [PATCH 1/2] qt4: add blacklist-diginotar-certs patch Paul Eggleton
2011-09-15 17:34 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.