diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-11 11:40:45 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 11:48:46 +0100 |
commit | a8ff4b25c7bb5c983cd7e86bd60cd408ada0feaf (patch) | |
tree | f95555df460339437e550ad0ccd9a2a9dac6b8fb /meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | |
parent | 1c3c69d10095a8c14c622c81edc760bd6516953d (diff) | |
download | poky-a8ff4b25c7bb5c983cd7e86bd60cd408ada0feaf.tar.gz |
glib-2.0: update 2.68.4 -> 2.70.0
Internal copy of pcre is no longer provided.
(From OE-Core rev: e359ee75e67b72eeb73eddbc1bc46549e00dded5)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 8 |
1 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 846c8d62b6..9bfb6e85cc 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 dac2bdeea38388e069412aa27eff8f1eff0440e5 Mon Sep 17 00:00:00 2001 | 1 | From ab071f315deed3740f867161ee58436b985d6fc1 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,10 +19,10 @@ 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 a2909a8..1f4ab82 100644 | 22 | index d34037a..7442df6 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 | @@ -54,6 +54,8 @@ |
26 | #ifdef G_OS_WIN32 | 26 | #ifdef G_OS_WIN32 |
27 | #include "gregistrysettingsbackend.h" | 27 | #include "gregistrysettingsbackend.h" |
28 | #include "giowin32-priv.h" | 28 | #include "giowin32-priv.h" |
@@ -31,7 +31,7 @@ index a2909a8..1f4ab82 100644 | |||
31 | #endif | 31 | #endif |
32 | #include <glib/gstdio.h> | 32 | #include <glib/gstdio.h> |
33 | 33 | ||
34 | @@ -1213,7 +1215,15 @@ get_gio_module_dir (void) | 34 | @@ -1224,7 +1226,15 @@ get_gio_module_dir (void) |
35 | NULL); | 35 | NULL); |
36 | g_free (install_dir); | 36 | g_free (install_dir); |
37 | #else | 37 | #else |