From c460ac223b342b1e90f99e1237ffcef5f2e78474 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Dec 2012 01:29:51 +0100 Subject: [PATCH 01/11] qt5-native-4.999+git: bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native_4.999+git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb index ae6df1c..9fbff86 100644 --- a/recipes-qt/qt5/qt5-native_4.999+git.bb +++ b/recipes-qt/qt5/qt5-native_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804" +SRCREV = "b1a5a38f708c2882919583b27d74bf6c824f0bab" From 436fab1083651affc93c5455c4d60869ad0e8621 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Dec 2012 02:25:40 +0100 Subject: [PATCH 02/11] qtbase-4.999+git: bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_4.999+git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb index 0477df2..b7bacbd 100644 --- a/recipes-qt/qt5/qtbase_4.999+git.bb +++ b/recipes-qt/qt5/qtbase_4.999+git.bb @@ -3,4 +3,4 @@ require qt5-4.999+git.inc PR = "${INC_PR}.0" -SRCREV = "b9321a1a5f1b255e5e5860edb42c63a4e4da6804" \ No newline at end of file +SRCREV = "b1a5a38f708c2882919583b27d74bf6c824f0bab" From d6c825767cff12f810324b6b520d45da58b81e4f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:20:18 +0100 Subject: [PATCH 03/11] qt5-4.999+git.inc: fix PV format Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-4.999+git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index 4804789..6d70350 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -9,7 +9,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "4.999+5.0.0-beta2+git-r${SRCPV}" +PV = "4.999+5.0.0-beta2+git${SRCPV}" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ From 0879ad08aa48d384576ef5a7b98b3a0dadae19dc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:23:19 +0100 Subject: [PATCH 04/11] qtbase, qt5-native: upgrade to 5.0.0-rc1 Signed-off-by: Martin Jansa --- ...qt5-4.999+5.0.0-beta2.inc => qt5-4.999+5.0.0-rc1.inc} | 4 ++-- recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb | 9 --------- recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb | 9 +++++++++ recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb | 7 ------- recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb | 7 +++++++ 5 files changed, 18 insertions(+), 18 deletions(-) rename recipes-qt/qt5/{qt5-4.999+5.0.0-beta2.inc => qt5-4.999+5.0.0-rc1.inc} (80%) delete mode 100644 recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb create mode 100644 recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb delete mode 100644 recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb create mode 100644 recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc similarity index 80% rename from recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc rename to recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc index 4031844..5815fd2 100644 --- a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc +++ b/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc @@ -1,9 +1,9 @@ # Copyright (C) 2012 O.S. Systems Software LTDA. -QT_VERSION ?= "5.0.0-beta2" +QT_VERSION ?= "5.0.0-rc1" SRC_URI += " \ - http://releases.qt-project.org/qt5.0/beta2/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ + http://releases.qt-project.org/qt5.0/rc1/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ file://linux.conf \ file://g++.conf \ " diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb deleted file mode 100644 index 21e51e5..0000000 --- a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require qt5-native.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2" -SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f" diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb new file mode 100644 index 0000000..e08e48b --- /dev/null +++ b/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb @@ -0,0 +1,9 @@ +require qt5-native.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" +SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" diff --git a/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb deleted file mode 100644 index 2639d12..0000000 --- a/recipes-qt/qt5/qtbase_4.999+5.0.0-beta2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qtbase.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2" -SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f" diff --git a/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb new file mode 100644 index 0000000..83ab2a9 --- /dev/null +++ b/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb @@ -0,0 +1,7 @@ +require qtbase.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" +SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" From ccb4d199df02ee706d7b5944724fffa434643c8c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:24:03 +0100 Subject: [PATCH 05/11] qt5-4.999+git.inc: update PV for SRCREVs after 5.0.0-rc1 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-4.999+git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index 6d70350..099cba8 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -9,7 +9,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "4.999+5.0.0-beta2+git${SRCPV}" +PV = "4.999+5.0.0-rc1+git${SRCPV}" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ From 458e15b19ec257b2d4853e90c87ce1581c07637a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:29:23 +0100 Subject: [PATCH 06/11] qtdeclarative: LIC_FILES_CHKSUM should be in source, not COMMON_LICENSE_DIR Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index bf90475..c526a00 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -1,3 +1,4 @@ +# FIXME!!! LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" @@ -42,4 +43,4 @@ FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*" FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*" FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*" -PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" \ No newline at end of file +PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" From a52f36a63cd03e5f17e1e2d1a9776870c6f3c1f9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:31:06 +0100 Subject: [PATCH 07/11] qtdeclarative_4.999+git: use common structure and bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative_4.999+git.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb index 8551d74..f0680fc 100644 --- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb +++ b/recipes-qt/qt5/qtdeclarative_4.999+git.bb @@ -1,7 +1,6 @@ -SRCREV = "425260c2b2a60c0c145a5e76a3b7835eadd0fd0d" -SRC_URI += "git://gitorious.org/qt/qtdeclarative.git;protocol=git" -S = "${WORKDIR}/git" - require qtdeclarative.inc +require qt5-4.999+git.inc PR = "${INC_PR}.0" + +SRCREV = "a6065d60f158ffad7a94877883af69731da94295" From b7cdb5428d2d73f2614227f8a4abebf06f446bae Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:35:26 +0100 Subject: [PATCH 08/11] qtjsbackend_4.999+git: use common structure and bump SRCREV to latest Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend-native_4.999+git.bb | 8 +++----- recipes-qt/qt5/qtjsbackend_4.999+git.bb | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb index 54dd21a..bbf4930 100644 --- a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb @@ -1,8 +1,6 @@ -SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" -SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" - -S = "${WORKDIR}/git" - require qtjsbackend-native.inc +require qt5-4.999+git.inc PR = "${INC_PR}.0" + +SRCREV = "4cbcad7fbb5606e6f183062b5f15be08b9568ecb" diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_4.999+git.bb index de19fb3..c75b6d9 100644 --- a/recipes-qt/qt5/qtjsbackend_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend_4.999+git.bb @@ -1,7 +1,6 @@ -SRCREV = "b41c2151fdfca3f63a6cd45f6c69ae678694b63e" -SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" -S = "${WORKDIR}/git" - require qtjsbackend.inc +require qt5-4.999+git.inc PR = "${INC_PR}.0" + +SRCREV = "4cbcad7fbb5606e6f183062b5f15be08b9568ecb" From ffc2911bcec031836a1c003dcb1506b765a9bf35 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 00:37:10 +0100 Subject: [PATCH 09/11] qtjsbackend: fix SRC_URI formatting Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtjsbackend-native.inc | 2 +- recipes-qt/qt5/qtjsbackend.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 7595e53..db70fd1 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -10,7 +10,7 @@ inherit native SRC_URI += "\ file://qmake.conf \ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ - " +" # Bitbake will not respect the make order set by qmake and at times it will try to compile # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index c9a5db9..1249493 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -9,8 +9,8 @@ inherit qmake5 SRC_URI += " \ file://module_qmake.conf \ - file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ - " + file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ +" # Bitbake will not respect the make order set by qmake and at times it will try to compile # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail From 921546e3288330c027154c2b671bf893fff9d293 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Dec 2012 01:14:51 +0100 Subject: [PATCH 10/11] qtdeclarative: fix typo Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index c526a00..29f28a7 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -43,4 +43,4 @@ FILES_${PN}-qmlplugins = "${libdir}/qt5/qml/*" FILES_${PN}-qmltooling = "${libdir}/qt5/plugins/qmltooling/*" FILES_${PN}-qmltooling-dbg = "${libdir}/qt5/plugins/qmltooling/.debug/*" -PACAKGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" +PACKAGES += "FILES_${PN}-tools FILES_${PN}-qmlplugins FILES_${PN}-qmltooling FILES_${PN}-qmltooling-dbg" From bfe100c179c69d3b66cd74c5f3a4aa493cc49b15 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 11 Dec 2012 14:42:35 -0800 Subject: [PATCH 11/11] qtjsbackend: fix native dependency Also fixes the broken qtjsbackent-native recipe Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qt5-4.999+git.inc | 2 +- recipes-qt/qt5/qtdeclarative.inc | 2 ++ recipes-qt/qt5/qtjsbackend-native.inc | 26 +++++++++++++++++++++++--- recipes-qt/qt5/qtjsbackend.inc | 4 +++- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc index 099cba8..437dc3b 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-4.999+git.inc @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" PV = "4.999+5.0.0-rc1+git${SRCPV}" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ +LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 29f28a7..b36b46a 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -6,6 +6,8 @@ DEPENDS = "qtbase qtjsbackend" INC_PR = "r0" +QT_MODULE = "${PN}" + inherit qmake5 SRC_URI += " \ diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index db70fd1..8a66229 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -3,12 +3,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe DEPENDS = "qt5-native" +QT_MODULE = "qtjsbackend" + INC_PR = "r0" inherit native SRC_URI += "\ - file://qmake.conf \ + file://module_qmake.conf \ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ " @@ -16,15 +18,33 @@ SRC_URI += "\ # parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail PARALLEL_MAKE = "" +export QT_CONF_PATH="${WORKDIR}/qt.conf" + do_configure() { # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) unset LD + cat > ${WORKDIR}/qt.conf <