summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-04-05 09:42:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-06 19:10:51 (GMT)
commitea738ee3d3999b1696d70ce7684b96cf4a26e9e6 (patch)
tree28b05898115984c8b6504e985f591001bbfbe99b
parent21f483a90456ba25c9d00bbb7505cc791c572c71 (diff)
downloadpoky-ea738ee3d3999b1696d70ce7684b96cf4a26e9e6.tar.gz
qt4: replace 4.7.1 with version 4.7.2
Qt 4.7.2 is a bugfix release for the 4.7 series - more details here: http://qt.nokia.com/developer/changes/changes-4.7.2/ This was prompted by the equivalent change in OE, however the change was redone by hand. There are no changes to the recipes themselves other than updating SRC_URI checksums and resetting PR. (From OE-Core rev: e8a3686ec108f6095bafa5b601c9f763bc39c123) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2.inc (renamed from meta/recipes-qt/qt4/qt-4.7.1.inc)4
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2/g++.conf (renamed from meta/recipes-qt/qt4/qt-4.7.1/g++.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch (renamed from meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.2/linux.conf (renamed from meta/recipes-qt/qt4/qt-4.7.1/linux.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb (renamed from meta/recipes-qt/qt4/qt4-embedded_4.7.1.bb)2
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb (renamed from meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb)4
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb (renamed from meta/recipes-qt/qt4/qt4-x11-free_4.7.1.bb)2
10 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.1.inc b/meta/recipes-qt/qt4/qt-4.7.2.inc
index 70ee596..ed62bd3 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.2.inc
@@ -14,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
14 file://linux.conf \ 14 file://linux.conf \
15 " 15 "
16 16
17SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7" 17SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
18SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a" 18SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
19 19
20S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" 20S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
21 21
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
index 71a04a5..71a04a5 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/g++.conf b/meta/recipes-qt/qt4/qt-4.7.2/g++.conf
index 80f925c..80f925c 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1/g++.conf
+++ b/meta/recipes-qt/qt4/qt-4.7.2/g++.conf
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
index 5c588ff..5c588ff 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch
+++ b/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/linux.conf b/meta/recipes-qt/qt4/qt-4.7.2/linux.conf
index a541355..a541355 100644
--- a/meta/recipes-qt/qt4/qt-4.7.1/linux.conf
+++ b/meta/recipes-qt/qt4/qt-4.7.2/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.1.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
index c3f6713..b88b1e9 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.1.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
@@ -1,7 +1,7 @@
1require qt-${PV}.inc 1require qt-${PV}.inc
2require qt4-embedded.inc 2require qt4-embedded.inc
3 3
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.0"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
index e9de510..d3c0eda 100644
--- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
@@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
9 9
10TOBUILD := "src/tools/bootstrap ${TOBUILD}" 10TOBUILD := "src/tools/bootstrap ${TOBUILD}"
11 11
12SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7" 12SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
13SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a" 13SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
deleted file mode 100644
index 091a539..0000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
6SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
new file mode 100644
index 0000000..a917ac4
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
@@ -0,0 +1,6 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
6SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.1.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
index 75c6314..359a756 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
@@ -1,7 +1,7 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-${PV}.inc 2require qt-${PV}.inc
3 3
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.0"
5 5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon " 6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7 7