From 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 4 Jul 2013 09:50:32 +1000 Subject: qt4: upgrade to 4.8.5 Removed patches integrated upstream. Added INSANE_SKIP libdir for examples packages as it includes plugin shared libraries outside of libdir. (From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4) Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4-4.8.5.inc | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 meta/recipes-qt/qt4/qt4-4.8.5.inc (limited to 'meta/recipes-qt/qt4/qt4-4.8.5.inc') diff --git a/meta/recipes-qt/qt4/qt4-4.8.5.inc b/meta/recipes-qt/qt4/qt4-4.8.5.inc new file mode 100644 index 0000000000..810a01b654 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.5.inc @@ -0,0 +1,59 @@ +LICENSE = "LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ + file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" + +SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ + file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ + file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \ + file://0009-qmake-fix-source-file-references-in-qmake.pri.patch \ + file://0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch \ + file://0011-freetype-host-includes.patch \ + file://0012-Add-2bpp-support.patch \ + file://0013-configure-add-crossarch-option.patch \ + file://0014-translations-fix-phony-translation-linking-error.patch \ + file://0015-configure-add-nostrip-for-debug-packages.patch \ + file://0016-configure-eval-QMAKE_CXX.patch \ + file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \ + file://0018-configure-make-pulseaudio-a-configurable-option.patch \ + file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ + file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \ + file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ + file://g++.conf \ + file://linux.conf \ + " + +SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" +SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138" + +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 = "${prefix}/tests/qt4/*/.debug" +FILES_${QT_BASE_NAME}-tests = "${prefix}/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