summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/qmake5_paths.bbclass2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb24
2 files changed, 14 insertions, 12 deletions
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass
index 90e1789b..6f2c25f3 100644
--- a/classes/qmake5_paths.bbclass
+++ b/classes/qmake5_paths.bbclass
@@ -47,3 +47,5 @@ OE_QMAKE_PATH_QT_DOCS = "${docdir}${QT_DIR_NAME}"
47OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}${QT_DIR_NAME}" 47OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}${QT_DIR_NAME}"
48OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}${QT_DIR_NAME}/examples" 48OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}${QT_DIR_NAME}/examples"
49OE_QMAKE_PATH_QT_TESTS = "${datadir}${QT_DIR_NAME}/tests" 49OE_QMAKE_PATH_QT_TESTS = "${datadir}${QT_DIR_NAME}/tests"
50
51OE_QMAKE_PATH_QT_FONTS = "${OE_QMAKE_PATH_LIBS}/fonts"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 63f52f49..39d02a9f 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -226,10 +226,10 @@ do_install_append() {
226 ### Fix up the binaries to the right location 226 ### Fix up the binaries to the right location
227 ### TODO: FIX 227 ### TODO: FIX
228 # install fonts manually if they are missing 228 # install fonts manually if they are missing
229 if [ ! -d ${D}/${OE_QMAKE_PATH_LIBS}/fonts ]; then 229 if [ ! -d ${D}/${OE_QMAKE_PATH_QT_FONTS} ]; then
230 mkdir -p ${D}/${OE_QMAKE_PATH_LIBS}/fonts 230 mkdir -p ${D}/${OE_QMAKE_PATH_QT_FONTS}
231 cp -a ${S}/lib/fonts/* ${D}/${OE_QMAKE_PATH_LIBS}/fonts 231 cp -a ${S}/lib/fonts/* ${D}/${OE_QMAKE_PATH_QT_FONTS}
232 chown -R root:root ${D}/${OE_QMAKE_PATH_LIBS}/fonts 232 chown -R root:root ${D}/${OE_QMAKE_PATH_QT_FONTS}
233 fi 233 fi
234 cp -a ${B}/lib/libqt* ${D}${libdir} 234 cp -a ${B}/lib/libqt* ${D}${libdir}
235 # Remove example.pro file as it is useless 235 # Remove example.pro file as it is useless
@@ -264,19 +264,19 @@ RRECOMMENDS_${PN}-fonts = " \
264 264
265ALLOW_EMPTY_${PN}-fonts = "1" 265ALLOW_EMPTY_${PN}-fonts = "1"
266 266
267FILES_${PN}-fonts-ttf-vera = "${OE_QMAKE_PATH_LIBS}/fonts/Vera*.ttf" 267FILES_${PN}-fonts-ttf-vera = "${OE_QMAKE_PATH_QT_FONTS}/Vera*.ttf"
268FILES_${PN}-fonts-ttf-dejavu = "${OE_QMAKE_PATH_LIBS}/fonts/DejaVu*.ttf" 268FILES_${PN}-fonts-ttf-dejavu = "${OE_QMAKE_PATH_QT_FONTS}/DejaVu*.ttf"
269FILES_${PN}-fonts-pfa = "${OE_QMAKE_PATH_LIBS}/fonts/*.pfa" 269FILES_${PN}-fonts-pfa = "${OE_QMAKE_PATH_QT_FONTS}/*.pfa"
270FILES_${PN}-fonts-pfb = "${OE_QMAKE_PATH_LIBS}/fonts/*.pfb" 270FILES_${PN}-fonts-pfb = "${OE_QMAKE_PATH_QT_FONTS}/*.pfb"
271FILES_${PN}-fonts-qpf = "${OE_QMAKE_PATH_LIBS}/fonts/*.qpf*" 271FILES_${PN}-fonts-qpf = "${OE_QMAKE_PATH_QT_FONTS}/*.qpf*"
272FILES_${PN}-fonts = "${OE_QMAKE_PATH_LIBS}/fonts/README \ 272FILES_${PN}-fonts = "${OE_QMAKE_PATH_QT_FONTS}/README \
273 ${OE_QMAKE_PATH_LIBS}/fonts/fontdir" 273 ${OE_QMAKE_PATH_QT_FONTS}/fontdir"
274 274
275RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 275RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
276 276
277sysroot_stage_dirs_append() { 277sysroot_stage_dirs_append() {
278 # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all 278 # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all
279 rm -rf $to${OE_QMAKE_PATH_LIBS}/fonts 279 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
280} 280}
281 281
282SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90" 282SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90"