Commit 8bda2099 authored by Florent Revest's avatar Florent Revest

ttf-*: Install fonts where fontconfig searches them (/usr/share/fonts)

parent 550eb30c
...@@ -12,7 +12,7 @@ inherit qmake5 ...@@ -12,7 +12,7 @@ inherit qmake5
DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents nemo-qml-plugin-configuration" DEPENDS += "qml-asteroid mapplauncherd-booster-qtcomponents nemo-qml-plugin-configuration"
RDEPENDS_${PN} += "nemo-qml-plugin-configuration" RDEPENDS_${PN} += "nemo-qml-plugin-configuration"
FILES_${PN} += "/usr/share/translations/ /usr/lib/fonts" FILES_${PN} += "/usr/share/translations/ /usr/share/fonts"
do_install_append() { do_install_append() {
lrelease ${S}/i18n/asteroid-weather.*.ts lrelease ${S}/i18n/asteroid-weather.*.ts
......
...@@ -18,8 +18,8 @@ FONT_PACKAGES = "ttf-opensans" ...@@ -18,8 +18,8 @@ FONT_PACKAGES = "ttf-opensans"
do_install() { do_install() {
# Different versions of OE seems to require different places for fonts so we install in both share and lib... # Different versions of OE seems to require different places for fonts so we install in both share and lib...
install -d ${D}/${OE_QMAKE_PATH_QT_FONTS} install -d ${D}/usr/share/fonts/
find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/${OE_QMAKE_PATH_QT_FONTS} \; find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/usr/share/fonts/ \;
} }
FILES_${PN} += "${OE_QMAKE_PATH_QT_FONTS}" FILES_${PN} += "/usr/share/fonts/"
...@@ -18,8 +18,8 @@ FONT_PACKAGES = "ttf-orbitron" ...@@ -18,8 +18,8 @@ FONT_PACKAGES = "ttf-orbitron"
do_install() { do_install() {
# Different versions of OE seems to require different places for fonts so we install in both share and lib... # Different versions of OE seems to require different places for fonts so we install in both share and lib...
install -d ${D}/${OE_QMAKE_PATH_QT_FONTS} install -d ${D}/usr/share/fonts/
find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/${OE_QMAKE_PATH_QT_FONTS} \; find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/usr/share/fonts \;
} }
FILES_${PN} += "${OE_QMAKE_PATH_QT_FONTS}" FILES_${PN} += "/usr/share/fonts"
...@@ -18,8 +18,8 @@ FONT_PACKAGES = "ttf-raleway" ...@@ -18,8 +18,8 @@ FONT_PACKAGES = "ttf-raleway"
do_install() { do_install() {
# Different versions of OE seems to require different places for fonts so we install in both share and lib... # Different versions of OE seems to require different places for fonts so we install in both share and lib...
install -d ${D}/${OE_QMAKE_PATH_QT_FONTS} install -d ${D}/usr/share/fonts/
find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/${OE_QMAKE_PATH_QT_FONTS} \; find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/usr/share/fonts/ \;
} }
FILES_${PN} += "${OE_QMAKE_PATH_QT_FONTS}" FILES_${PN} += "/usr/share/fonts/"
...@@ -21,8 +21,8 @@ do_compile() { ...@@ -21,8 +21,8 @@ do_compile() {
do_install() { do_install() {
# Different versions of OE seems to require different places for fonts so we install in both share and lib... # Different versions of OE seems to require different places for fonts so we install in both share and lib...
install -d ${D}/${OE_QMAKE_PATH_QT_FONTS} install -d ${D}/usr/share/fonts/
find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/${OE_QMAKE_PATH_QT_FONTS} \; find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}/usr/share/fonts/ \;
} }
FILES_${PN} += "${OE_QMAKE_PATH_QT_FONTS}" FILES_${PN} += "/usr/share/fonts/"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment