diff options
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 8 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb) | 2 |
2 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 07e37acf7d..2b8e930511 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 75c0423e1dc34fa20de70bc9932625fd0de4a912 Mon Sep 17 00:00:00 2001 | 1 | From 85931fbb981b5aae38f1c1370d5d3c091cb862b8 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 c420260..a023745 100644 | 22 | index dc4d6d3..da46906 100644 |
23 | --- a/gio/giomodule.c | 23 | --- a/gio/giomodule.c |
24 | +++ b/gio/giomodule.c | 24 | +++ b/gio/giomodule.c |
25 | @@ -47,6 +47,8 @@ | 25 | @@ -49,6 +49,8 @@ |
26 | #include "gmemorymonitordbus.h" | 26 | #include "gmemorymonitordbus.h" |
27 | #ifdef G_OS_WIN32 | 27 | #ifdef G_OS_WIN32 |
28 | #include "gregistrysettingsbackend.h" | 28 | #include "gregistrysettingsbackend.h" |
@@ -31,7 +31,7 @@ index c420260..a023745 100644 | |||
31 | #endif | 31 | #endif |
32 | #include <glib/gstdio.h> | 32 | #include <glib/gstdio.h> |
33 | 33 | ||
34 | @@ -1158,7 +1160,15 @@ get_gio_module_dir (void) | 34 | @@ -1163,7 +1165,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.66.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb index c803dbcf90..1f83660856 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.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] = "a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60" | 23 | SRC_URI[sha256sum] = "ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4" |
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. |