Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: "Eric Bénard" <eric@eukrea.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH v2] qtbase: install and split package fonts
Date: Tue, 28 May 2013 15:03:54 +0200	[thread overview]
Message-ID: <1369746234-28179-1-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <20130528085017.GC3192@jama>

- fonts were not installed (at least in qt 5.0.2) so install
them manually.
- split the font package in smaller package as done in qt4 to
save space on the target.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
v2 : remove unecessary PACKAGES_DYNAMIC 

 recipes-qt/qt5/qtbase.inc |   29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index f286274..b252e17 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -170,7 +170,32 @@ do_install_append() {
     # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
     # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
     rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
+    # install fonts manually if they are missing
+    if [ ! -d ${D}/${libdir}/fonts ]; then
+        cp -a ${S}/lib/fonts ${D}/${libdir}
+    fi
 }
 
-PACKAGES =. "${PN}-fonts "
-FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts"
+PACKAGES =. "${PN}-fonts \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+RRECOMMENDS_${PN}-fonts = " \
+             ${PN}-fonts-ttf-vera \
+             ${PN}-fonts-ttf-dejavu \
+             ${PN}-fonts-pfa \
+             ${PN}-fonts-pfb \
+             ${PN}-fonts-qpf "
+
+ALLOW_EMPTY_${PN}-fonts = "1"
+
+FILES_${PN}-fonts-ttf-vera       = "${libdir}/${QT_DIR_NAME}/fonts/Vera*.ttf ${libdir}/fonts/Vera*.ttf"
+FILES_${PN}-fonts-ttf-dejavu     = "${libdir}/${QT_DIR_NAME}/fonts/DejaVu*.ttf ${libdir}/fonts/DejaVu*.ttf"
+FILES_${PN}-fonts-pfa            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfa ${libdir}/fonts/*.pfa"
+FILES_${PN}-fonts-pfb            = "${libdir}/${QT_DIR_NAME}/fonts/*.pfb ${libdir}/fonts/*.pfb"
+FILES_${PN}-fonts-qpf            = "${libdir}/${QT_DIR_NAME}/fonts/*.qpf* ${libdir}/fonts/*.qpf*"
+FILES_${PN}-fonts                = "${libdir}/${QT_DIR_NAME}/fonts/README ${libdir}/fonts/README \
+                                    ${libdir}/${QT_DIR_NAME}/fonts/fontdir ${libdir}/fonts/fontdir"
-- 
1.7.10.4



  parent reply	other threads:[~2013-05-28 13:03 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-27 23:43 [meta-qt5][PATCH 1/8] qt: package examples Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 2/8] qtjsbackend: fix hardfloat detection in v8 Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 3/8] qtbase: add 0004-Disable-mkv8snapshot.patch to 5.0.1 Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 4/8] qtbase: remove non existing parts Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 5/8] qtbase-5.0.2: fix v8 and allow build of examples Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 6/8] qtdeclarative-5.0.2: fix examples compilation Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 7/8] qtbase: install and split package fonts Eric Bénard
2013-05-28  8:28   ` Martin Jansa
2013-05-28  8:40     ` Eric Bénard
2013-05-28  8:50   ` Martin Jansa
2013-05-28  9:04     ` Eric Bénard
2013-05-28 13:03     ` Eric Bénard [this message]
2013-05-27 23:43 ` [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support Eric Bénard
2013-05-28  8:46   ` Martin Jansa
2013-05-28  8:50     ` Eric Bénard
2013-05-28  9:25       ` Martin Jansa
2013-05-28  9:27         ` Eric Bénard
2013-05-28  9:30           ` Martin Jansa
2013-05-28  9:33             ` Eric Bénard
2013-05-28  9:59               ` Martin Jansa
2013-05-28 10:47                 ` Eric Bénard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1369746234-28179-1-git-send-email-eric@eukrea.com \
    --to=eric@eukrea.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox