diff --git a/meta/recipes-qt/qt4/qt-4.7.2.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc similarity index 89% rename from meta/recipes-qt/qt4/qt-4.7.2.inc rename to meta/recipes-qt/qt4/qt-4.7.3.inc index 0f75a4682d..7f26b9bd45 100644 --- a/meta/recipes-qt/qt4/qt-4.7.2.inc +++ b/meta/recipes-qt/qt4/qt-4.7.3.inc @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://blacklist-fraudulent-comodo-certificates-patch.diff \ file://0004-no-qmake.patch \ file://hack-out-pg2-4.7.0.patch \ file://0006-freetype-host-includes.patch \ @@ -15,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. file://linux.conf \ " -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" diff --git a/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch rename to meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch diff --git a/meta/recipes-qt/qt4/qt-4.7.2/g++.conf b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf similarity index 100% rename from meta/recipes-qt/qt4/qt-4.7.2/g++.conf rename to meta/recipes-qt/qt4/qt-4.7.3/g++.conf diff --git a/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch similarity index 100% rename from meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch rename to meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch diff --git a/meta/recipes-qt/qt4/qt-4.7.2/linux.conf b/meta/recipes-qt/qt4/qt-4.7.3/linux.conf similarity index 100% rename from meta/recipes-qt/qt4/qt-4.7.2/linux.conf rename to meta/recipes-qt/qt4/qt-4.7.3/linux.conf diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb similarity index 87% rename from meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb rename to meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb index c3f6713199..b88b1e9498 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.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.2.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb similarity index 61% rename from meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb rename to meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb index d3c0edae68..deb4231d8a 100644 --- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb +++ b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb @@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath" TOBUILD := "src/tools/bootstrap ${TOBUILD}" -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" 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 deleted file mode 100644 index a917ac4b54..0000000000 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -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-tools-nativesdk_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb new file mode 100644 index 0000000000..d61f3122a5 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb @@ -0,0 +1,6 @@ +require qt4-tools-nativesdk.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb similarity index 88% rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb index 75c6314e7f..359a7561d3 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.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 "