From 9f406325451a20d8f10bf84e9d7c9818926d09f7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 22 Aug 2021 14:50:45 +0200 Subject: libgudev: upgrade 236 -> 237 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-gudevenumtypes-make-deterministic.patch | 44 ---------------------- meta/recipes-gnome/libgudev/libgudev_236.bb | 33 ---------------- meta/recipes-gnome/libgudev/libgudev_237.bb | 31 +++++++++++++++ 3 files changed, 31 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch delete mode 100644 meta/recipes-gnome/libgudev/libgudev_236.bb create mode 100644 meta/recipes-gnome/libgudev/libgudev_237.bb (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch b/meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch deleted file mode 100644 index aaec9cd20d..0000000000 --- a/meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch +++ /dev/null @@ -1,44 +0,0 @@ -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_236.bb b/meta/recipes-gnome/libgudev/libgudev_236.bb deleted file mode 100644 index 169b19e0a9..0000000000 --- a/meta/recipes-gnome/libgudev/libgudev_236.bb +++ /dev/null @@ -1,33 +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] = "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+))" - -# 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 diff --git a/meta/recipes-gnome/libgudev/libgudev_237.bb b/meta/recipes-gnome/libgudev/libgudev_237.bb new file mode 100644 index 0000000000..57417f4e7c --- /dev/null +++ b/meta/recipes-gnome/libgudev/libgudev_237.bb @@ -0,0 +1,31 @@ +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] = "0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa" + +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+))" + +# 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 -- cgit 1.2.3-korg