Date: Saturday, October 1, 2011 @ 09:37:56 Author: heftig Revision: 139191
fix xinit and skype Added: pulseaudio/trunk/version-number.patch Modified: pulseaudio/trunk/PKGBUILD pulseaudio/trunk/pulseaudio.xinit ----------------------+ PKGBUILD | 9 ++++++--- pulseaudio.xinit | 17 +++++++---------- version-number.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-01 11:21:52 UTC (rev 139190) +++ PKGBUILD 2011-10-01 13:37:56 UTC (rev 139191) @@ -7,7 +7,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgver=1.0 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://pulseaudio.org/" license=(GPL LGPL) @@ -16,13 +16,16 @@ lirc-utils openssl fftw orc json-c) options=(!emptydirs !libtool !makeflags) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - $pkgbase.xinit) + $pkgbase.xinit version-number.patch) sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be' - '3fb64aee43c482b3ea18e1b260c8f310884362b24bcd02a1c117dcd99237312f') + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' + '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530') build() { cd "$srcdir/$pkgbase-$pkgver" + patch -Np1 -i "$srcdir/version-number.patch" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ Modified: pulseaudio.xinit =================================================================== --- pulseaudio.xinit 2011-10-01 11:21:52 UTC (rev 139190) +++ pulseaudio.xinit 2011-10-01 13:37:56 UTC (rev 139191) @@ -1,15 +1,12 @@ #!/bin/bash -run=0 - case "$DESKTOP_SESSION" in - gnome|kde*|xfce4) # PulseAudio is started via XDG Autostart + gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart ;; - *) - run=1 + *) + # Extra checks in case DESKTOP_SESSION is not set correctly + if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then + /usr/bin/start-pulseaudio-x11 + fi + ;; esac - -# Catch KDE again, which might not set DESKTOP_SESSION correctly -[[ -z $KDE_FULL_SESSION ]] && run=0 - -(( run )) && /usr/bin/start-pulseaudio-x11 Added: version-number.patch =================================================================== --- version-number.patch (rev 0) +++ version-number.patch 2011-10-01 13:37:56 UTC (rev 139191) @@ -0,0 +1,40 @@ +commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c +Author: Colin Guthrie <co...@mageia.org> +Date: Sat Oct 1 12:03:44 2011 +0100 + + libpulse: Always return a three part version number in API calls. + + For both the headers and the library we should provide clean, three part + strings as this has been what we've previously done in the past + and some external systems apparently rely on this format. While it's not + something we've officially commented on before, there is no real advantage + to us to change it so let's not try to tidy things up too much + considering some third party apps (e.g. Skype) seem to dislike a two + part version string. + +diff --git a/src/pulse/context.c b/src/pulse/context.c +index 25d04a1..af144aa 100644 +--- a/src/pulse/context.c ++++ b/src/pulse/context.c +@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su + } + + const char* pa_get_library_version(void) { +- return PACKAGE_VERSION; ++ return pa_get_headers_version(); + } + + const char* pa_context_get_server(pa_context *c) { +diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in +index 7e00c5e..1be4c75 100644 +--- a/src/pulse/version.h.in ++++ b/src/pulse/version.h.in +@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN + /** Return the version of the header files. Keep in mind that this is + a macro and not a function, so it is impossible to get the pointer of + it. */ +-#define pa_get_headers_version() ("@PACKAGE_VERSION@") ++#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0") + + /** Return the version of the library the current application is + * linked to. */