From 54a6f8498eb3031437fd6f889787b4a2c7ce4924 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 28 Mar 2012 21:46:55 +0200 Subject: qt4: move from 4.8.0 to 4.8.1 * No changes other than source checksums and PR at recipe level. * DEFAULT_PREFERENCE still set to -1 (From OE-Core rev: 6a21cf0068234152b3f13866dc7c05adc6d0d9c9) Signed-off-by: Andreas Oberritter Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt-4.8.0.inc | 55 ---------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 meta/recipes-qt/qt4/qt-4.8.0.inc (limited to 'meta/recipes-qt/qt4/qt-4.8.0.inc') diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc deleted file mode 100644 index c0d90cd267..0000000000 --- a/meta/recipes-qt/qt4/qt-4.8.0.inc +++ /dev/null @@ -1,55 +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://0004-no-qmake.patch \ - file://hack-out-pg2-4.7.0.patch \ - file://0006-freetype-host-includes.patch \ - file://0009-support-2bpp.patch \ - file://0001-Added-Openembedded-crossarch-option.patch \ - file://fix-translations.patch \ - file://add_nostrip_for_debug_packages.diff \ - file://qmake_cxx_eval.patch \ - file://configure_oe_compiler.patch \ - file://target_qmake.patch \ - file://qmake_pri_fixes.patch \ - file://pulseaudio-config.patch \ - file://g++.conf \ - file://linux.conf \ - " - -SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904" -SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e" - -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -FILES_${QT_BASE_NAME}-tools_append = " ${bindir}/qml ${bindir}/qmlplugindump" -FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump" - -PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests" -FILES_${QT_BASE_NAME}-tests-dbg = "/usr/tests/qt4/*/.debug" -FILES_${QT_BASE_NAME}-tests = "/usr/tests/qt4/*" - -do_configure_prepend() { - for pro in $(find ${S} -name "*.pro") ; do - sed -i \ - -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ - -e 's:qtPrepareTool(LRELEASE, lrelease):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 - - # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++) - unset LD -} - -- cgit v1.2.3-54-g00ecf