diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-19 11:56:42 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-02 15:17:13 +0200 |
| commit | 8034aa98076649e452798ff23285249dac7f19fc (patch) | |
| tree | ff6dc88793d2d54aa11b8712a3c0d78f54e2fdb9 | |
| parent | 9758a7aff69fde12b7b2cf82f1934edd6abc9e77 (diff) | |
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>
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 40 |
2 files changed, 0 insertions, 41 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index f64db8f0..c26a7079 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} += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-mkspecs', '', d)} \ ${@bb.utils.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 42a57e84..766424e9 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 += "${@bb.utils.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 = "84330007e12122bf1b690a4e68b5ef8e973c7882" |