Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 52 insertions, 5 deletions

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 27e02658f..b01befd3c 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139658 2011-10-04 14:14:35Z heftig $
+# $Id: PKGBUILD 140517 2011-10-16 08:44:24Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,26 +8,27 @@ pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=1.0
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64 mips64el)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
              speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack
              openssl fftw orc json-c)
-             gconf intltool jack openssl)
 [ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils)
 options=(!emptydirs !libtool !makeflags)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-        $pkgbase.xinit version-number.patch)
+        $pkgbase.xinit version-number.patch dont-require-dbus.patch)
 sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be'
             'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf'
-            '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530')
+            '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530'
+            '68c8ddf7ddb4035405ec61e7aa72e88f1430a30f75a36f31761fbfffa8f7dad4')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
 
   patch -Np1 -i "$srcdir/version-number.patch"
+  patch -Np1 -i "$srcdir/dont-require-dbus.patch"
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/pulseaudio/dont-require-dbus.patch b/extra/pulseaudio/dont-require-dbus.patch
new file mode 100644
index 000000000..915e3baec
--- /dev/null
+++ b/extra/pulseaudio/dont-require-dbus.patch
@@ -0,0 +1,46 @@
+commit 6d58497dd1d68231af201cf2a07bb9881c4efd2f
+Author: Tanu Kaskinen <tanuk@iki.fi>
+Date:   Thu Oct 6 23:28:37 2011 +0300
+
+    daemon: Don't treat it as a fatal error if we can't connect to the session bus
+    
+    http://lists.freedesktop.org/archives/pulseaudio-discuss/2011-June/010276.html
+
+diff --git a/src/daemon/main.c b/src/daemon/main.c
+index e2e4a81..c32f7c7 100644
+--- a/src/daemon/main.c
++++ b/src/daemon/main.c
+@@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) {
+ 
+ #ifdef HAVE_DBUS
+     if (!conf->system_instance) {
+-        if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
+-            goto finish;
+-        if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
+-            goto finish;
++        if ((server_lookup = pa_dbusobj_server_lookup_new(c))) {
++            if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
++                goto finish;
++        }
+     }
+ 
+-    if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server")))
+-        goto finish;
++    if (start_server)
++        server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server");
+ #endif
+ 
+ #ifdef HAVE_FORK
+diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
+index 45796e7..9bdc699 100644
+--- a/src/daemon/server-lookup.c
++++ b/src/daemon/server-lookup.c
+@@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
+     sl->path_registered = FALSE;
+ 
+     if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
+-        pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message);
++        pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message);
+         goto fail;
+     }
+