diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
| commit | e2a2cddf54e26ab2f6551c9d27b997472e5f4d45 (patch) | |
| tree | 506c782411889ae8fe218db16eee680c7ae5e0e2 /extra/dbus-glib | |
| parent | 7927a6b6296eecd09c8d2f70e593a378768deabe (diff) | |
| parent | 5e8a6a470237711ad18f12dde87deea6f2b8b0e0 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/kvirc/PKGBUILD
community/perl-gtk2-trayicon/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/krusader/PKGBUILD
extra/libproxy/PKGBUILD
extra/libreoffice/PKGBUILD
extra/openal/PKGBUILD
extra/postgresql/PKGBUILD
extra/razor/PKGBUILD
extra/subversion/PKGBUILD
extra/swt/PKGBUILD
extra/valgrind/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/git/PKGBUILD
testing/graphviz/PKGBUILD
testing/graphviz/install
testing/perl-xml-parser/PKGBUILD
Diffstat (limited to 'extra/dbus-glib')
| -rw-r--r-- | extra/dbus-glib/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/dbus-glib/fix_network_manager.patch | 40 |
2 files changed, 53 insertions, 6 deletions
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD index 0a849ff8a..27ea2e8b8 100644 --- a/extra/dbus-glib/PKGBUILD +++ b/extra/dbus-glib/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 98493 2010-11-10 13:05:31Z ibiru $ +# $Id: PKGBUILD 129344 2011-06-26 21:48:20Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=dbus-glib -pkgver=0.92 -pkgrel=1 +pkgver=0.94 +pkgrel=2 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-core>=1.4.0' 'glib2>=2.26.0') +depends=('dbus-core' 'glib2') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b595b36890c4f9f8f5d5dec131c495f8') +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 } diff --git a/extra/dbus-glib/fix_network_manager.patch b/extra/dbus-glib/fix_network_manager.patch new file mode 100644 index 000000000..246b85550 --- /dev/null +++ b/extra/dbus-glib/fix_network_manager.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 |