Revert "Revert "qt4: Updated to v4.7.3"

[openembedded.git] / recipes / qt4 / qt-4.6.3.inc

diff --git a/recipes/qt4/qt-4.6.2.inc b/recipes/qt4/qt-4.6.3.inc
similarity index 54%
rename from recipes/qt4/qt-4.6.2.inc
rename to recipes/qt4/qt-4.6.3.inc
index 94777e5..1d5df70 100644 (file)
--- a/recipes/qt4/qt-4.6.2.inc
+++ b/recipes/qt4/qt-4.6.3.inc
@@ -1,16 +1,21 @@
 DEFAULT_PREFERENCE = "-1"
+LICENSE = "LGPLv2.1 GPLv3"
 
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://0001-cross-compile.patch;patch=1 \
-           file://0002-fix-resinit-declaration.patch;patch=1 \
-           file://0004-no-qmake.patch;patch=1 \
-           file://0006-freetype-host-includes.patch;patch=1 \
-           file://0008-qt-lib-infix.patch;patch=1 \
-           file://0009-support-2bpp.patch;patch=1 \
-           file://0010-no-simpledecoration-example.patch;patch=1 \
-           file://fix-config-tests.patch;patch=1 \
+           file://blacklist-fraudulent-comodo-certificates-patch.diff \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0004-no-qmake.patch \
+           file://hack-out-pg_config.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0008-qt-lib-infix.patch \
+           file://0009-support-2bpp.patch \
+           file://0010-no-simpledecoration-example.patch \
+           file://fix-config-tests.patch \
+           file://qt-config.patch \
+           file://0001-wsegl2-support.patch \
            file://g++.conf \
            file://linux.conf \
            "
@@ -48,8 +53,12 @@ do_install_append() {
        for i in rcc uic moc ; do
                install -m 0755 ${S}/bin/$i ${D}${bindir}/
        done
+
+       #Append an E to the qtdemo file
+       if [ -n "${QT_LIBINFIX}" ] ; then
+               mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+       fi
 }
 
-LICENSE = "LGPLv2.1 GPLv3"
-SRC_URI += " \
-            file://hack-out-pg_config.patch;patch=1"
+SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
+SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"