Convert to meson. Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> --- ...01-gudevenumtypes-make-deterministic.patch | 44 +++++++++++++++++++ .../{libgudev_234.bb => libgudev_236.bb} | 12 +++-- 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch rename meta/recipes-gnome/libgudev/{libgudev_234.bb => libgudev_236.bb} (70%)
diff --git a/meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch b/meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch new file mode 100644 index 0000000000..aaec9cd20d --- /dev/null +++ b/meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch @@ -0,0 +1,44 @@ +From 078c0db2bc3adf7c665190ee7a9263d7fd1ec618 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kana...@gmail.com> +Date: Thu, 29 Apr 2021 13:06:12 +0200 +Subject: [PATCH] gudevenumtypes: make deterministic + +@filename@ writes the full path to the generated file, +which can vary in CI systems and make outputs non-reproducible. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/15] +Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> +--- + gudev/gudevenumtypes.c.template | 2 +- + gudev/gudevenumtypes.h.template | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gudev/gudevenumtypes.c.template b/gudev/gudevenumtypes.c.template +index fc30b39..4918f7e 100644 +--- a/gudev/gudevenumtypes.c.template ++++ b/gudev/gudevenumtypes.c.template +@@ -4,7 +4,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/gudev/gudevenumtypes.h.template b/gudev/gudevenumtypes.h.template +index d0ab339..79bf7c4 100644 +--- a/gudev/gudevenumtypes.h.template ++++ b/gudev/gudevenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.30.2 + diff --git a/meta/recipes-gnome/libgudev/libgudev_234.bb b/meta/recipes-gnome/libgudev/libgudev_236.bb similarity index 70% rename from meta/recipes-gnome/libgudev/libgudev_234.bb rename to meta/recipes-gnome/libgudev/libgudev_236.bb index 9cea36df5b..daa578ddb1 100644 --- a/meta/recipes-gnome/libgudev/libgudev_234.bb +++ b/meta/recipes-gnome/libgudev/libgudev_236.bb @@ -5,18 +5,24 @@ other programming languages, such as Javascript, because of GObject \ introspection support." HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libgudev/issues" -SRC_URI[archive.sha256sum] = "1baeacacf0db42fa073ad5183d1decce9317857416a2b0f82ce3370d711a2e37" +SRC_URI[archive.sha256sum] = "e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524" -DEPENDS = "glib-2.0 udev" +SRC_URI_append = " file://0001-gudevenumtypes-make-deterministic.patch" -EXTRA_OECONF = "--disable-umockdev" +DEPENDS = "glib-2.0 udev" RCONFLICTS_${PN} = "systemd (<= 220)" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +GTKDOC_MESON_OPTION = "gtk_doc" + UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/" UPSTREAM_CHECK_REGEX = "(?P<pver>(\d+))" -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151283): https://lists.openembedded.org/g/openembedded-core/message/151283 Mute This Topic: https://lists.openembedded.org/mt/82607028/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-