From 751c8388c7f7584460bbf0c0f1d61e47372717af Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 12 Jun 2015 19:11:57 +0300 Subject: glib: add a warning suppression patch to glib Otherwise QA check will fail. Some schemas in gsettings-desktop-schemas (such as proxy and locale) are still using deprecated paths, as of 3.16.1. This causes warning messages, and meta/lib/oe/rootfs.py complaints about them. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...warning-about-deprecated-paths-in-schemas.patch | 36 ++++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch 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 @@ +From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 12 Jun 2015 17:08:46 +0300 +Subject: [PATCH] Remove the warning about deprecated paths in schemas + +Some schemas in gsettings-desktop-schemas (such as proxy and locale) +are still using deprecated paths, as of 3.16.1. This causes warning +messages, and meta/lib/oe/rootfs.py complaints about them. + +Upstream-Status: Inappropriate +Signed-off-by: Alexander Kanavin + +--- + gio/glib-compile-schemas.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index e42949b..ec79d7c 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state, + return; + } + +- if (path && (g_str_has_prefix (path, "/apps/") || +- g_str_has_prefix (path, "/desktop/") || +- g_str_has_prefix (path, "/system/"))) +- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " +- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); +- + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +2.1.4 + 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 \ file://uclibc.patch \ file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ file://allow-run-media-sdX-drive-mount-if-username-root.patch \ + file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ " SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" -- cgit 1.2.3-korg