diff options
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 | 10 |
1 files changed, 5 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 fc320dcab8..fe87482ae2 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 8c623acdbea3ecc2812bbaafcfc892758fa978da Mon Sep 17 00:00:00 2001 | 1 | From 2a715765c6ceb2e8b4cc42e060aee75016111d1a 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,11 +19,11 @@ 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 1007abd..5380982 100644 | 22 | index c420260..a023745 100644 |
23 | --- a/gio/giomodule.c | 23 | --- a/gio/giomodule.c |
24 | +++ b/gio/giomodule.c | 24 | +++ b/gio/giomodule.c |
25 | @@ -44,6 +44,8 @@ | 25 | @@ -47,6 +47,8 @@ |
26 | #include "gnetworkmonitor.h" | 26 | #include "gmemorymonitordbus.h" |
27 | #ifdef G_OS_WIN32 | 27 | #ifdef G_OS_WIN32 |
28 | #include "gregistrysettingsbackend.h" | 28 | #include "gregistrysettingsbackend.h" |
29 | +#else | 29 | +#else |
@@ -32,7 +32,7 @@ index 1007abd..5380982 100644 | |||
32 | #include <glib/gstdio.h> | 32 | #include <glib/gstdio.h> |
33 | 33 | ||
34 | @@ -1158,7 +1160,15 @@ get_gio_module_dir (void) | 34 | @@ -1158,7 +1160,15 @@ get_gio_module_dir (void) |
35 | #endif | 35 | NULL); |
36 | g_free (install_dir); | 36 | g_free (install_dir); |
37 | #else | 37 | #else |
38 | - module_dir = g_strdup (GIO_MODULE_DIR); | 38 | - module_dir = g_strdup (GIO_MODULE_DIR); |