Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2013-10-06 19:33:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib2" Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2013-09-27 17:12:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glib2.new/glib2.changes 2013-10-06 19:33:54.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Oct 6 14:40:29 UTC 2013 - [email protected] + +- Add glib2-no_DBusActivatable_from_keyfile.patch: Don't try + DBusActivatable with load_from_keyfile. Fixes a crash when + starting synapse with any .desktop files installed that specify + DBusActivatable=true (e.g. gnome-weather, bnc#842645). + +------------------------------------------------------------------- New: ---- glib2-no_DBusActivatable_from_keyfile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.BLOPR1/_old 2013-10-06 19:33:55.000000000 +0200 +++ /var/tmp/diff_new_pack.BLOPR1/_new 2013-10-06 19:33:55.000000000 +0200 @@ -45,6 +45,8 @@ Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch # PATCH-FIX-OPENSUSE glib2-suppress-schema-deprecated-path-warning.patch rh#814053 [email protected] -- Suppress the deprecated path warning since it fills up screen unnecessarily during package installations/upgrade. Patch13: glib2-suppress-schema-deprecated-path-warning.patch +# PATCH-FIX-UPSTREAM glib2-no_DBusActivatable_from_keyfile.patch bgo#709326 bnc#842645 [email protected] -- ppinfo: Don't try DBusActivatable with load_from_keyfile +Patch14: glib2-no_DBusActivatable_from_keyfile.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: fam-devel @@ -251,6 +253,7 @@ %patch10 -p1 %patch11 -p1 %patch13 -p1 +%patch14 -p1 cp -a %{S:1} %{S:2} %{S:5} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then ++++++ glib2-no_DBusActivatable_from_keyfile.patch ++++++ >From e0ffd5c184bd1c0e6d602c406f53ed5f6b765f88 Mon Sep 17 00:00:00 2001 From: Ryan Lortie <[email protected]> Date: Thu, 03 Oct 2013 14:02:08 +0000 Subject: appinfo: Don't try DBusActivatable with load_from_keyfile We can't get the name of the filename, so we can't determine the application ID. We'll have to fallback on Exec= for this case. https://bugzilla.gnome.org/show_bug.cgi?id=709326 --- diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index f6f5bc0..141a89a 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -461,7 +461,10 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info, info->path = NULL; } - if (bus_activatable) + /* Can only be DBusActivatable if we know the filename, which means + * that this won't work for the load-from-keyfile case. + */ + if (bus_activatable && info->filename) { gchar *basename; gchar *last_dot; -- cgit v0.9.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
