summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-05-05 17:18:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-09 23:30:15 +0100
commitb36bf2f6d4eafa6dd0352c66802ff3854804b4bb (patch)
tree8e243bf3566b2140b9263712f89efec9e31dc43d /meta/recipes-gnome
parentab3a1f42621fe2bba18e0f139774c9568af47da0 (diff)
downloadpoky-b36bf2f6d4eafa6dd0352c66802ff3854804b4bb.tar.gz
libgudev: update 234 -> 236
Convert to meson. (From OE-Core rev: 80bf33236e26c57f441ebebce758afad9900f27e) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/libgudev/files/0001-gudevenumtypes-make-deterministic.patch44
-rw-r--r--meta/recipes-gnome/libgudev/libgudev_236.bb (renamed from meta/recipes-gnome/libgudev/libgudev_234.bb)12
2 files changed, 53 insertions, 3 deletions
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 @@
1From 078c0db2bc3adf7c665190ee7a9263d7fd1ec618 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 29 Apr 2021 13:06:12 +0200
4Subject: [PATCH] gudevenumtypes: make deterministic
5
6@filename@ writes the full path to the generated file,
7which can vary in CI systems and make outputs non-reproducible.
8
9Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/15]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 gudev/gudevenumtypes.c.template | 2 +-
13 gudev/gudevenumtypes.h.template | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/gudev/gudevenumtypes.c.template b/gudev/gudevenumtypes.c.template
17index fc30b39..4918f7e 100644
18--- a/gudev/gudevenumtypes.c.template
19+++ b/gudev/gudevenumtypes.c.template
20@@ -4,7 +4,7 @@
21 /*** END file-header ***/
22
23 /*** BEGIN file-production ***/
24-/* enumerations from "@filename@" */
25+/* enumerations from "@basename@" */
26 /*** END file-production ***/
27
28 /*** BEGIN value-header ***/
29diff --git a/gudev/gudevenumtypes.h.template b/gudev/gudevenumtypes.h.template
30index d0ab339..79bf7c4 100644
31--- a/gudev/gudevenumtypes.h.template
32+++ b/gudev/gudevenumtypes.h.template
33@@ -9,7 +9,7 @@ G_BEGIN_DECLS
34
35 /*** BEGIN file-production ***/
36
37-/* enumerations from "@filename@" */
38+/* enumerations from "@basename@" */
39 /*** END file-production ***/
40
41 /*** BEGIN value-header ***/
42--
432.30.2
44
diff --git a/meta/recipes-gnome/libgudev/libgudev_234.bb b/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 \
5introspection support." 5introspection support."
6HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev" 6HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev"
7BUGTRACKER = "https://gitlab.gnome.org/GNOME/libgudev/issues" 7BUGTRACKER = "https://gitlab.gnome.org/GNOME/libgudev/issues"
8SRC_URI[archive.sha256sum] = "1baeacacf0db42fa073ad5183d1decce9317857416a2b0f82ce3370d711a2e37" 8SRC_URI[archive.sha256sum] = "e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524"
9 9
10DEPENDS = "glib-2.0 udev" 10SRC_URI_append = " file://0001-gudevenumtypes-make-deterministic.patch"
11 11
12EXTRA_OECONF = "--disable-umockdev" 12DEPENDS = "glib-2.0 udev"
13 13
14RCONFLICTS_${PN} = "systemd (<= 220)" 14RCONFLICTS_${PN} = "systemd (<= 220)"
15 15
16LICENSE = "LGPLv2.1" 16LICENSE = "LGPLv2.1"
17LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 17LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
18 18
19GNOMEBASEBUILDCLASS = "meson"
19inherit gnomebase gobject-introspection gtk-doc 20inherit gnomebase gobject-introspection gtk-doc
20 21
22GIR_MESON_ENABLE_FLAG = 'enabled'
23GIR_MESON_DISABLE_FLAG = 'disabled'
24
25GTKDOC_MESON_OPTION = "gtk_doc"
26
21UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/" 27UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/"
22UPSTREAM_CHECK_REGEX = "(?P<pver>(\d+))" 28UPSTREAM_CHECK_REGEX = "(?P<pver>(\d+))"