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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

diff --git a/meta/recipes-qt/qt4/qt-4.7.1.inc b/meta/recipes-qt/qt4/qt-4.7.2.inc
similarity index 93%
rename from meta/recipes-qt/qt4/qt-4.7.1.inc
rename to meta/recipes-qt/qt4/qt-4.7.2.inc
index 70ee59697cb7a7a2db860cde820257b919f48374..ed62bd3c012ba20b99eb179e7db6e8f3f6c39c5b 100644 (file)
--- 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}.
            file://linux.conf \
            "
 
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 

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
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch
rename to 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
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.1/g++.conf
rename to 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
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch
rename to 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
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.1/linux.conf
rename to 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
similarity index 87%
rename from meta/recipes-qt/qt4/qt4-embedded_4.7.1.bb
rename to meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
index c3f671319909bdb8977fd30d7ec86a352504546a..b88b1e94980230c143dfa42833ee59f7a33613cb 100644 (file)
--- 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 @@
 require qt-${PV}.inc
 require qt4-embedded.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
 

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
similarity index 61%
rename from meta/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
rename to meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
index e9de510feaf6eb63ecd5fe1f80e55f59bf28239b..d3c0edae685fa854656365dc6cbe335cbf5472b2 100644 (file)
--- 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"
 
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
 
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_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 (file)
index 091a539..0000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_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 (file)
index 0000000..a917ac4
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
@@ -0,0 +1,6 @@
+require qt4-tools-nativesdk.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_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
similarity index 88%
rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
index 75c6314e7fec9f79eece98e1595598380a64c823..359a7561d36665af333258a4cb44e4191b033f58 100644 (file)
--- 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 @@
 require qt4-x11-free.inc
 require qt-${PV}.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "