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

[Ionut Biru]

    Date: Tuesday, October 4, 2011 @ 12:56:27
  Author: ibiru
Revision: 139669

update to 0.98

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

---------------------------+
 PKGBUILD                  |   11 ++++-------
 fix_network_manager.patch |   40 ----------------------------------------
 2 files changed, 4 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-04 16:52:58 UTC (rev 139668)
+++ PKGBUILD	2011-10-04 16:56:27 UTC (rev 139669)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=dbus-glib
-pkgver=0.94
-pkgrel=2
+pkgver=0.98
+pkgrel=1
 pkgdesc="GLib bindings for DBUS"
 arch=(i686 x86_64)
 license=('GPL')
@@ -11,14 +11,11 @@
 depends=('dbus-core' 'glib2')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        fix_network_manager.patch)
-md5sums=('e1f1506a6f4941e67bffd614b1ad5af6'
-         '2a3598342dd25722d452e7beaf21b5f3')
+source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('3f7f117dc7c8d899d9acfdcbf9253fb8')
 
 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

Deleted: fix_network_manager.patch
===================================================================
--- fix_network_manager.patch	2011-10-04 16:52:58 UTC (rev 139668)
+++ fix_network_manager.patch	2011-10-04 16:56:27 UTC (rev 139669)
@@ -1,40 +0,0 @@
-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