Date: Thursday, October 6, 2011 @ 03:35:46 Author: ibiru Revision: 140078
db-move: moved dbus-glib from [testing] to [extra] (i686) Added: dbus-glib/repos/extra-i686/PKGBUILD (from rev 140075, dbus-glib/repos/testing-i686/PKGBUILD) Deleted: dbus-glib/repos/extra-i686/PKGBUILD dbus-glib/repos/extra-i686/fix_network_manager.patch dbus-glib/repos/testing-i686/ ---------------------------+ PKGBUILD | 57 ++++++++++++++++++++------------------------ fix_network_manager.patch | 40 ------------------------------ 2 files changed, 27 insertions(+), 70 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-10-06 07:35:45 UTC (rev 140077) +++ extra-i686/PKGBUILD 2011-10-06 07:35:46 UTC (rev 140078) @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=dbus-glib -pkgver=0.94 -pkgrel=2 -pkgdesc="GLib bindings for DBUS" -arch=(i686 x86_64) -license=('GPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings" -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') - -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 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: dbus-glib/repos/extra-i686/PKGBUILD (from rev 140075, dbus-glib/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-10-06 07:35:46 UTC (rev 140078) @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=dbus-glib +pkgver=0.98 +pkgrel=1 +pkgdesc="GLib bindings for DBUS" +arch=(i686 x86_64) +license=('GPL') +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +depends=('dbus-core' 'glib2') +makedepends=('pkgconfig') +options=('!libtool' '!emptydirs') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('3f7f117dc7c8d899d9acfdcbf9253fb8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-static=no --enable-bash-completion=no + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/fix_network_manager.patch =================================================================== --- extra-i686/fix_network_manager.patch 2011-10-06 07:35:45 UTC (rev 140077) +++ extra-i686/fix_network_manager.patch 2011-10-06 07:35:46 UTC (rev 140078) @@ -1,40 +0,0 @@ -From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001 -From: Simon McVittie <simon.mcvit...@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 <bi...@debian.org> -Reviewed-by: Colin Walters <walt...@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