summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4.inc
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-31 00:31:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-31 08:02:10 +0100
commit07c93ba0ce2edbdd5766ece2c0e0f6099a7a5884 (patch)
treee081d55d572f02f23c444f35e82190f7ffcb2981 /meta/recipes-qt/qt4/qt4.inc
parent72730329c804bd474655d2f4ab5aed02345fd1e3 (diff)
downloadpoky-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.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc25
1 files changed, 1 insertions, 24 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 9b42f69861..b8c6baf3a2 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -93,12 +93,6 @@ OTHER_PACKAGES = "\
93 ${QT_BASE_NAME}-demos \ 93 ${QT_BASE_NAME}-demos \
94 ${QT_BASE_NAME}-designer \ 94 ${QT_BASE_NAME}-designer \
95 ${QT_BASE_NAME}-examples \ 95 ${QT_BASE_NAME}-examples \
96 ${QT_BASE_NAME}-fonts \
97 ${QT_BASE_NAME}-fonts-ttf-vera \
98 ${QT_BASE_NAME}-fonts-ttf-dejavu \
99 ${QT_BASE_NAME}-fonts-pfa \
100 ${QT_BASE_NAME}-fonts-pfb \
101 ${QT_BASE_NAME}-fonts-qpf \
102 ${QT_BASE_NAME}-linguist \ 96 ${QT_BASE_NAME}-linguist \
103 ${QT_BASE_NAME}-makeqpf \ 97 ${QT_BASE_NAME}-makeqpf \
104 ${QT_BASE_NAME}-mkspecs \ 98 ${QT_BASE_NAME}-mkspecs \
@@ -117,10 +111,9 @@ PACKAGES += " \
117 ${STATICDEV_PACKAGES} \ 111 ${STATICDEV_PACKAGES} \
118 ${OTHER_PACKAGES}" 112 ${OTHER_PACKAGES}"
119 113
120PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*" 114PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-*"
121 115
122ALLOW_EMPTY_${PN} = "1" 116ALLOW_EMPTY_${PN} = "1"
123ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
124FILES_${PN} = "" 117FILES_${PN} = ""
125FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*" 118FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
126FILES_${PN}-dbg = "${exec_prefix}/src/debug/" 119FILES_${PN}-dbg = "${exec_prefix}/src/debug/"
@@ -128,14 +121,7 @@ FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/qtopia/qch/qt.qch"
128RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" 121RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
129RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" 122RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
130RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" 123RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
131RRECOMMENDS_${QT_BASE_NAME}-fonts = " \
132 ${QT_BASE_NAME}-fonts-ttf-vera \
133 ${QT_BASE_NAME}-fonts-ttf-dejavu \
134 ${QT_BASE_NAME}-fonts-pfa \
135 ${QT_BASE_NAME}-fonts-pfb \
136 ${QT_BASE_NAME}-fonts-qpf"
137RRECOMMENDS_${QT_BASE_NAME}-demos += " \ 124RRECOMMENDS_${QT_BASE_NAME}-demos += " \
138 ${QT_BASE_NAME}-fonts \
139 ${QT_BASE_NAME}-examples \ 125 ${QT_BASE_NAME}-examples \
140 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ 126 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
141 ${QT_BASE_NAME}-plugin-imageformat-jpeg \ 127 ${QT_BASE_NAME}-plugin-imageformat-jpeg \
@@ -170,12 +156,6 @@ FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
170FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*" 156FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
171FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a" 157FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
172FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*" 158FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
173FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
174FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
175FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
176FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
177FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*"
178FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir"
179FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts" 159FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
180FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts" 160FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
181FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" 161FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
@@ -368,9 +348,6 @@ do_install() {
368 -e 's:IP{:I${:g' $pc 348 -e 's:IP{:I${:g' $pc
369 done 349 done
370 350
371 install -d ${D}/${libdir}/fonts
372 touch ${D}/${libdir}/fonts/fontdir
373
374 #Append an E to the qtdemo file 351 #Append an E to the qtdemo file
375 if [ -n "${QT_LIBINFIX}" ] ; then 352 if [ -n "${QT_LIBINFIX}" ] ; then
376 [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} 353 [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}