Hello community, here is the log from the commit of package dbus-1-glib for openSUSE:Factory checked in at Fri Jul 22 08:56:16 CEST 2011.
-------- --- dbus-1-glib/dbus-1-glib.changes 2011-06-17 10:10:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbus-1-glib/dbus-1-glib.changes 2011-07-21 14:21:08.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 21 14:19:51 CEST 2011 - [email protected] + +- Add dbus-1-glib-fix-marshalling-regression.patch: this fixes a + regression causing issues in NetworkManager; taken from git. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dbus-1-glib-fix-marshalling-regression.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-glib.spec ++++++ --- /var/tmp/diff_new_pack.u9rjcG/_old 2011-07-22 08:55:40.000000000 +0200 +++ /var/tmp/diff_new_pack.u9rjcG/_new 2011-07-22 08:55:40.000000000 +0200 @@ -19,23 +19,25 @@ Name: dbus-1-glib -BuildRequires: dbus-1-devel glib2-devel libexpat-devel -BuildRequires: libselinux-devel Url: http://dbus.freedesktop.org/ License: Other uncritical OpenSource License Group: Development/Libraries/Other Version: 0.94 -Release: 1 +Release: 3 +Summary: GLib-based library for using D-Bus +Source0: dbus-glib-%{version}.tar.gz +Source1: baselibs.conf +# PATCH-FIX-UPSTREAM dbus-1-glib-fix-marshalling-regression.patch [email protected] -- Fix regression causing issues in NM, taken from git +Patch0: dbus-1-glib-fix-marshalling-regression.patch +BuildRequires: dbus-1-devel glib2-devel libexpat-devel +BuildRequires: libselinux-devel +Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) # bug437293 %ifarch ppc64 Obsoletes: dbus-1-glib-64bit %endif # -Summary: GLib-based library for using D-Bus -Source0: dbus-glib-%{version}.tar.gz -Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) %package -n dbus-1-glib-devel License: Other uncritical OpenSource License @@ -68,6 +70,7 @@ %prep %setup -n dbus-glib-%{version} -q +%patch0 -p1 %build export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector -fPIC" ++++++ dbus-1-glib-fix-marshalling-regression.patch ++++++ >From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001 From: Simon McVittie <[email protected]> Date: Thu, 02 Jun 2011 12:49:51 +0000 Subject: Fix regression in marshalling objects as object paths This regressed while fixing fd.o #36811. NetworkManager apparently uses this idiom. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37852 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628890 Tested-by: Michael Biebl <[email protected]> Reviewed-by: Colin Walters <[email protected]> --- diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c index 3b0bd17..7ee0b4f 100644 --- a/dbus/dbus-gobject.c +++ b/dbus/dbus-gobject.c @@ -3049,16 +3049,16 @@ out: const char * _dbus_gobject_get_path (GObject *obj) { - GSList *registrations; + ObjectExport *oe; ObjectRegistration *o; - registrations = g_object_get_data (obj, "dbus_glib_object_registrations"); + oe = g_object_get_data (obj, "dbus_glib_object_registrations"); - if (registrations == NULL) + if (oe == NULL || oe->registrations == NULL) return NULL; /* First one to have been registered wins */ - o = registrations->data; + o = oe->registrations->data; return o->object_path; } -- cgit v0.8.3-6-g21f6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
