summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch36
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
new file mode 100644
index 0000000000..41a190eddf
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -0,0 +1,36 @@
1From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 12 Jun 2015 17:08:46 +0300
4Subject: [PATCH] Remove the warning about deprecated paths in schemas
5
6Some schemas in gsettings-desktop-schemas (such as proxy and locale)
7are still using deprecated paths, as of 3.16.1. This causes warning
8messages, and meta/lib/oe/rootfs.py complaints about them.
9
10Upstream-Status: Inappropriate
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
14 gio/glib-compile-schemas.c | 6 ------
15 1 file changed, 6 deletions(-)
16
17diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
18index e42949b..ec79d7c 100644
19--- a/gio/glib-compile-schemas.c
20+++ b/gio/glib-compile-schemas.c
21@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state,
22 return;
23 }
24
25- if (path && (g_str_has_prefix (path, "/apps/") ||
26- g_str_has_prefix (path, "/desktop/") ||
27- g_str_has_prefix (path, "/system/")))
28- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
29- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
30-
31 state->schema_state = schema_state_new (path, gettext_domain,
32 extends, extends_name, list_of);
33
34--
352.1.4
36
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
index 8eaccfbb1a..1e3d36af1c 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
14 file://uclibc.patch \ 14 file://uclibc.patch \
15 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ 15 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
16 file://allow-run-media-sdX-drive-mount-if-username-root.patch \ 16 file://allow-run-media-sdX-drive-mount-if-username-root.patch \
17 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
17 " 18 "
18 19
19SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 20SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"