From b36bf2f6d4eafa6dd0352c66802ff3854804b4bb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 5 May 2021 17:18:06 +0200 Subject: libgudev: update 234 -> 236 Convert to meson. (From OE-Core rev: 80bf33236e26c57f441ebebce758afad9900f27e) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-gudevenumtypes-make-deterministic.patch | 44 ++++++++++++++++++++++ meta/recipes-gnome/libgudev/libgudev_234.bb | 22 ----------- meta/recipes-gnome/libgudev/libgudev_236.bb | 28 ++++++++++++++ 3 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch delete mode 100644 meta/recipes-gnome/libgudev/libgudev_234.bb create mode 100644 meta/recipes-gnome/libgudev/libgudev_236.bb (limited to 'meta/recipes-gnome/libgudev') 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 +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 +--- + 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_234.bb deleted file mode 100644 index 9cea36df5b..0000000000 --- a/meta/recipes-gnome/libgudev/libgudev_234.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "GObject wrapper for libudev" -DESCRIPTION = "This library makes it much simpler to use libudev from programs \ -already using GObject. It also makes it possible to easily use libudev from \ -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" - -DEPENDS = "glib-2.0 udev" - -EXTRA_OECONF = "--disable-umockdev" - -RCONFLICTS_${PN} = "systemd (<= 220)" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -inherit gnomebase gobject-introspection gtk-doc - -UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/" -UPSTREAM_CHECK_REGEX = "(?P(\d+))" diff --git a/meta/recipes-gnome/libgudev/libgudev_236.bb b/meta/recipes-gnome/libgudev/libgudev_236.bb new file mode 100644 index 0000000000..daa578ddb1 --- /dev/null +++ b/meta/recipes-gnome/libgudev/libgudev_236.bb @@ -0,0 +1,28 @@ +SUMMARY = "GObject wrapper for libudev" +DESCRIPTION = "This library makes it much simpler to use libudev from programs \ +already using GObject. It also makes it possible to easily use libudev from \ +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] = "e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524" + +SRC_URI_append = " file://0001-gudevenumtypes-make-deterministic.patch" + +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(\d+))" -- cgit v1.2.3-54-g00ecf