Re: [oe] [meta-oe][PATCH v2] [PATCH] takao-fonts: It should be in ttf-fonts directory as the other ttf fonts.

Re: [oe] [meta-oe][PATCH v2] [PATCH] takao-fonts: It should be in ttf-fonts directory as the other ttf fonts.

[Khem Raj]

On 8/16/21 3:24 AM, leimaohui wrote:
> - 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>
> ---
>   .../packagegroups/packagegroup-meta-oe.bb        |  2 +-
>   .../ttf-takao_003.03.01.bb}                      | 16 +++++++++++-----
>   2 files changed, 12 insertions(+), 6 deletions(-)
>   rename meta-oe/recipes-graphics/{takao-fonts/takao-fonts_003.03.01.bb => ttf-fonts/ttf-takao_003.03.01.bb} (56%)
> 

I think this is still not a complete fix there are more recipes in 
meta-openembedded repo which have direct dependency on this recipe, 
please check those out too. I did mention full list in my last message

> diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
> index d46447d33..b7abe2197 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
> similarity index 56%
> rename from meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb
> rename to meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
> index 9ddfc6ae7..be0e544cc 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"
> 
> 
> 
> 
> 

[oe] [meta-oe][PATCH] packagegroup-meta-oe: Update ttf-ipa package name.

[leimaohui]

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index b7abe2197..0e58d9b65 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -524,7 +524,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\
     ttf-gentium \
     ttf-hunky-sans \
     ttf-hunky-serif \
-    ttf-ipa \
+    ttf-ipag ttf-ipagp ttf-ipamp ttf-ipam \
     ttf-lohit \
     ttf-inconsolata \
     ttf-liberation-sans-narrow \
-- 
2.25.1

[oe] [meta-oe][PATCH v2] [PATCH] takao-fonts: It should be in ttf-fonts directory as the other ttf fonts.

[leimaohui]

- 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>
---
 .../packagegroups/packagegroup-meta-oe.bb        |  2 +-
 .../ttf-takao_003.03.01.bb}                      | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-graphics/{takao-fonts/takao-fonts_003.03.01.bb => ttf-fonts/ttf-takao_003.03.01.bb} (56%)

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index d46447d33..b7abe2197 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
similarity index 56%
rename from meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb
rename to meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
index 9ddfc6ae7..be0e544cc 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"
-- 
2.25.1

Re: [oe] [meta-oe][PATCH v2] [PATCH] takao-fonts: It should be in ttf-fonts directory as the other ttf fonts.

[leimaohui]

Hi Khem,


> I think this is still not a complete fix there are more recipes in
> meta-openembedded repo which have direct dependency on this recipe, please
> check those out too. I did mention full list in my last message

I'm sorry that I forgot to send another patch to fix uim which depends on takao. 
I think it is a miss that added takao to DEPENDS of uim. So, I submitted a patch that deleted takao from uim DEPENDS.

Best regards
Lei

> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Monday, August 16, 2021 2:31 PM
> To: Lei, Maohui <leimaohui@fujitsu.com>;
> openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH v2] [PATCH] takao-fonts: It should be in
> ttf-fonts directory as the other ttf fonts.
> 
> 
> 
> On 8/16/21 3:24 AM, leimaohui wrote:
> > - 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>
> > ---
> >   .../packagegroups/packagegroup-meta-oe.bb        |  2 +-
> >   .../ttf-takao_003.03.01.bb}                      | 16
> +++++++++++-----
> >   2 files changed, 12 insertions(+), 6 deletions(-)
> >   rename
> > meta-oe/recipes-graphics/{takao-fonts/takao-fonts_003.03.01.bb =>
> > ttf-fonts/ttf-takao_003.03.01.bb} (56%)
> >
> 
> I think this is still not a complete fix there are more recipes in
> meta-openembedded repo which have direct dependency on this recipe, please
> check those out too. I did mention full list in my last message
> 
> > diff --git
> > a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
> > b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
> > index d46447d33..b7abe2197 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
> > similarity index 56%
> > rename from
> > meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb
> > rename to meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
> > index 9ddfc6ae7..be0e544cc 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=6cd3351ba979cf9db1fad644
> e8221276"
> > +
> >   SRC_URI =
> "https://launchpad.net/${BPN}/trunk/15.03/+download/TakaoFonts_00303.01.t
> ar.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"
> >
> >
> >
> > 
> >