t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-07 06:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: remove fonts packages

Browse Source 
* 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>
This commit is contained in:
Martin Jansa
2016-02-19 11:56:42 +01:00
parent 9758a7aff6
commit 8034aa9807
2 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
View File

@@ -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 \

40
recipes-qt/qt5/qtbase_git.bb
View File

@@ -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"