[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Monday, May 11, 2020 @ 06:01:28 Author: allan Revision: 383154 upgpkg: dbus-glib 0.110-2: .BUILDINFO rebuild Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-11 05:58:58 UTC (rev 383153) +++ PKGBUILD2020-05-11 06:01:28 UTC (rev 383154) @@ -2,7 +2,7 @@ pkgname=dbus-glib pkgver=0.110 -pkgrel=1 +pkgrel=2 pkgdesc="GLib bindings for DBUS" url="https://www.freedesktop.org/wiki/Software/DBusBindings; arch=(x86_64)
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Tuesday, January 30, 2018 @ 10:14:22 Author: heftig Revision: 315613 0.110-1 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-30 10:13:47 UTC (rev 315612) +++ PKGBUILD2018-01-30 10:14:22 UTC (rev 315613) @@ -2,28 +2,34 @@ # Maintainer: Jan de Grootpkgname=dbus-glib -pkgver=0.108 +pkgver=0.110 pkgrel=1 pkgdesc="GLib bindings for DBUS" +url="https://www.freedesktop.org/wiki/Software/DBusBindings; arch=(x86_64) license=('GPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings; depends=('dbus' 'glib2') -makedepends=('python') -options=('!emptydirs') +makedepends=('python' 'gtk-doc') source=(https://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) -md5sums=('a66a613705870752ca9786e0359aea97' - 'SKIP') +sha256sums=('7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825' +'SKIP') validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-static=no --enable-bash-completion=no + ./configure \ +--prefix=/usr \ +--sysconfdir=/etc \ +--localstatedir=/var \ +--libexecdir=/usr/lib \ +--enable-gtk-doc \ +--disable-static make } package() { cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + _c=/usr/share/bash-completion/completions + make DESTDIR="$pkgdir" install completiondir=$_c + mv "$pkgdir$_c"/{dbus-bash-completion.sh,dbus-send} }
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Wednesday, October 11, 2017 @ 07:56:10 Author: jgc Revision: 307411 Add python to makedepends (FS#55938) Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD |1 + 1 file changed, 1 insertion(+) Modified: PKGBUILD === --- PKGBUILD2017-10-11 06:18:31 UTC (rev 307410) +++ PKGBUILD2017-10-11 07:56:10 UTC (rev 307411) @@ -9,6 +9,7 @@ license=('GPL') url="http://www.freedesktop.org/wiki/Software/DBusBindings; depends=('dbus' 'glib2') +makedepends=('python') options=('!emptydirs') source=(https://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) md5sums=('a66a613705870752ca9786e0359aea97'
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Monday, October 31, 2016 @ 09:07:28 Author: jgc Revision: 279519 upgpkg: dbus-glib 0.108-1 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-10-31 09:04:43 UTC (rev 279518) +++ PKGBUILD2016-10-31 09:07:28 UTC (rev 279519) @@ -2,7 +2,7 @@ # Maintainer: Jan de Grootpkgname=dbus-glib -pkgver=0.106 +pkgver=0.108 pkgrel=1 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64) @@ -10,10 +10,10 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings; depends=('dbus' 'glib2') options=('!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) -md5sums=('2eea0b7f52b49f600a07abfd8535d4e4' +source=(https://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +md5sums=('a66a613705870752ca9786e0359aea97' 'SKIP') -validpgpkeys=('3C8672A0F49637FE064AC30F52A43A1E4B77B059') +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') build() { cd $pkgname-$pkgver
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Friday, February 19, 2016 @ 14:28:33 Author: jgc Revision: 259994 upgpkg: dbus-glib 0.106-1 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-02-19 13:07:34 UTC (rev 259993) +++ PKGBUILD2016-02-19 13:28:33 UTC (rev 259994) @@ -2,7 +2,7 @@ # Maintainer: Jan de Grootpkgname=dbus-glib -pkgver=0.104 +pkgver=0.106 pkgrel=1 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64) @@ -11,9 +11,9 @@ depends=('dbus' 'glib2') options=('!emptydirs') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) -md5sums=('5497d2070709cf796f1878c75a72a039' +md5sums=('2eea0b7f52b49f600a07abfd8535d4e4' 'SKIP') -validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') +validpgpkeys=('3C8672A0F49637FE064AC30F52A43A1E4B77B059') build() { cd $pkgname-$pkgver
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Friday, July 3, 2015 @ 12:25:26 Author: jgc Revision: 241742 upgpkg: dbus-glib 0.104-1 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-07-03 10:15:11 UTC (rev 241741) +++ PKGBUILD2015-07-03 10:25:26 UTC (rev 241742) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=dbus-glib -pkgver=0.102 -pkgrel=2 +pkgver=0.104 +pkgrel=1 pkgdesc=GLib bindings for DBUS arch=(i686 x86_64) license=('GPL') @@ -11,8 +11,9 @@ depends=('dbus' 'glib2') options=('!emptydirs') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) -md5sums=('f76b8558fd575d0106c3a556eaa49184' +md5sums=('5497d2070709cf796f1878c75a72a039' 'SKIP') +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') build() { cd $pkgname-$pkgver
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Monday, October 20, 2014 @ 17:31:20 Author: foutrelis Revision: 225072 upgpkg: dbus-glib 0.102-2 Replace dbus-core dependency with dbus. Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-10-20 15:23:40 UTC (rev 225071) +++ PKGBUILD2014-10-20 15:31:20 UTC (rev 225072) @@ -3,13 +3,12 @@ pkgname=dbus-glib pkgver=0.102 -pkgrel=1 +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') +depends=('dbus' 'glib2') options=('!emptydirs') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) md5sums=('f76b8558fd575d0106c3a556eaa49184'
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Monday, February 17, 2014 @ 11:22:24 Author: jgc Revision: 206079 upgpkg: dbus-glib 0.102-1 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-02-17 09:58:12 UTC (rev 206078) +++ PKGBUILD2014-02-17 10:22:24 UTC (rev 206079) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=dbus-glib -pkgver=0.100.2 +pkgver=0.102 pkgrel=1 pkgdesc=GLib bindings for DBUS arch=(i686 x86_64) @@ -11,11 +11,12 @@ depends=('dbus-core' 'glib2') makedepends=('pkgconfig') options=('!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('ad0920c7e3aad669163bb59171cf138e') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +md5sums=('f76b8558fd575d0106c3a556eaa49184' + 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-static=no --enable-bash-completion=no make @@ -22,6 +23,6 @@ } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver make DESTDIR=${pkgdir} install }
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Wednesday, March 13, 2013 @ 12:59:06 Author: jgc Revision: 179954 Security update upgpkg: dbus-glib 0.100.2-1 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-13 11:55:18 UTC (rev 179953) +++ PKGBUILD2013-03-13 11:59:06 UTC (rev 179954) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=dbus-glib -pkgver=0.100 +pkgver=0.100.2 pkgrel=1 pkgdesc=GLib bindings for DBUS arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d33959a9c0c6a158f5ac6d640316e89e') +md5sums=('ad0920c7e3aad669163bb59171cf138e') build() { cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Tuesday, June 26, 2012 @ 16:14:58 Author: andyrtr Revision: 162400 upgpkg: dbus-glib 0.100-1 upstream update 0.100 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-06-26 20:14:13 UTC (rev 162399) +++ PKGBUILD2012-06-26 20:14:58 UTC (rev 162400) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=dbus-glib -pkgver=0.98 +pkgver=0.100 pkgrel=1 pkgdesc=GLib bindings for DBUS arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('3f7f117dc7c8d899d9acfdcbf9253fb8') +md5sums=('d33959a9c0c6a158f5ac6d640316e89e') build() { cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD fix_network_manager.patch)
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 === --- PKGBUILD2011-10-04 16:52:58 UTC (rev 139668) +++ PKGBUILD2011-10-04 16:56:27 UTC (rev 139669) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot j...@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.mcvit...@collabora.co.uk -Date: Thu, 02 Jun 2011 12:49:51 + -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
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD fix_network_manager.patch)
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 === --- PKGBUILD2011-06-26 20:44:20 UTC (rev 129343) +++ PKGBUILD2011-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.mcvit...@collabora.co.uk +Date: Thu, 02 Jun 2011 12:49:51 + +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
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Friday, June 24, 2011 @ 09:51:01 Author: ibiru Revision: 128599 update to 0.94 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-06-24 13:46:22 UTC (rev 128598) +++ PKGBUILD2011-06-24 13:51:01 UTC (rev 128599) @@ -2,22 +2,26 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=dbus-glib -pkgver=0.92 +pkgver=0.94 pkgrel=1 pkgdesc=GLib bindings for DBUS arch=(i686 x86_64) 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') +md5sums=('e1f1506a6f4941e67bffd614b1ad5af6') 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 }
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD)
Date: Wednesday, November 10, 2010 @ 08:05:31 Author: ibiru Revision: 98493 upgpkg: dbus-glib 0.92-1 update to 0.92 Modified: dbus-glib/trunk/PKGBUILD --+ PKGBUILD | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-11-10 08:19:43 UTC (rev 98492) +++ PKGBUILD2010-11-10 13:05:31 UTC (rev 98493) @@ -2,22 +2,22 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=dbus-glib -pkgver=0.86 +pkgver=0.92 pkgrel=1 pkgdesc=GLib bindings for DBUS arch=(i686 x86_64) license=('GPL') url=http://www.freedesktop.org/wiki/Software/DBusBindings; -depends=('dbus-core=1.2.24' 'glib2=2.24.1') +depends=('dbus-core=1.4.0' 'glib2=2.26.0') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('cd0ab148fb0c786fc88be49d19971f50') +md5sums=('b595b36890c4f9f8f5d5dec131c495f8') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-static=no --enable-bash-completion=no || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + --enable-static=no --enable-bash-completion=no + make + make DESTDIR=${pkgdir} install }
[arch-commits] Commit in dbus-glib/trunk (PKGBUILD duplicate-object-fixes.patch)
Date: Thursday, May 6, 2010 @ 09:03:33 Author: jgc Revision: 79735 upgpkg: dbus-glib 0.86-1 Update to 0.86, remove upstream-applied patch Modified: dbus-glib/trunk/PKGBUILD Deleted: dbus-glib/trunk/duplicate-object-fixes.patch --+ PKGBUILD | 16 - duplicate-object-fixes.patch | 418 - 2 files changed, 7 insertions(+), 427 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-06 12:52:39 UTC (rev 79734) +++ PKGBUILD2010-05-06 13:03:33 UTC (rev 79735) @@ -2,24 +2,22 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=dbus-glib -pkgver=0.82 -pkgrel=2 +pkgver=0.86 +pkgrel=1 pkgdesc=GLib bindings for DBUS arch=(i686 x86_64) license=('GPL') url=http://www.freedesktop.org/wiki/Software/DBusBindings; -depends=('dbus-core=1.2.16' 'glib2=2.22.2') +depends=('dbus-core=1.2.24' 'glib2=2.24.1') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz -duplicate-object-fixes.patch) -md5sums=('aa2a4517de0e9144be3bce2cf8cdd924' - 'fd4cdbe0d6d6dfc51b5ab6b220d49f9e') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('cd0ab148fb0c786fc88be49d19971f50') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/duplicate-object-fixes.patch || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-static=no --enable-bash-completion=no || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-static=no --enable-bash-completion=no || return 1 make || return 1 make DESTDIR=${pkgdir} install || return 1 } Deleted: duplicate-object-fixes.patch === --- duplicate-object-fixes.patch2010-05-06 12:52:39 UTC (rev 79734) +++ duplicate-object-fixes.patch2010-05-06 13:03:33 UTC (rev 79735) @@ -1,418 +0,0 @@ -From: Colin Walters walt...@verbum.org -Date: Wed, 19 Aug 2009 17:27:53 + (-0400) -Subject: Support duplicate object registrations -X-Git-Url: http://git.collabora.co.uk/?p=user%2Fwjt%2Fdbus-glib-wjt.git;a=commitdiff_plain;h=0263b72669de710e0adda419a520ae9f123a1be9 - -Support duplicate object registrations - -Before commit e869fda4, we semi-supported registering the -same object multiple times. We'd accept messages for both paths, -however when signals were emitted, they'd both use the first object -path. - -That commit simply disallowed multiple registrations, which broke -backwards compatibility with some projects like PolicyKit which -had the same object registered with different paths. - -With this commit, explicitly allow and support multiple registrations. -The primary change is that signals are now emitted once for each -registration path of an object, using the correct path. - -diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c -index f0c4df8..fb41168 100644 a/dbus/dbus-gobject.c -+++ b/dbus/dbus-gobject.c -@@ -407,9 +407,16 @@ object_registration_free (ObjectRegistration *o) - { - if (o-object != NULL) - { -+ GSList *registrations; -+ -+ /* Ok, the object is still around; clear out this particular registration -+ * from the registrations list. -+ */ -+ registrations = g_object_steal_data (o-object, dbus_glib_object_registrations); -+ registrations = g_slist_remove (registrations, o); -+ g_object_set_data (o-object, dbus_glib_object_registrations, registrations); -+ - g_object_weak_unref (o-object, object_registration_object_died, o); -- g_object_steal_data (o-object, dbus_glib_object_registration); -- o-object = NULL; - } - - g_free (o-object_path); -@@ -1741,30 +1748,19 @@ dbus_g_signal_closure_finalize (gpointer data, - } - - static void --signal_emitter_marshaller (GClosure*closure, -- GValue *retval, -- guintn_param_values, -- const GValue*param_values, -- gpointer invocation_hint, -- gpointer marshal_data) -+emit_signal_for_registration (ObjectRegistration *o, -+ DBusGSignalClosure *sigclosure, -+ GValue *retval, -+ guint n_param_values, -+ const GValue *param_values) - { -- DBusGSignalClosure *sigclosure; - DBusMessage *signal; - DBusMessageIter iter; - guint i; -- const char *path; -- -- sigclosure = (DBusGSignalClosure *) closure; -- -- g_assert (retval == NULL); -- -- path = _dbus_gobject_get_path (sigclosure-object); - -- g_assert (path != NULL); -- -- signal = dbus_message_new_signal