[PATCH 1/2] libgudev: fix SRC_URI

[PATCH 1/2] libgudev: fix SRC_URI

[Ross Burton]

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>
---
 meta/recipes-gnome/libgudev/libgudev_236.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-gnome/libgudev/libgudev_236.bb b/meta/recipes-gnome/libgudev/libgudev_236.bb
index daa578ddb19..5d1d2d782be 100644
--- a/meta/recipes-gnome/libgudev/libgudev_236.bb
+++ b/meta/recipes-gnome/libgudev/libgudev_236.bb
@@ -26,3 +26,8 @@ GTKDOC_MESON_OPTION = "gtk_doc"
 
 UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>(\d+))"
+
+# 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.25.1

[PATCH 2/2] cantarell-fonts: fix SRC_URI

[Ross Burton]

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>
---
 .../cantarell-fonts/cantarell-fonts_0.301.bb                 | 5 +++++
 1 file changed, 5 insertions(+)

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 8dc4ceb399e..b0ce56127d8 100644
--- 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
-- 
2.25.1