summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-font
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-graphics/xorg-font
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-font')
-rw-r--r--meta/recipes-graphics/xorg-font/encodings_1.0.5.bb4
-rw-r--r--meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb4
-rw-r--r--meta/recipes-graphics/xorg-font/font-util_1.3.2.bb8
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-font-common.inc8
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb4
5 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb
index 713fcfb935..8ddbaf24dd 100644
--- a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb
@@ -10,7 +10,7 @@ PE = "1"
10PR = "r3" 10PR = "r3"
11 11
12DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" 12DEPENDS = "mkfontscale-native mkfontdir-native font-util-native"
13RDEPENDS_${PN} = "" 13RDEPENDS:${PN} = ""
14 14
15SRC_URI += "file://nocompiler.patch" 15SRC_URI += "file://nocompiler.patch"
16SRC_URI[md5sum] = "bbae4f247b88ccde0e85ed6a403da22a" 16SRC_URI[md5sum] = "bbae4f247b88ccde0e85ed6a403da22a"
@@ -21,5 +21,5 @@ inherit allarch
21EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" 21EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings"
22 22
23# postinst from .inc doesn't apply to this recipe 23# postinst from .inc doesn't apply to this recipe
24pkg_postinst_${PN} () { 24pkg_postinst:${PN} () {
25} 25}
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb
index e4b70c69dc..d80ecbeb8f 100644
--- a/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.4.bb
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \
13SRC_URI += "file://nocompiler.patch" 13SRC_URI += "file://nocompiler.patch"
14 14
15DEPENDS = "util-macros-native font-util-native" 15DEPENDS = "util-macros-native font-util-native"
16RDEPENDS_${PN} = "encodings font-util" 16RDEPENDS:${PN} = "encodings font-util"
17RDEPENDS_${PN}_class-native = "font-util-native" 17RDEPENDS:${PN}:class-native = "font-util-native"
18 18
19inherit allarch 19inherit allarch
20 20
diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb
index ebe7a603fa..8f2d10e25b 100644
--- a/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb
+++ b/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb
@@ -10,13 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5df208ec65eb84ce5bb8d82d8f3b9675 \
10 file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34" 10 file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34"
11 11
12DEPENDS = "encodings util-macros" 12DEPENDS = "encodings util-macros"
13DEPENDS_class-native = "util-macros-native" 13DEPENDS:class-native = "util-macros-native"
14RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" 14RDEPENDS:${PN} = "mkfontdir mkfontscale encodings"
15RDEPENDS_${PN}_class-native = "" 15RDEPENDS:${PN}:class-native = ""
16 16
17BBCLASSEXTEND = "native" 17BBCLASSEXTEND = "native"
18 18
19SRC_URI[md5sum] = "3d6adb76fdd072db8c8fae41b40855e8" 19SRC_URI[md5sum] = "3d6adb76fdd072db8c8fae41b40855e8"
20SRC_URI[sha256sum] = "3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282" 20SRC_URI[sha256sum] = "3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282"
21 21
22SYSROOT_DIRS_BLACKLIST_remove = "${datadir}/fonts" 22SYSROOT_DIRS_BLACKLIST:remove = "${datadir}/fonts"
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
index 7ca5c76a66..ba5840425c 100644
--- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc
+++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
@@ -5,7 +5,7 @@ SECTION = "x11/fonts"
5LICENSE = "MIT-X" 5LICENSE = "MIT-X"
6 6
7DEPENDS = " encodings font-alias font-util-native" 7DEPENDS = " encodings font-alias font-util-native"
8RDEPENDS_${PN} = "encodings font-util font-alias" 8RDEPENDS:${PN} = "encodings font-util font-alias"
9 9
10XORG_PN = "${BPN}" 10XORG_PN = "${BPN}"
11 11
@@ -19,17 +19,17 @@ REQUIRED_DISTRO_FEATURES = "x11"
19 19
20EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)" 20EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)"
21 21
22do_install_append() { 22do_install:append() {
23 find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f 23 find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f
24 find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f 24 find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f
25 find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f 25 find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f
26 find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f 26 find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f
27} 27}
28 28
29FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" 29FILES:${PN} += " ${libdir}/X11/fonts ${datadir}"
30 30
31PACKAGE_WRITE_DEPS += "mkfontdir-native mkfontscale-native" 31PACKAGE_WRITE_DEPS += "mkfontdir-native mkfontscale-native"
32pkg_postinst_${PN} () { 32pkg_postinst:${PN} () {
33 for fontdir in `find $D/usr/lib/X11/fonts -type d`; do 33 for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
34 mkfontdir $fontdir 34 mkfontdir $fontdir
35 mkfontscale $fontdir 35 mkfontscale $fontdir
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index f0c77f33bd..88f534ccf7 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -25,8 +25,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
25S = "${WORKDIR}/misc" 25S = "${WORKDIR}/misc"
26 26
27PACKAGES = "${PN}" 27PACKAGES = "${PN}"
28FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" 28FILES:${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
29RDEPENDS_${PN} += "font-alias" 29RDEPENDS:${PN} += "font-alias"
30 30
31do_install() { 31do_install() {
32 install -d ${D}/${datadir}/fonts/X11/misc 32 install -d ${D}/${datadir}/fonts/X11/misc