diff --git a/srcpkgs/dbus-glib/dbus-glib-devel.template b/srcpkgs/dbus-glib/dbus-glib-devel.template index 0d672e5d18..74293cfc07 100644 --- a/srcpkgs/dbus-glib/dbus-glib-devel.template +++ b/srcpkgs/dbus-glib/dbus-glib-devel.template @@ -5,6 +5,12 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +# For dbus-binding-tool(1) +Add_dependency run glibc +Add_dependency run glib +Add_dependency run dbus-libs +Add_dependency run expat + Add_dependency run glib-devel Add_dependency run dbus-devel Add_dependency run expat-devel @@ -12,9 +18,8 @@ Add_dependency run dbus-glib do_install() { - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + vmove usr/bin usr + vmove usr/include usr + vmove usr/share usr/share + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/dbus-glib/patches/fix_network_manager.patch b/srcpkgs/dbus-glib/patches/fix_network_manager.patch deleted file mode 100644 index 30ab47fb89..0000000000 --- a/srcpkgs/dbus-glib/patches/fix_network_manager.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -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 -Reviewed-by: Colin Walters ---- -diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c -index 3b0bd17..7ee0b4f 100644 ---- dbus/dbus-gobject.c -+++ 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 diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template index 894d3e29ab..e000da12d9 100644 --- a/srcpkgs/dbus-glib/template +++ b/srcpkgs/dbus-glib/template @@ -1,13 +1,14 @@ # Template file for 'dbus-glib' pkgname=dbus-glib -version=0.94 -revision=1 +version=0.98 +homepage="http://www.freedesktop.org/wiki/Software/DBusBindings" distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-static --disable-bash-completion" short_desc="GLib bindings for D-Bus" maintainer="Juan RP " -checksum=e460fa9314f0d35b054355080b5c315187c9e3d02252f1b7b11195bb0c08d39b +license="GPL-2" +checksum=297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111 long_desc=" D-Bus add-on library to integrate the standard D-Bus library with the GLib thread abstraction and main loop." @@ -17,6 +18,7 @@ Add_dependency run glibc Add_dependency run glib Add_dependency run dbus-libs Add_dependency run expat + Add_dependency build pkg-config Add_dependency build glib-devel Add_dependency build dbus-devel