[22/26] cantarell-fonts: update 0.301 -> 0.303.1

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...antarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
 rename meta/recipes-graphics/cantarell-fonts/{cantarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} (73%)

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> Sent: den 15 december 2021 23:41
> To: openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin <alex@linutronix.de>
> Subject: [OE-core] [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...antarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
>  rename meta/recipes-graphics/cantarell-fonts/{cantarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} (73%)
> 
> diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> similarity index 73%
> rename from meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
> rename to meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> index 8e39ef025f..a92f9cb729 100644
> --- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
> +++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> @@ -11,17 +11,11 @@ LICENSE = "OFL-1.1 & Apache-2.0"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7"
> 
>  inherit gnomebase meson allarch fontcache pkgconfig
> -SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"
> +SRC_URI[archive.sha256sum] = "f9463a0659c63e57e381fdd753cf1929225395c5b49135989424761830530411"
> 
>  # remove at next version upgrade or when output changes
> -PR = "r1"
>  HASHEQUIV_HASH_VERSION .= ".2"

Shouldn't all three lines above be removed now that the version changes?

> 
>  EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false"
> 
>  FILES:${PN} = "${datadir}/fonts ${datadir}/fontconfig"
> -
> -# This isn't a GNOME-style version do gnome_verdir fails. Just return the
> -# version as that is how the directory is structured.
> -def gnome_verdir(v):
> -    return v
> --
> 2.20.1

//Peter

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> Sent: den 22 december 2021 03:12
> To: Alexander Kanavin <alex.kanavin@gmail.com>; openembedded-core@lists.openembedded.org
> Cc: Alexander Kanavin <alex@linutronix.de>
> Subject: Re: [OE-core] [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
> 
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> > Sent: den 15 december 2021 23:41
> > To: openembedded-core@lists.openembedded.org
> > Cc: Alexander Kanavin <alex@linutronix.de>
> > Subject: [OE-core] [PATCH 22/26] cantarell-fonts: update 0.301 -> 0.303.1
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  ...antarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} | 8 +-------
> >  1 file changed, 1 insertion(+), 7 deletions(-)
> >  rename meta/recipes-graphics/cantarell-fonts/{cantarell-fonts_0.301.bb => cantarell-fonts_0.303.1.bb} (73%)
> >
> > diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> > similarity index 73%
> > rename from meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
> > rename to meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> > index 8e39ef025f..a92f9cb729 100644
> > --- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
> > +++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.303.1.bb
> > @@ -11,17 +11,11 @@ LICENSE = "OFL-1.1 & Apache-2.0"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7"
> >
> >  inherit gnomebase meson allarch fontcache pkgconfig
> > -SRC_URI[archive.sha256sum] = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"
> > +SRC_URI[archive.sha256sum] = "f9463a0659c63e57e381fdd753cf1929225395c5b49135989424761830530411"
> >
> >  # remove at next version upgrade or when output changes
> > -PR = "r1"
> >  HASHEQUIV_HASH_VERSION .= ".2"
> 
> Shouldn't all three lines above be removed now that the version changes?

Never mind. I just saw that RP had fixed it before integrating the change.

> >
> >  EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false"
> >
> >  FILES:${PN} = "${datadir}/fonts ${datadir}/fontconfig"
> > -
> > -# This isn't a GNOME-style version do gnome_verdir fails. Just return the
> > -# version as that is how the directory is structured.
> > -def gnome_verdir(v):
> > -    return v
> > --
> > 2.20.1
> 
> //Peter

//Peter