diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-05-12 15:11:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-16 15:18:45 +0100 |
| commit | 57b3cbf2b7b8a716481cb3efb68b7e4c08af6703 (patch) | |
| tree | bf2d1e510a8360ef762c461c5b59f10de8a20fb5 /meta/recipes-qt/qt4/qt-4.7.2.inc | |
| parent | 00e30eba2f9970ec229f2702a73d6b3fd7d0d1b5 (diff) | |
| download | openembedded-core-57b3cbf2b7b8a716481cb3efb68b7e4c08af6703.tar.gz openembedded-core-57b3cbf2b7b8a716481cb3efb68b7e4c08af6703.tar.bz2 openembedded-core-57b3cbf2b7b8a716481cb3efb68b7e4c08af6703.zip | |
qt4: update from 4.7.2 to 4.7.3
The Comodo certificates patch has been merged upstream so it no longer
needs to be applied. Some PR values were reset and SRC_URI checksums
updated but other than this there are no recipe changes.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.2.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.2.inc | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.2.inc b/meta/recipes-qt/qt4/qt-4.7.2.inc deleted file mode 100644 index 0f75a4682d..0000000000 --- a/meta/recipes-qt/qt4/qt-4.7.2.inc +++ /dev/null @@ -1,59 +0,0 @@ -LICENSE = "LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ - file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ - file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" - -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 \ - file://0001-Added-Openembedded-crossarch-option.patch \ - file://g++.conf \ - file://linux.conf \ - " - -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" - -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" - -do_configure_prepend() { - for pro in $(find ${S} -name "*.pro") ; do - sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro - done - - sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -do_configure_append() { - sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile -} - -QT_GLFLAGS ?= "" -QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" - -do_compile() { - # Fixup missing wsegl header in some SGX SDKs - if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then - cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ - fi - - unset CFLAGS CXXFLAGS - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic - install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease - - oe_runmake ${EXTRA_ENV} -} |