Hello community, here is the log from the commit of package glib2 for openSUSE:11.4 checked in at Wed Aug 10 12:10:21 CEST 2011.
-------- --- old-versions/11.4/all/glib2/glib2.changes 2011-02-20 10:50:21.000000000 +0100 +++ /mounts/work_src_done/11.4/glib2/glib2.changes 2011-05-31 19:20:48.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 31 17:17:18 UTC 2011 - [email protected] + +- Add glib2-fix-dbus-connection.patch from upstream git to fix + bnc#672793 + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/glib2 Destination is old-versions/11.4/UPDATES/all/glib2 calling whatdependson for 11.4-i586 New: ---- glib2-fix-dbus-connection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.xLQT8c/_old 2011-08-10 12:09:49.000000000 +0200 +++ /var/tmp/diff_new_pack.xLQT8c/_new 2011-08-10 12:09:49.000000000 +0200 @@ -22,7 +22,7 @@ Name: glib2 %define _name glib Version: 2.28.0 -Release: 3.<RELEASE2> +Release: 3.<RELEASE8> # FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib # FIXME: find out if tapsets should really be in devel package or in main package License: LGPLv2+ @@ -52,6 +52,8 @@ Patch12: glib2-force-fam-for-remote-fs.patch # PATCH-FIX-UPSTREAM glib2-fix-default-mime-handler.patch bgo#642797 [email protected] -- Fix default mime handler to not be the one of a user-configured less-specific mime type Patch13: glib2-fix-default-mime-handler.patch +# PATCH-FIX-UPSTREAM glib2-fix-dbus-connection.patch bgo#672793 [email protected] -- Fix dbusconnection error, patch came from upstream git +Patch14: glib2-fix-dbus-connection.patch BuildRequires: fam-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -259,6 +261,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 cp -a %{S:1} %{S:2} %{S:3} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then ++++++ glib2-fix-dbus-connection.patch ++++++ >From 68b16deb1f4ec739f80291156f2e0e2eed87d225 Mon Sep 17 00:00:00 2001 From: Colin Walters <[email protected]> Date: Wed, 13 Apr 2011 18:03:58 +0000 Subject: gdbusconnection: Avoid tripping assertion if we fail to authenticate twice If g_bus_get_sync() fails in authentication (because e.g. the process uid, doesn't match the expected in EXTERNAL), a secondary call to g_bus_get_sync() would notice we aren't initialized, and try to initialize. The assertion here is just wrong; we now explicitly and clearly handle both cases where we already have an error, or we already succeeded. https://bugzilla.gnome.org/show_bug.cgi?id=635694 --- diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index 3bacf81..999cb80 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -2264,15 +2264,20 @@ initable_init (GInitable *initable, ret = FALSE; + /* First, handle the case where the connection already has an + * initialization error set. + */ + if (connection->initialization_error != NULL) + goto out; + + /* Also make this a no-op if we're already initialized fine */ if (connection->is_initialized) { - if (connection->stream != NULL) - ret = TRUE; - else - g_assert (connection->initialization_error != NULL); + ret = TRUE; goto out; } - g_assert (connection->initialization_error == NULL); + + g_assert (connection->initialization_error == NULL && !connection->is_initialized); /* The user can pass multiple (but mutally exclusive) construct * properties: -- cgit v0.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
