Incorrectly set git regex meant we were stuck with a 4 year old version. Use tarballs as they contain prebuilt font files; building them from source requires a bunch of obscure dependencies.
Contains portions of libglyph which are Apache 2.x licensed. Signed-off-by: Alexander Kanavin <[email protected]> --- .../cantarell-fonts/cantarell-fonts_0.201.bb | 18 +++++++++++++ .../cantarell-fonts/cantarell-fonts_git.bb | 25 ------------------- 2 files changed, 18 insertions(+), 25 deletions(-) create mode 100644 meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb delete mode 100644 meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb new file mode 100644 index 0000000000..29e839b6b2 --- /dev/null +++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb @@ -0,0 +1,18 @@ +SUMMARY = "Cantarell, a Humanist sans-serif font family" + +DESCRIPTION = "The Cantarell font typeface is designed as a \ + contemporary Humanist sans serif, and was developed for \ + on-screen reading; in particular, reading web pages on an \ + HTC Dream mobile phone." + +HOMEPAGE = "https://gitlab.gnome.org/GNOME/cantarell-fonts/"; +SECTION = "fonts" +LICENSE = "OFL-1.1 & Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7" + +inherit gnomebase meson allarch fontcache pkgconfig +SRC_URI[archive.sha256sum] = "b61f64e5f6a48aa0abc7a53cdcbce60de81908ca36048a64730978fcd9ac9863" + +EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" + +FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb deleted file mode 100644 index db480bd397..0000000000 --- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Cantarell, a Humanist sans-serif font family" - -DESCRIPTION = "The Cantarell font typeface is designed as a \ - contemporary Humanist sans serif, and was developed for \ - on-screen reading; in particular, reading web pages on an \ - HTC Dream mobile phone." - -HOMEPAGE = "https://gitlab.gnome.org/GNOME/cantarell-fonts/"; -SECTION = "fonts" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=df91e3ffcab8cfb972a66bf11255188d" - -PV = "0.0.25" - -SRCREV = "e28a9096da43984212b5b4002b949bcb8c7527f9" -SRC_URI = "git://gitlab.gnome.org/GNOME/cantarell-fonts.git;protocol=https;branch=reconstruction-0.0.25" -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!0\.13)(?!0\.10\.1)\d+\.\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit autotools allarch fontcache pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[fontforge] = "--enable-source-rebuild=yes,--enable-source-rebuild=no,fontforge-native" -FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" -- 2.29.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#145316): https://lists.openembedded.org/g/openembedded-core/message/145316 Mute This Topic: https://lists.openembedded.org/mt/78718061/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
