[arch-commits] Commit in dbus-glib/trunk (PKGBUILD fix_network_manager.patch)

[Ionut Biru]

    Date: Sunday, June 26, 2011 @ 17:48:20
  Author: ibiru
Revision: 129344

fix regression in networkmanager. FS#24895

Added:
  dbus-glib/trunk/fix_network_manager.patch
Modified:
  dbus-glib/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    9 ++++++---
 fix_network_manager.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-26 20:44:20 UTC (rev 129343)
+++ PKGBUILD	2011-06-26 21:48:20 UTC (rev 129344)
@@ -3,7 +3,7 @@
 
 pkgname=dbus-glib
 pkgver=0.94
-pkgrel=1
+pkgrel=2
 pkgdesc="GLib bindings for DBUS"
 arch=(i686 x86_64)
 license=('GPL')
@@ -11,11 +11,14 @@
 depends=('dbus-core' 'glib2')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e1f1506a6f4941e67bffd614b1ad5af6')
+source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        fix_network_manager.patch)
+md5sums=('e1f1506a6f4941e67bffd614b1ad5af6'
+         '2a3598342dd25722d452e7beaf21b5f3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix_network_manager.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --enable-static=no --enable-bash-completion=no
   make

Added: fix_network_manager.patch
===================================================================
--- fix_network_manager.patch	                        (rev 0)
+++ fix_network_manager.patch	2011-06-26 21:48:20 UTC (rev 129344)
@@ -0,0 +1,40 @@
+From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie at 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 at debian.org>
+Reviewed-by: Colin Walters <walters at 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