From bc7c8b50f16dae05afd73302b497d31cb86b2e7ba6d53cfd37e8f284d2dfdfdf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 9 Jun 2012 10:31:02 +0000 Subject: [PATCH] Accepting request 124266 from home:badshah400:branches:GNOME:Factory Add patch to suppress deprecated paths in schema warnings; fixes rh#814053 (patched build tested, works). OBS-URL: https://build.opensuse.org/request/show/124266 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=199 --- ...press-schema-deprecated-path-warning.patch | 20 +++++++++++++++++++ glib2.changes | 6 ++++++ glib2.spec | 3 +++ 3 files changed, 29 insertions(+) create mode 100644 glib2-suppress-schema-deprecated-path-warning.patch diff --git a/glib2-suppress-schema-deprecated-path-warning.patch b/glib2-suppress-schema-deprecated-path-warning.patch new file mode 100644 index 0000000..334ba03 --- /dev/null +++ b/glib2-suppress-schema-deprecated-path-warning.patch @@ -0,0 +1,20 @@ +Index: glib-2.32.3/gio/glib-compile-schemas.c +=================================================================== +--- glib-2.32.3.orig/gio/glib-compile-schemas.c ++++ glib-2.32.3/gio/glib-compile-schemas.c +@@ -1204,12 +1204,14 @@ parse_state_start_schema (ParseState *s + 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); + diff --git a/glib2.changes b/glib2.changes index 20800c5..3e9727c 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 8 02:29:24 UTC 2012 - badshah400@gmail.com + +- Add glib2-suppress-schema-deprecated-path-warning.patch to + suppress warnings about deprecated paths in schemas (rh#814053). + ------------------------------------------------------------------- Fri May 18 13:56:57 UTC 2012 - gber@opensuse.org diff --git a/glib2.spec b/glib2.spec index 65593a5..06ba006 100644 --- a/glib2.spec +++ b/glib2.spec @@ -46,6 +46,8 @@ Patch10: glib2-bgo569829-gettext-gkeyfile.patch Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch # PATCH-FIX-UPSTREAM glib2-force-fam-for-remote-fs.patch bgo#592211 hpj@novell.com -- Try monitoring files on NFS mounts via FAM before falling back to inotify. Patch12: glib2-force-fam-for-remote-fs.patch +# PATCH-FIX-OPENSUSE glib2-suppress-schema-deprecated-path-warning.patch rh#814053 badshah400@gmail.com -- Suppress the deprecated path warning since it fills up screen unnecessarily during package installations/upgrade. +Patch13: glib2-suppress-schema-deprecated-path-warning.patch BuildRequires: automake BuildRequires: fam-devel BuildRequires: fdupes @@ -255,6 +257,7 @@ translation-update-upstream %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 cp -a %{S:1} %{S:2} %{S:3} %{S:5} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then