From eef7883587acc933d6f34b559ec03ff84d18573b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 14 Nov 2017 16:57:35 +0200 Subject: glib-2.0: update to 2.54.2 LGPL version has been updated from 2.0 to 2.1, adjust the checksums accordingly. Rebase various patches. A few tools have been rewritten from perl (or C) to python, so add a patch that avoids hardcoding the python path in the shebang, and remove previous patching with sed. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...warning-about-deprecated-paths-in-schemas.patch | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to '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 index 41a190eddf..67ca6240bc 100644 --- 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 @@ -1,7 +1,7 @@ -From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001 +From 2acf40361eecd17c6981743dabd06e25a9934258 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 +Subject: [PATCH 05/10] 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 @@ -11,26 +11,33 @@ Upstream-Status: Inappropriate Signed-off-by: Alexander Kanavin --- - gio/glib-compile-schemas.c | 6 ------ - 1 file changed, 6 deletions(-) + gio/glib-compile-schemas.c | 13 ------------- + 1 file changed, 13 deletions(-) diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index e42949b..ec79d7c 100644 +index b8de090..130f89b 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c -@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state, +@@ -1219,19 +1219,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); +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } - state->schema_state = schema_state_new (path, gettext_domain, extends, extends_name, list_of); -- -2.1.4 +2.14.1 -- cgit 1.2.3-korg