summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-02-19 11:56:42 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-05-02 15:17:13 +0200
commit8034aa98076649e452798ff23285249dac7f19fc (patch)
treeff6dc88793d2d54aa11b8712a3c0d78f54e2fdb9 /recipes-qt/qt5/qtbase_git.bb
parent9758a7aff69fde12b7b2cf82f1934edd6abc9e77 (diff)
downloadmeta-qt5-8034aa98076649e452798ff23285249dac7f19fc.tar.gz
qtbase: remove fonts packages
* fonts were removed from qtbase in: commit c5ceabb9a1caf6b9b7615a28c3097f221772f645 Author: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Date: Mon Aug 17 18:32:41 2015 +0200 Purge all fonts Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase_git.bb40
1 files changed, 0 insertions, 40 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 42a57e84..766424e9 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -201,14 +201,6 @@ do_configure() {
201do_install_append() { 201do_install_append() {
202 install -m 0755 ${B}/bin/qmake-target ${D}/${bindir}${QT_DIR_NAME}/qmake 202 install -m 0755 ${B}/bin/qmake-target ${D}/${bindir}${QT_DIR_NAME}/qmake
203 203
204 ### Fix up the binaries to the right location
205 ### TODO: FIX
206 # install fonts manually if they are missing
207 if [ ! -d ${D}/${OE_QMAKE_PATH_QT_FONTS} ]; then
208 mkdir -p ${D}/${OE_QMAKE_PATH_QT_FONTS}
209 cp -d ${S}/lib/fonts/* ${D}/${OE_QMAKE_PATH_QT_FONTS}
210 chown -R root:root ${D}/${OE_QMAKE_PATH_QT_FONTS}
211 fi
212 # Remove example.pro file as it is useless 204 # Remove example.pro file as it is useless
213 rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro 205 rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro
214 206
@@ -224,38 +216,6 @@ do_install_append() {
224 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri 216 ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
225} 217}
226 218
227PACKAGES =. " \
228 ${PN}-fonts \
229 ${PN}-fonts-ttf-vera \
230 ${PN}-fonts-ttf-dejavu \
231 ${PN}-fonts-pfa \
232 ${PN}-fonts-pfb \
233 ${PN}-fonts-qpf \
234"
235
236RRECOMMENDS_${PN}-fonts = " \
237 ${PN}-fonts-ttf-vera \
238 ${PN}-fonts-ttf-dejavu \
239 ${PN}-fonts-pfa \
240 ${PN}-fonts-pfb \
241 ${PN}-fonts-qpf \
242"
243
244ALLOW_EMPTY_${PN}-fonts = "1"
245
246FILES_${PN}-fonts-ttf-vera = "${OE_QMAKE_PATH_QT_FONTS}/Vera*.ttf"
247FILES_${PN}-fonts-ttf-dejavu = "${OE_QMAKE_PATH_QT_FONTS}/DejaVu*.ttf"
248FILES_${PN}-fonts-pfa = "${OE_QMAKE_PATH_QT_FONTS}/*.pfa"
249FILES_${PN}-fonts-pfb = "${OE_QMAKE_PATH_QT_FONTS}/*.pfb"
250FILES_${PN}-fonts-qpf = "${OE_QMAKE_PATH_QT_FONTS}/*.qpf*"
251FILES_${PN}-fonts = "${OE_QMAKE_PATH_QT_FONTS}/README \
252 ${OE_QMAKE_PATH_QT_FONTS}/fontdir"
253
254RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 219RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
255 220
256sysroot_stage_dirs_append() {
257 # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all
258 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
259}
260
261SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" 221SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882"