From 597f9bf624f81dd63358158fe656b8d7984cab07 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 19 Dec 2012 19:15:51 +0100 Subject: [PATCH] qt5: upgrade recipes to use 5.0.0 tarballs * and change DEFAULT_PREFERRENCE for git recipes negative again * bump SRCREV in git recipes to latest and update PV Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc | 19 ------------------- .../{qt5-4.999+git.inc => qt5-5.0.0+git.inc} | 4 +++- recipes-qt/qt5/qt5-5.0.0.inc | 17 +++++++++++++++++ recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb | 9 --------- recipes-qt/qt5/qt5-native_4.999+git.bb | 6 ------ recipes-qt/qt5/qt5-native_5.0.0+git.bb | 8 ++++++++ recipes-qt/qt5/qt5-native_5.0.0.bb | 7 +++++++ recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb | 7 ------- recipes-qt/qt5/qtbase_4.999+git.bb | 6 ------ recipes-qt/qt5/qtbase_5.0.0+git.bb | 6 ++++++ recipes-qt/qt5/qtbase_5.0.0.bb | 7 +++++++ recipes-qt/qt5/qtdeclarative_4.999+git.bb | 6 ------ recipes-qt/qt5/qtdeclarative_5.0.0+git.bb | 6 ++++++ recipes-qt/qt5/qtdeclarative_5.0.0.bb | 7 +++++++ ...git.bb => qtjsbackend-native_5.0.0+git.bb} | 4 ++-- recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | 7 +++++++ ..._4.999+git.bb => qtjsbackend_5.0.0+git.bb} | 4 ++-- recipes-qt/qt5/qtjsbackend_5.0.0.bb | 7 +++++++ 18 files changed, 79 insertions(+), 58 deletions(-) delete mode 100644 recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc rename recipes-qt/qt5/{qt5-4.999+git.inc => qt5-5.0.0+git.inc} (92%) create mode 100644 recipes-qt/qt5/qt5-5.0.0.inc delete mode 100644 recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb delete mode 100644 recipes-qt/qt5/qt5-native_4.999+git.bb create mode 100644 recipes-qt/qt5/qt5-native_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qt5-native_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb delete mode 100644 recipes-qt/qt5/qtbase_4.999+git.bb create mode 100644 recipes-qt/qt5/qtbase_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtbase_5.0.0.bb delete mode 100644 recipes-qt/qt5/qtdeclarative_4.999+git.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.0.0.bb rename recipes-qt/qt5/{qtjsbackend_4.999+git.bb => qtjsbackend-native_5.0.0+git.bb} (59%) create mode 100644 recipes-qt/qt5/qtjsbackend-native_5.0.0.bb rename recipes-qt/qt5/{qtjsbackend-native_4.999+git.bb => qtjsbackend_5.0.0+git.bb} (56%) create mode 100644 recipes-qt/qt5/qtjsbackend_5.0.0.bb diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc deleted file mode 100644 index 5815fd2bb2..0000000000 --- a/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. - -QT_VERSION ?= "5.0.0-rc1" - -SRC_URI += " \ - http://releases.qt-project.org/qt5.0/rc1/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ - file://linux.conf \ - file://g++.conf \ -" - -S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" - -DEFAULT_PREFERENCE = "-1" - -LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" -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/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-5.0.0+git.inc similarity index 92% rename from recipes-qt/qt5/qt5-4.999+git.inc rename to recipes-qt/qt5/qt5-5.0.0+git.inc index 0dcaa62409..9f2e2f3172 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-5.0.0+git.inc @@ -9,7 +9,9 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "4.999+5.0.0-rc1+git${SRCPV}" +PV = "5.0.0+git${SRCPV}" + +DEFAULT_PREFERENCE = "-1" LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc new file mode 100644 index 0000000000..4bdfaeed54 --- /dev/null +++ b/recipes-qt/qt5/qt5-5.0.0.inc @@ -0,0 +1,17 @@ +# Copyright (C) 2012 O.S. Systems Software LTDA. + +QT_VERSION ?= "${PV}" + +SRC_URI += " \ + http://releases.qt-project.org/qt5/${QT_VERSION}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ + file://linux.conf \ + file://g++.conf \ +" + +S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" + +LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" +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/qt5-native_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb deleted file mode 100644 index e08e48b6b4..0000000000 --- a/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.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] = "589addbcc525a43c0ace55652f755dce" -SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb deleted file mode 100644 index 71403729c5..0000000000 --- a/recipes-qt/qt5/qt5-native_4.999+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qt5-native.inc -require qt5-4.999+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "8c814db74718f18e88697feb97867b0d502e7f1d" diff --git a/recipes-qt/qt5/qt5-native_5.0.0+git.bb b/recipes-qt/qt5/qt5-native_5.0.0+git.bb new file mode 100644 index 0000000000..e99971fb32 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_5.0.0+git.bb @@ -0,0 +1,8 @@ +require qt5-native.inc +require qt5-5.0.0+git.inc + +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1" + +SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" diff --git a/recipes-qt/qt5/qt5-native_5.0.0.bb b/recipes-qt/qt5/qt5-native_5.0.0.bb new file mode 100644 index 0000000000..d9c922d608 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" +SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" 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 deleted file mode 100644 index 83ab2a916e..0000000000 --- a/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require qtbase.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" -SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb deleted file mode 100644 index 09991cad42..0000000000 --- a/recipes-qt/qt5/qtbase_4.999+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qtbase.inc -require qt5-4.999+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "8c814db74718f18e88697feb97867b0d502e7f1d" diff --git a/recipes-qt/qt5/qtbase_5.0.0+git.bb b/recipes-qt/qt5/qtbase_5.0.0+git.bb new file mode 100644 index 0000000000..f5f010a321 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.0+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.0+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb new file mode 100644 index 0000000000..d9c922d608 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" +SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb deleted file mode 100644 index e934f3d4cc..0000000000 --- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require qtdeclarative.inc -require qt5-4.999+git.inc - -PR = "${INC_PR}.0" - -SRCREV = "27f0e91d6d24a5b871c79946323e3ee32f4a276c" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb b/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb new file mode 100644 index 0000000000..0ba6becd66 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +require qt5-5.0.0+git.inc + +PR = "${INC_PR}.0" + +SRCREV = "c8ef32e2b6cded37a6854b94a281464c1b7a298b" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb new file mode 100644 index 0000000000..fb37cb8760 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" +SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd" diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb similarity index 59% rename from recipes-qt/qt5/qtjsbackend_4.999+git.bb rename to recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb index b5ef96d56d..48e2654e3b 100644 --- a/recipes-qt/qt5/qtjsbackend_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb @@ -1,5 +1,5 @@ -require qtjsbackend.inc -require qt5-4.999+git.inc +require ${PN}.inc +require qt5-5.0.0+git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb new file mode 100644 index 0000000000..a6b77fd6b8 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" +SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb similarity index 56% rename from recipes-qt/qt5/qtjsbackend-native_4.999+git.bb rename to recipes-qt/qt5/qtjsbackend_5.0.0+git.bb index ae14124710..48e2654e3b 100644 --- a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb @@ -1,5 +1,5 @@ -require qtjsbackend-native.inc -require qt5-4.999+git.inc +require ${PN}.inc +require qt5-5.0.0+git.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb new file mode 100644 index 0000000000..a6b77fd6b8 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.0.0.bb @@ -0,0 +1,7 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" +SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39"