From 9343f37ee7ba1aa98f65272412d331a280890e12 Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 2 Nov 2011 13:41:57 +0000 Subject: Wed Nov 2 13:41:53 UTC 2011 --- extra/pulseaudio/dont-require-dbus.patch | 46 -------------------------------- extra/pulseaudio/version-number.patch | 40 --------------------------- 2 files changed, 86 deletions(-) delete mode 100644 extra/pulseaudio/dont-require-dbus.patch delete mode 100644 extra/pulseaudio/version-number.patch (limited to 'extra/pulseaudio') diff --git a/extra/pulseaudio/dont-require-dbus.patch b/extra/pulseaudio/dont-require-dbus.patch deleted file mode 100644 index 915e3baec..000000000 --- a/extra/pulseaudio/dont-require-dbus.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 6d58497dd1d68231af201cf2a07bb9881c4efd2f -Author: Tanu Kaskinen -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; - } - diff --git a/extra/pulseaudio/version-number.patch b/extra/pulseaudio/version-number.patch deleted file mode 100644 index 473b252a9..000000000 --- a/extra/pulseaudio/version-number.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c -Author: Colin Guthrie -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. */ -- cgit v1.2.3-54-g00ecf