diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-24 11:13:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 22:36:09 +0100 |
commit | dfae094307dcdcd067c47eaeaa37e91f2482d101 (patch) | |
tree | 639183ded70e70cdb8f56f13ab5814aa14452c6f /meta/recipes-core | |
parent | 5477beb7dbf52577d36bf833e768b088b09bd2e9 (diff) | |
download | poky-dfae094307dcdcd067c47eaeaa37e91f2482d101.tar.gz |
glib-2.0: update 2.68.1 -> 2.68.2
(From OE-Core rev: 19b459c60f40d0fa6b1d6d439346b846b11a60fd)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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.2.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb) | 2 |
2 files changed, 4 insertions, 4 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 7cf89c8718..7fbc07af58 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 ff790dd7086e28896f8e7630135f756cc6f06c80 Mon Sep 17 00:00:00 2001 | 1 | From b7abbba886d3743616f8cc0e8b441c879128bbda 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 |
@@ -19,7 +19,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
19 | 1 file changed, 11 insertions(+), 1 deletion(-) | 19 | 1 file changed, 11 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/gio/giomodule.c b/gio/giomodule.c | 21 | diff --git a/gio/giomodule.c b/gio/giomodule.c |
22 | index ca1daf2..954a250 100644 | 22 | index a2909a8..1f4ab82 100644 |
23 | --- a/gio/giomodule.c | 23 | --- a/gio/giomodule.c |
24 | +++ b/gio/giomodule.c | 24 | +++ b/gio/giomodule.c |
25 | @@ -51,6 +51,8 @@ | 25 | @@ -51,6 +51,8 @@ |
@@ -31,7 +31,7 @@ index ca1daf2..954a250 100644 | |||
31 | #endif | 31 | #endif |
32 | #include <glib/gstdio.h> | 32 | #include <glib/gstdio.h> |
33 | 33 | ||
34 | @@ -1212,7 +1214,15 @@ get_gio_module_dir (void) | 34 | @@ -1213,7 +1215,15 @@ get_gio_module_dir (void) |
35 | NULL); | 35 | NULL); |
36 | g_free (install_dir); | 36 | g_free (install_dir); |
37 | #else | 37 | #else |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.2.bb index accc2cada2..0cf16884ef 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.2.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] = "241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333" | 23 | SRC_URI[sha256sum] = "ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb" |
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. |