From 6a21cf0068234152b3f13866dc7c05adc6d0d9c9 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 28 Mar 2012 21:46:55 +0200 Subject: [PATCH] qt4: move from 4.8.0 to 4.8.1 * No changes other than source checksums and PR at recipe level. * DEFAULT_PREFERENCE still set to -1 Signed-off-by: Andreas Oberritter Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/{qt-4.8.0.inc => qt-4.8.1.inc} | 4 ++-- .../0001-Added-Openembedded-crossarch-option.patch | 0 .../qt4/{qt-4.8.0 => qt-4.8.1}/configure-lflags.patch | 0 .../{qt-4.8.0 => qt-4.8.1}/configure_oe_compiler.patch | 0 .../qt4/{qt-4.8.0 => qt-4.8.1}/fix-translations.patch | 0 meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/g++.conf | 0 .../{qt-4.8.0 => qt-4.8.1}/hack-out-pg2-4.7.0.patch | 0 meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/linux.conf | 0 .../qt4/{qt-4.8.0 => qt-4.8.1}/pulseaudio-config.patch | 0 .../qt4/{qt-4.8.0 => qt-4.8.1}/qmake_cxx_eval.patch | 0 .../qt4/{qt-4.8.0 => qt-4.8.1}/qmake_pri_fixes.patch | 0 .../{qt4-embedded_4.8.0.bb => qt4-embedded_4.8.1.bb} | 2 +- .../qt4/{qt4-native_4.8.0.bb => qt4-native_4.8.1.bb} | 4 ++-- meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb | 10 ---------- meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb | 10 ++++++++++ .../{qt4-x11-free_4.8.0.bb => qt4-x11-free_4.8.1.bb} | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) rename meta/recipes-qt/qt4/{qt-4.8.0.inc => qt-4.8.1.inc} (93%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/0001-Added-Openembedded-crossarch-option.patch (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/configure-lflags.patch (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/configure_oe_compiler.patch (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/fix-translations.patch (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/g++.conf (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/hack-out-pg2-4.7.0.patch (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/linux.conf (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/pulseaudio-config.patch (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/qmake_cxx_eval.patch (100%) rename meta/recipes-qt/qt4/{qt-4.8.0 => qt-4.8.1}/qmake_pri_fixes.patch (100%) rename meta/recipes-qt/qt4/{qt4-embedded_4.8.0.bb => qt4-embedded_4.8.1.bb} (89%) rename meta/recipes-qt/qt4/{qt4-native_4.8.0.bb => qt4-native_4.8.1.bb} (60%) delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.0.bb => qt4-x11-free_4.8.1.bb} (90%) diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc similarity index 93% rename from meta/recipes-qt/qt4/qt-4.8.0.inc rename to meta/recipes-qt/qt4/qt-4.8.1.inc index c0d90cd267..cd78401989 100644 --- a/meta/recipes-qt/qt4/qt-4.8.0.inc +++ b/meta/recipes-qt/qt4/qt-4.8.1.inc @@ -22,8 +22,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. file://linux.conf \ " -SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904" -SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e" +SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" +SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8" S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" diff --git a/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch rename to meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch b/meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch rename to meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch rename to meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch diff --git a/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch rename to meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch diff --git a/meta/recipes-qt/qt4/qt-4.8.0/g++.conf b/meta/recipes-qt/qt4/qt-4.8.1/g++.conf similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/g++.conf rename to meta/recipes-qt/qt4/qt-4.8.1/g++.conf diff --git a/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.8.1/hack-out-pg2-4.7.0.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch rename to meta/recipes-qt/qt4/qt-4.8.1/hack-out-pg2-4.7.0.patch diff --git a/meta/recipes-qt/qt4/qt-4.8.0/linux.conf b/meta/recipes-qt/qt4/qt-4.8.1/linux.conf similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/linux.conf rename to meta/recipes-qt/qt4/qt-4.8.1/linux.conf diff --git a/meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch rename to meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch rename to meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch rename to meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb similarity index 89% rename from meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb rename to meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb index efbc02ae03..5c1c97eeac 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb @@ -1,7 +1,7 @@ require qt-${PV}.inc require qt4-embedded.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.0.bb b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb similarity index 60% rename from meta/recipes-qt/qt4/qt4-native_4.8.0.bb rename to meta/recipes-qt/qt4/qt4-native_4.8.1.bb index 86c05007a4..d991c03ec2 100644 --- a/meta/recipes-qt/qt4/qt4-native_4.8.0.bb +++ b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb @@ -9,6 +9,6 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" TOBUILD := "src/tools/bootstrap ${TOBUILD}" -SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904" -SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e" +SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" +SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8" diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb deleted file mode 100644 index 02917fefa8..0000000000 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require qt4-tools-nativesdk.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://qmake_pri_fixes.patch" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904" -SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e" diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb new file mode 100644 index 0000000000..e6162fc20c --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb @@ -0,0 +1,10 @@ +require qt4-tools-nativesdk.inc + +PR = "${INC_PR}.0" + +SRC_URI += "file://qmake_pri_fixes.patch" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" +SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8" diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb similarity index 90% rename from meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb rename to meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb index 6a0b0b8f07..edd3e0ebed 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb @@ -1,7 +1,7 @@ require qt4-x11-free.inc require qt-${PV}.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" -- 2.40.1