From a1bd273e0bfd4e812e78a6b6b2be47a6d1cb539b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 11 Jun 2012 23:05:54 +0200 Subject: [PATCH] dbus: update to 1.6.0. --- srcpkgs/dbus/dbus-devel.template | 4 +--- srcpkgs/dbus/dbus-libs.template | 4 +--- srcpkgs/dbus/dbus-x11.rshlibs | 1 - srcpkgs/dbus/dbus-x11.template | 8 ++------ srcpkgs/dbus/dbus.rshlibs | 1 + srcpkgs/dbus/template | 10 +++++----- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/srcpkgs/dbus/dbus-devel.template b/srcpkgs/dbus/dbus-devel.template index ae17dd3e86..059bee05d6 100644 --- a/srcpkgs/dbus/dbus-devel.template +++ b/srcpkgs/dbus/dbus-devel.template @@ -1,13 +1,11 @@ # Template file for 'dbus-devel'. # -depends="pkg-config expat-devel libSM-devel libICE-devel libX11-devel dbus-libs" +depends="expat-devel dbus-libs>=$version" short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - - do_install() { vmove usr/include usr vmove "usr/lib/dbus-*" usr/lib diff --git a/srcpkgs/dbus/dbus-libs.template b/srcpkgs/dbus/dbus-libs.template index fed928abbf..907ffdbb15 100644 --- a/srcpkgs/dbus/dbus-libs.template +++ b/srcpkgs/dbus/dbus-libs.template @@ -5,9 +5,7 @@ long_desc="${long_desc} This package contains the shared libraries." - -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib } diff --git a/srcpkgs/dbus/dbus-x11.rshlibs b/srcpkgs/dbus/dbus-x11.rshlibs index 7d9cf67dc2..bbd524cddc 100644 --- a/srcpkgs/dbus/dbus-x11.rshlibs +++ b/srcpkgs/dbus/dbus-x11.rshlibs @@ -1,3 +1,2 @@ libX11.so.6 -libpthread.so.0 libc.so.6 diff --git a/srcpkgs/dbus/dbus-x11.template b/srcpkgs/dbus/dbus-x11.template index 703ee2655e..94e96a6411 100644 --- a/srcpkgs/dbus/dbus-x11.template +++ b/srcpkgs/dbus/dbus-x11.template @@ -1,17 +1,13 @@ # Template file for 'dbus-x11'. # -depends="dbus-libs" +replaces="dbus<1.4.16_2" short_desc="${short_desc} (X11 support)" long_desc="${long_desc} This package contains the dbus-launch utility which is necessary for packages using a D-Bus session bus." -replaces="dbus<1.4.16_2" - - -do_install() -{ +do_install() { vmove usr/bin/dbus-launch usr/bin vmove usr/share/man/man1/dbus-launch.1 usr/share/man/man1 vinstall ${FILESDIR}/30-dbus-xinit 755 etc/X11/xinit/xinitrc.d 30-dbus diff --git a/srcpkgs/dbus/dbus.rshlibs b/srcpkgs/dbus/dbus.rshlibs index b9c5725fa7..1223723f14 100644 --- a/srcpkgs/dbus/dbus.rshlibs +++ b/srcpkgs/dbus/dbus.rshlibs @@ -3,3 +3,4 @@ libpthread.so.0 librt.so.1 libc.so.6 libdbus-1.so.3 +libsystemd-login.so.0 diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index 0d292afdc8..e3eeee5efa 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -1,22 +1,22 @@ # Template file for 'dbus' pkgname=dbus -version=1.4.20 +version=1.6.0 revision=1 homepage="http://dbus.freedesktop.org/" distfiles="${homepage}/releases/dbus/$pkgname-$version.tar.gz" build_style=gnu-configure configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat --disable-dnotify --enable-inotify --with-dbus-user=dbus ---disable-doxygen-docs --disable-xml-docs --disable-tests ---with-systemdsystemunitdir=/lib/systemd/system" -makedepends="pkg-config expat-devel libX11-devel" +--disable-doxygen-docs --disable-xml-docs --disable-tests --enable-systemd +--with-systemdsystemunitdir=/lib/systemd/system --enable-epoll" +makedepends="pkg-config expat-devel libX11-devel systemd-devel" conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" subpackages="dbus-devel dbus-libs dbus-x11" system_accounts="dbus" short_desc="Message bus system" maintainer="Juan RP " license="GPL-2" -checksum=103bdcd261a13140730b5fa69f56a98ab5c89ba3f0116ea62fcfd639520d5aaf +checksum=f0dda7e5f1c4a5bac4c690c602fbd7dce67907b967fa6986466e022c31e055ee long_desc=" D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in terms