diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-05-28 11:49:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-03 16:49:19 +0100 |
commit | 5bd29501adc6154813133418954833929000c788 (patch) | |
tree | 38bc76c5cc00a34b32b15981f3c3becd99d24380 /meta/recipes-qt/qt4/qt4-4.8.6.inc | |
parent | 4b616f06c1764b6c36d8d9e8fda6897682d91e4b (diff) | |
download | poky-5bd29501adc6154813133418954833929000c788.tar.gz |
qt4: upgrade to version 4.8.6
* Remove patches merged upstream
* Add a qtscript translation package for an additional .qm file added in
this release
(From OE-Core rev: 32a9c7101c7212c69d40893ee597eaf34955b641)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.6.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6.inc | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6.inc b/meta/recipes-qt/qt4/qt4-4.8.6.inc new file mode 100644 index 0000000000..c4dd36f67c --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6.inc | |||
@@ -0,0 +1,58 @@ | |||
1 | LICENSE = "LGPLv2.1 | GPLv3" | ||
2 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | ||
3 | file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \ | ||
4 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" | ||
5 | |||
6 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" | ||
7 | |||
8 | SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \ | ||
9 | file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ | ||
10 | file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ | ||
11 | file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \ | ||
12 | file://0009-qmake-fix-source-file-references-in-qmake.pri.patch \ | ||
13 | file://0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch \ | ||
14 | file://0011-freetype-host-includes.patch \ | ||
15 | file://0012-Add-2bpp-support.patch \ | ||
16 | file://0013-configure-add-crossarch-option.patch \ | ||
17 | file://0014-translations-fix-phony-translation-linking-error.patch \ | ||
18 | file://0015-configure-add-nostrip-for-debug-packages.patch \ | ||
19 | file://0016-configure-eval-QMAKE_CXX.patch \ | ||
20 | file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \ | ||
21 | file://0018-configure-make-pulseaudio-a-configurable-option.patch \ | ||
22 | file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ | ||
23 | file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ | ||
24 | file://g++.conf \ | ||
25 | file://linux.conf \ | ||
26 | " | ||
27 | |||
28 | SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb" | ||
29 | SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c" | ||
30 | |||
31 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" | ||
32 | |||
33 | FILES_${QT_BASE_NAME}-tools_append = " ${bindir}/qml ${bindir}/qmlplugindump" | ||
34 | FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump" | ||
35 | |||
36 | PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests" | ||
37 | FILES_${QT_BASE_NAME}-tests-dbg = "${prefix}/tests/qt4/*/.debug" | ||
38 | FILES_${QT_BASE_NAME}-tests = "${prefix}/tests/qt4/*" | ||
39 | |||
40 | do_configure_prepend() { | ||
41 | for pro in $(find ${S} -name "*.pro") ; do | ||
42 | sed -i \ | ||
43 | -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ | ||
44 | -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro | ||
45 | done | ||
46 | |||
47 | sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf | ||
48 | sed -i \ | ||
49 | -e /QMAKE_MOC\ /d \ | ||
50 | -e /QMAKE_UIC\ /d \ | ||
51 | -e /QMAKE_UIC3\ /d \ | ||
52 | -e /QMAKE_RCC\ /d \ | ||
53 | ${S}/configure | ||
54 | |||
55 | # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++) | ||
56 | unset LD | ||
57 | } | ||
58 | |||