From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
v2 - oe.utils.contains -> bb.utils.contains
.../qt5/{qtbase_5.4.1.bbappend => qtbase_%.bbappend} | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
rename meta-arago-distro/recipes-qt/qt5/{qtbase_5.4.1.bbappend =>
qtbase_%.bbappend} (78%)
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
similarity index 78%
rename from meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
rename to meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
index d6e3f4d..2e9446c 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
@@ -5,7 +5,7 @@ GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland"
PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl
${GLES_EXTRA_DEPS}"
-PR_append = "-arago7"
+PR_append = "-arago8"
QT_CONFIG_FLAGS += "-qpa ${@base_contains('DISTRO_FEATURES', 'wayland',
'wayland', 'eglfs', d)}"
@@ -31,7 +31,7 @@ python do_patch_append() {
work_dir = d.getVar("WORKDIR", True)
s = d.getVar("S", True)
- if not oe.utils.contains('DISTRO_FEATURES','wayland',True,False,d):
+ if not bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d):
shutil.copy(os.path.join(work_dir,"quit.png"),os.path.join(s,"examples/widgets/animation/animatedtiles/images/"))
}
@@ -41,6 +41,15 @@ do_install_append () {
install -m 0644 ${WORKDIR}/${QT_ENV} ${D}${sysconfdir}/profile.d/qt_env.sh
}
+do_install_prepend () {
+ # install fonts manually if they are missing
+ if [ ! -d ${D}/${OE_QMAKE_PATH_LIBS}/fonts ]; then
+ mkdir -p ${D}/${OE_QMAKE_PATH_LIBS}/fonts
+ cp -a ${S}/lib/fonts/* ${D}/${OE_QMAKE_PATH_LIBS}/fonts
+ chown -R root:root ${D}/${OE_QMAKE_PATH_LIBS}/fonts
+ fi
+}
+
PACKAGES =+ "${PN}-conf"
FILES_${PN}-conf = "${sysconfdir}/profile.d/qt_env.sh"
--
2.2.0
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
