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 07:56:05 +0100 |
| commit | 64369219e3e03cacfaef8df6e3eec507140bdd7d (patch) | |
| tree | eef4229af89fef2b3eb2fec92a9290f9cffc55c4 /meta/recipes-qt/qt4/qt4-embedded.inc | |
| parent | 2be0058fc4acddab611637656183accd052b40eb (diff) | |
| download | openembedded-core-64369219e3e03cacfaef8df6e3eec507140bdd7d.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
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 += " \ require qt4.inc do_install_append() { + install -d ${D}/${libdir}/fonts + touch ${D}/${libdir}/fonts/fontdir + install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/ } @@ -31,5 +34,32 @@ PACKAGES += " ${PN}-conf" FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh" RRECOMMENDS_${PN} += " ${PN}-conf" +OTHER_PACKAGES += "\ + ${QT_BASE_NAME}-fonts \ + ${QT_BASE_NAME}-fonts-ttf-vera \ + ${QT_BASE_NAME}-fonts-ttf-dejavu \ + ${QT_BASE_NAME}-fonts-pfa \ + ${QT_BASE_NAME}-fonts-pfb \ + ${QT_BASE_NAME}-fonts-qpf" + +RRECOMMENDS_${QT_BASE_NAME}-fonts = " \ + ${QT_BASE_NAME}-fonts-ttf-vera \ + ${QT_BASE_NAME}-fonts-ttf-dejavu \ + ${QT_BASE_NAME}-fonts-pfa \ + ${QT_BASE_NAME}-fonts-pfb \ + ${QT_BASE_NAME}-fonts-qpf" +RRECOMMENDS_${QT_BASE_NAME}-demos += " \ + ${QT_BASE_NAME}-fonts" + +ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" +PACKAGES_DYNAMIC += "${QT_BASE_NAME}-fonts-*" + +FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf" +FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" +FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa" +FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb" +FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*" +FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir" + inherit qt4e |