From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
index 2e9446c..d32636f 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_%.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 = "-arago8"
+PR_append = "-arago9"
QT_CONFIG_FLAGS += "-qpa ${@base_contains('DISTRO_FEATURES', 'wayland',
'wayland', 'eglfs', d)}"
@@ -39,15 +39,8 @@ python do_patch_append() {
do_install_append () {
install -d ${D}${sysconfdir}/profile.d
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
+ cp -a ${B}/lib/libqt* ${D}${libdir}
}
PACKAGES =+ "${PN}-conf"
--
2.2.0
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
