cantarell-fonts: fix SRC_URI

Since oe-core fa8950d0c the logic to turn a version into a directory name
doesn't work for versions which are too short.

Solve this by overriding gnome_verdir() to return the version as-is, as
that is what the directory is called.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
index 8dc4ceb399e8604a72deee847c2133380a6f0cff..b0ce56127d8ddb8001ec0f2f61b64d2de94b5e05 100644 (file)
--- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
+++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb
@@ -20,3 +20,8 @@ HASHEQUIV_HASH_VERSION .= ".2"
 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