diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-16 10:09:22 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-16 10:09:22 +0200 |
commit | 0be48442ebb71571ec0ab1bbf27bf4a0759ed19b (patch) | |
tree | 5d6384ab664e0ddbecc26676b8f56a05276cc4df /extra/dbus | |
parent | e6fce62e8ff0bdb90a7e6bc3cc224bdabcd20a24 (diff) | |
parent | ea3d877b99c32e3a9e00ab220440d4518430e5bc (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/dbus-core/PKGBUILD
extra/dbus/PKGBUILD
extra/qt/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
testing/cairo/PKGBUILD
testing/cairo/git_fixes.patch
testing/glib2/PKGBUILD
testing/gtk3/PKGBUILD
testing/networkmanager/PKGBUILD
testing/python/PKGBUILD
Diffstat (limited to 'extra/dbus')
-rw-r--r-- | extra/dbus/30-dbus | 1 | ||||
-rw-r--r-- | extra/dbus/PKGBUILD | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/extra/dbus/30-dbus b/extra/dbus/30-dbus index 603e92d3e..69d2660da 100644 --- a/extra/dbus/30-dbus +++ b/extra/dbus/30-dbus @@ -6,4 +6,3 @@ dbuslaunch="`which dbus-launch 2>/dev/null`" if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then eval `$dbuslaunch --sh-syntax --exit-with-session` fi - diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index 46e810395..17f83e1f2 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140077 2011-10-06 07:35:45Z ibiru $ +# $Id: PKGBUILD 156107 2012-04-14 07:40:10Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus -pkgver=1.4.16 -pkgrel=1.1 +pkgver=1.4.20 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64 'mips64el') @@ -12,8 +12,8 @@ license=('GPL' 'custom') depends=("dbus-core>=${pkgver}" 'libx11') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz 30-dbus) -md5sums=('44a2a10678e7e50460879c3eb4453a65' - 'd14e59575f04e55d21a04907b6fd9f3c') +md5sums=('79eca2f2c1894ac347acce128314428b' + '9fafe8b28460aeaa6054309ef4c5ed92') build() { cd "${srcdir}/${pkgname}-${pkgver}" |