From cd3b67bdff80face7bac6f7f692ee17250074a2f5edace51925c123acd0491cb Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 21 Jul 2011 12:31:04 +0000
Subject: [PATCH] Accepting request 76654 from home:vuntz:branches:Base:System

Add patch to fix NM issue

OBS-URL: https://build.opensuse.org/request/show/76654
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1-glib?expand=0&rev=24
---
 dbus-1-glib-fix-marshalling-regression.patch | 40 ++++++++++++++++++++
 dbus-1-glib.changes                          |  6 +++
 dbus-1-glib.spec                             | 15 +++++---
 3 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 dbus-1-glib-fix-marshalling-regression.patch

diff --git a/dbus-1-glib-fix-marshalling-regression.patch b/dbus-1-glib-fix-marshalling-regression.patch
new file mode 100644
index 0000000..cc2a6ae
--- /dev/null
+++ b/dbus-1-glib-fix-marshalling-regression.patch
@@ -0,0 +1,40 @@
+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
diff --git a/dbus-1-glib.changes b/dbus-1-glib.changes
index f0823b8..ffc5ae4 100644
--- a/dbus-1-glib.changes
+++ b/dbus-1-glib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 21 14:19:51 CEST 2011 - vuntz@opensuse.org
+
+- Add dbus-1-glib-fix-marshalling-regression.patch: this fixes a
+  regression causing issues in NetworkManager; taken from git.
+
 -------------------------------------------------------------------
 Fri Jun 17 10:02:40 CEST 2011 - vuntz@opensuse.org
 
diff --git a/dbus-1-glib.spec b/dbus-1-glib.spec
index 9aadac3..84cd559 100644
--- a/dbus-1-glib.spec
+++ b/dbus-1-glib.spec
@@ -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
+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 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`)
 # 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 @@ GLib thread abstraction and main loop.
 
 %prep
 %setup -n dbus-glib-%{version} -q
+%patch0 -p1
 
 %build
 export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector -fPIC"