aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleimaohui <leimaohui@fujitsu.com>2021-08-16 18:24:58 +0800
committerKhem Raj <raj.khem@gmail.com>2021-08-17 08:15:01 -0700
commitf58bd1789ad840b04fa36212d67cebbe14ed21e5 (patch)
tree5c8cc7d13dd54795e5e29fcb3f4b2aaef2e770e3
parentb8297bc6bdf9bd8826b28479208b74eaf95fd78f (diff)
downloadmeta-openembedded-contrib-f58bd1789ad840b04fa36212d67cebbe14ed21e5.tar.gz
meta-openembedded-contrib-f58bd1789ad840b04fa36212d67cebbe14ed21e5.tar.bz2
meta-openembedded-contrib-f58bd1789ad840b04fa36212d67cebbe14ed21e5.zip
takao-fonts: It should be in ttf-fonts directory as the other ttf fonts.
- Moved it to ttf-fonts directory. - Rename to ttf-takao. - Use ttf.inc instead of rewrite do_install. Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
-rw-r--r--meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb (renamed from meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb)16
2 files changed, 12 insertions, 6 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index ed91e1c94a..0e58d9b653 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -493,7 +493,6 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\
packagegroup-fonts-truetype \
qrencode \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "st", "", d)} \
- takao-fonts \
leptonica \
libvncserver \
libmng \
@@ -537,6 +536,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\
ttf-noto-emoji-regular \
ttf-sazanami-gothic \
ttf-sazanami-mincho \
+ ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho \
ttf-tlwg \
ttf-roboto \
ttf-wqy-zenhei \
diff --git a/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
index 9ddfc6ae73..be0e544ccc 100644
--- a/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
@@ -1,3 +1,5 @@
+require ttf.inc
+
SUMMARY = "Takao Fonts are a community developed derivatives of IPA Fonts."
DESCRIPTION = "Takao Fonts are a community developed derivatives of IPA Fonts."
@@ -6,14 +8,18 @@ SECTION = "User Interface/X"
LICENSE = "IPA"
LIC_FILES_CHKSUM = "file://IPA_Font_License_Agreement_v1.0.txt;md5=6cd3351ba979cf9db1fad644e8221276"
+
SRC_URI = "https://launchpad.net/${BPN}/trunk/15.03/+download/TakaoFonts_00303.01.tar.xz"
-SRC_URI[md5sum] = "8cd3fe724faa5034a9369e98cf108d2d"
SRC_URI[sha256sum] = "e9871f72ac69acb3e277aebbee7ca01fbebf54800733e29fafdc46133fc3552f"
S = "${WORKDIR}/TakaoFonts_00303.01"
-do_install() {
- install -m 0755 -d ${D}/${datadir}/fonts
- install -m 0644 -p ${S}/*.ttf ${D}/${datadir}/fonts/
-}
+
+PACKAGES = "ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho"
+FONT_PACKAGES = "ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho"
+
+FILES:ttf-takao-pgothic = "${datadir}/fonts/truetype/TakaoPGothic.ttf"
+FILES:ttf-takao-gothic = "${datadir}/fonts/truetype/TakaoGothic.ttf"
+FILES:ttf-takao-pmincho = "${datadir}/fonts/truetype/TakaoPMincho.ttf"
+FILES:ttf-takao-mincho = "${datadir}/fonts/truetype/TakaoMincho.ttf"
FILES:${PN} += "${datadir}/fonts/*.ttf"