[oe] [PATCH][WIP-for-5.7][meta-qt5 4/4] qtbase: remove fonts packages
Martin Jansa
martin.jansa at gmail.com
Fri Feb 19 11:04:19 UTC 2016
* fonts were removed from qtbase in:
commit c5ceabb9a1caf6b9b7615a28c3097f221772f645
Author: Laszlo Agocs <laszlo.agocs at theqtcompany.com>
Date: Mon Aug 17 18:32:41 2015 +0200
Purge all fonts
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../packagegroup-qt5-toolchain-target.bb | 1 -
recipes-qt/qt5/qtbase_git.bb | 40 ----------------------
2 files changed, 41 deletions(-)
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index cc4d4b5..eb8a740 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -40,7 +40,6 @@ RDEPENDS_${PN} += " \
${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-mkspecs', '', d)} \
${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-qmlplugins', '', d)} \
qtbase-dev \
- qtbase-fonts \
qtbase-mkspecs \
qtbase-plugins \
qtbase-staticdev \
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 65c1db5..a0e9c71 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -201,14 +201,6 @@ do_configure() {
do_install_append() {
install -m 0755 ${B}/bin/qmake-target ${D}/${bindir}${QT_DIR_NAME}/qmake
- ### Fix up the binaries to the right location
- ### TODO: FIX
- # install fonts manually if they are missing
- if [ ! -d ${D}/${OE_QMAKE_PATH_QT_FONTS} ]; then
- mkdir -p ${D}/${OE_QMAKE_PATH_QT_FONTS}
- cp -d ${S}/lib/fonts/* ${D}/${OE_QMAKE_PATH_QT_FONTS}
- chown -R root:root ${D}/${OE_QMAKE_PATH_QT_FONTS}
- fi
# Remove example.pro file as it is useless
rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro
@@ -224,38 +216,6 @@ do_install_append() {
${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
}
-PACKAGES =. " \
- ${PN}-fonts \
- ${PN}-fonts-ttf-vera \
- ${PN}-fonts-ttf-dejavu \
- ${PN}-fonts-pfa \
- ${PN}-fonts-pfb \
- ${PN}-fonts-qpf \
-"
-
-RRECOMMENDS_${PN}-fonts = " \
- ${PN}-fonts-ttf-vera \
- ${PN}-fonts-ttf-dejavu \
- ${PN}-fonts-pfa \
- ${PN}-fonts-pfb \
- ${PN}-fonts-qpf \
-"
-
-ALLOW_EMPTY_${PN}-fonts = "1"
-
-FILES_${PN}-fonts-ttf-vera = "${OE_QMAKE_PATH_QT_FONTS}/Vera*.ttf"
-FILES_${PN}-fonts-ttf-dejavu = "${OE_QMAKE_PATH_QT_FONTS}/DejaVu*.ttf"
-FILES_${PN}-fonts-pfa = "${OE_QMAKE_PATH_QT_FONTS}/*.pfa"
-FILES_${PN}-fonts-pfb = "${OE_QMAKE_PATH_QT_FONTS}/*.pfb"
-FILES_${PN}-fonts-qpf = "${OE_QMAKE_PATH_QT_FONTS}/*.qpf*"
-FILES_${PN}-fonts = "${OE_QMAKE_PATH_QT_FONTS}/README \
- ${OE_QMAKE_PATH_QT_FONTS}/fontdir"
-
RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
-sysroot_stage_dirs_append() {
- # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all
- rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
-}
-
SRCREV = "10742cf8949497b83b87133ed66ec119cb3ab08f"
--
2.7.1
More information about the Openembedded-devel
mailing list