Accepting request 87593 from Base:System

Update to 0.98 (forwarded request 87592 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/87593
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1-glib?expand=0&rev=36

dbus-1-glib-fix-marshalling-regression.patch

@@ -1,40 +0,0 @@
-From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-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 <biebl@debian.org>
-Reviewed-by: Colin Walters <walters@verbum.org>
----
-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

dbus-1-glib.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Wed Oct 12 19:56:00 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 0.98:
+  + Fix the documentation, a lot. We have nearly 100% coverage now.
+    (fdo#37793)
+  + In specialized collection iterators, check that the type is
+    correct; g_critical and return harmlessly, rather than
+    crashing, if not
+  + If library users register specialized GTypes, warn if their
+    vtables have missing callbacks which would cause accessors to
+    crash
+  + Fix production of documentation out-of-tree with newer gtk-doc
+  + Simplify invoke_object_method() and OOM handling in
+    dbus-gobject (fdo#35767)
+- Changes from version 0.96:
+  + Fix a regression in marshalling GObject instances as object
+    paths, which broke NetworkManager (fdo#37852, deb#628890)
+  + Fix crashes when sending a message when disconnected from D-Bus
+    but still working through our backlog of incoming messages,
+    similar to fdo#12675 (fdo#38406)
+  + Cope more gracefully, with a critical warning instead of a
+    memory leak, if programmer error causes G_VALUE_COLLECT to fail
+    (fdo#38406, nokia#86280, nokia#180486)
+  + Avoid an assertion failure when unregistering a proxy if
+    GetNameOwner failed (fdo#38408, nokia#116862)
+  + Don't report various programmer errors as "out of memory";
+    raise suitable critical warnings instead, and don't leak memory
+    (fdo#35767, fdo#35766)
+  + If a remote process sends a wrong method call on the Properties
+    interface, send back an error reply, instead of warning on
+    stderr and not replying (fdo#35766)
+  + Show a warning if dbus_g_method_return fails to marshal
+    something (fdo#29884, nokia#180486)
+  + Remove remnants of i18n (fdo#36428)
+  + Remove dead code (nokia#180486)
+- Drop dbus-1-glib-fix-marshalling-regression.patch: fixed
+  upstream.
+
 -------------------------------------------------------------------
 Fri Sep 30 14:47:56 UTC 2011 - uli@suse.com
 

dbus-1-glib.spec

@@ -21,13 +21,11 @@ Name:           dbus-1-glib
 Url:            http://dbus.freedesktop.org/
 License:        Other uncritical OpenSource License
 Group:          Development/Libraries/Other
-Version:        0.94
+Version:        0.98
-Release:        3
+Release:        1
 Summary:        GLib-based library for using D-Bus
-Source0:        dbus-glib-%{version}.tar.gz
+Source0:        http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-%{version}.tar.gz
 Source1:        baselibs.conf
-# PATCH-FIX-UPSTREAM dbus-1-glib-fix-marshalling-regression.patch vuntz@opensuse.org -- 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`)
@@ -69,7 +67,6 @@ GLib thread abstraction and main loop.
 
 %prep
 %setup -n dbus-glib-%{version} -q
-%patch0 -p1
 
 %build
 export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector -fPIC"

dbus-glib-0.94.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e460fa9314f0d35b054355080b5c315187c9e3d02252f1b7b11195bb0c08d39b
-size 705558

dbus-glib-0.98.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111
+size 723825