diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-05 17:17:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-06 12:12:58 +0100 |
commit | 1681d34e4bbbe0d367dcac5267b82cbf7d1a5bf3 (patch) | |
tree | aef2df2fe86aa2710f0badce55b4af75884d29ca /meta | |
parent | 3533549e78f35d9a7a67fd13646aa048dec32159 (diff) | |
download | poky-1681d34e4bbbe0d367dcac5267b82cbf7d1a5bf3.tar.gz |
glib-2.0: update 2.68.0 -> 2.68.1
(From OE-Core rev: 1e8959da12afbde05060c5ee0019a28fd6945ef2)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 6 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.68.0.bb) | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index e3001762ad..7cf89c8718 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 011c9f024b6475d31e7d5432a38d00fb67eaea40 Mon Sep 17 00:00:00 2001 | 1 | From ff790dd7086e28896f8e7630135f756cc6f06c80 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 | 3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 |
4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds | 4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds |
@@ -13,6 +13,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
13 | 13 | ||
14 | Port patch to 2.48 | 14 | Port patch to 2.48 |
15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
16 | |||
16 | --- | 17 | --- |
17 | gio/giomodule.c | 12 +++++++++++- | 18 | gio/giomodule.c | 12 +++++++++++- |
18 | 1 file changed, 11 insertions(+), 1 deletion(-) | 19 | 1 file changed, 11 insertions(+), 1 deletion(-) |
@@ -47,6 +48,3 @@ index ca1daf2..954a250 100644 | |||
47 | #endif | 48 | #endif |
48 | } | 49 | } |
49 | 50 | ||
50 | -- | ||
51 | 2.25.1 | ||
52 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb index 94d24318c3..accc2cada2 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.0.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
20 | " | 20 | " |
21 | SRC_URI_append_class-native = " file://relocate-modules.patch" | 21 | SRC_URI_append_class-native = " file://relocate-modules.patch" |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea" | 23 | SRC_URI[sha256sum] = "241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333" |
24 | 24 | ||
25 | # Find any meson cross files in FILESPATH that are relevant for the current | 25 | # Find any meson cross files in FILESPATH that are relevant for the current |
26 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 26 | # build (using siteinfo) and add them to EXTRA_OEMESON. |