diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-07-31 00:31:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-31 08:02:10 +0100 |
commit | 07c93ba0ce2edbdd5766ece2c0e0f6099a7a5884 (patch) | |
tree | e081d55d572f02f23c444f35e82190f7ffcb2981 /meta/recipes-qt/qt4/qt4-embedded.inc | |
parent | 72730329c804bd474655d2f4ab5aed02345fd1e3 (diff) | |
download | poky-07c93ba0ce2edbdd5766ece2c0e0f6099a7a5884.tar.gz |
qt4: make font packaging specific to embedded version
Qt 4's lib/fonts files are intended only for installation with
Qt Embedded [1] so only install and package them with the embedded
version.
Fixes [YOCTO #2809].
[1] http://lists.qt-project.org/pipermail/interest/2012-July/003062.html
(From OE-Core rev: 64369219e3e03cacfaef8df6e3eec507140bdd7d)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-embedded.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 9e8bf3a0d7..de1b88ee83 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc | |||
@@ -21,6 +21,9 @@ QT_CONFIG_FLAGS += " \ | |||
21 | require qt4.inc | 21 | require qt4.inc |
22 | 22 | ||
23 | do_install_append() { | 23 | do_install_append() { |
24 | install -d ${D}/${libdir}/fonts | ||
25 | touch ${D}/${libdir}/fonts/fontdir | ||
26 | |||
24 | install -d ${D}${sysconfdir}/profile.d/ | 27 | install -d ${D}${sysconfdir}/profile.d/ |
25 | install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/ | 28 | install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/ |
26 | } | 29 | } |
@@ -31,5 +34,32 @@ PACKAGES += " ${PN}-conf" | |||
31 | FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh" | 34 | FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh" |
32 | RRECOMMENDS_${PN} += " ${PN}-conf" | 35 | RRECOMMENDS_${PN} += " ${PN}-conf" |
33 | 36 | ||
37 | OTHER_PACKAGES += "\ | ||
38 | ${QT_BASE_NAME}-fonts \ | ||
39 | ${QT_BASE_NAME}-fonts-ttf-vera \ | ||
40 | ${QT_BASE_NAME}-fonts-ttf-dejavu \ | ||
41 | ${QT_BASE_NAME}-fonts-pfa \ | ||
42 | ${QT_BASE_NAME}-fonts-pfb \ | ||
43 | ${QT_BASE_NAME}-fonts-qpf" | ||
44 | |||
45 | RRECOMMENDS_${QT_BASE_NAME}-fonts = " \ | ||
46 | ${QT_BASE_NAME}-fonts-ttf-vera \ | ||
47 | ${QT_BASE_NAME}-fonts-ttf-dejavu \ | ||
48 | ${QT_BASE_NAME}-fonts-pfa \ | ||
49 | ${QT_BASE_NAME}-fonts-pfb \ | ||
50 | ${QT_BASE_NAME}-fonts-qpf" | ||
51 | RRECOMMENDS_${QT_BASE_NAME}-demos += " \ | ||
52 | ${QT_BASE_NAME}-fonts" | ||
53 | |||
54 | ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" | ||
55 | PACKAGES_DYNAMIC += "${QT_BASE_NAME}-fonts-*" | ||
56 | |||
57 | FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf" | ||
58 | FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" | ||
59 | FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa" | ||
60 | FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb" | ||
61 | FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*" | ||
62 | FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir" | ||
63 | |||
34 | inherit qt4e | 64 | inherit qt4e |
35 | 65 | ||