Hello community, here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at 2013-06-18 09:57:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-tools (Old) and /work/SRC/openSUSE:Factory/.alsa-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-tools/alsa-tools.changes 2013-05-28 07:26:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-tools.new/alsa-tools.changes 2013-06-18 09:57:05.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 17 10:15:58 CEST 2013 - [email protected] + +- Backport upstream fix for new PA: + 0006-hdajackretask-Fix-killing-PulseAudio-on-newer-PulseA.patch + +------------------------------------------------------------------- New: ---- 0006-hdajackretask-Fix-killing-PulseAudio-on-newer-PulseA.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-tools.spec ++++++ --- /var/tmp/diff_new_pack.Y8pVnM/_old 2013-06-18 09:57:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Y8pVnM/_new 2013-06-18 09:57:05.000000000 +0200 @@ -57,6 +57,7 @@ Patch3: 0003-Fix-bashisms.patch Patch4: 0004-Fix-build-errors-caused-by-Werror-format-security.patch Patch5: 0005-Add-AM_MAINTAINER_MODE-enable-macro-to-all-configure.patch +Patch6: 0006-hdajackretask-Fix-killing-PulseAudio-on-newer-PulseA.patch # build fixes Patch100: alsa-tools-desktop-fix.dif Patch101: alsa-tools-no_m4_dir.dif @@ -93,6 +94,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # build fixes %patch100 -p1 %patch101 -p1 ++++++ 0006-hdajackretask-Fix-killing-PulseAudio-on-newer-PulseA.patch ++++++ >From 772fbde91c00c8f9517e67e2f5401d28e9aa88d4 Mon Sep 17 00:00:00 2001 From: David Henningsson <[email protected]> Date: Thu, 13 Jun 2013 16:26:43 +0200 Subject: [PATCH] hdajackretask: Fix killing PulseAudio on newer PulseAudio versions The standard configuration directory for PulseAudio has changed, I think since 3.0. Adjust the directory lookup mechanism to match. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> --- hdajackretask/apply-changes.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hdajackretask/apply-changes.c b/hdajackretask/apply-changes.c index eda404e..840f649 100644 --- a/hdajackretask/apply-changes.c +++ b/hdajackretask/apply-changes.c @@ -97,7 +97,20 @@ gboolean run_sudo_script(const gchar* script_name, GError** err) static gchar* get_pulseaudio_client_conf() { - return g_strdup_printf("%s/.pulse/client.conf", g_get_home_dir()); + /* Reference: See src/pulsecore/core-util.c in pulseaudio */ + gchar* fname; + gchar* dir = g_strdup_printf("%s/.pulse", g_get_home_dir()); + if (access(dir, F_OK) < 0) { + const gchar* xch = g_getenv("XDG_CONFIG_HOME"); + g_free(dir); + if (xch) + dir = g_strdup_printf("%s/pulse", xch); + else + dir = g_strdup_printf("%s/.config/pulse", g_get_home_dir()); + } + fname = g_strdup_printf("%s/client.conf", dir); + g_free(dir); + return fname; } static gboolean kill_pulseaudio(gboolean* was_killed, int card, GError** err) -- 1.8.3 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
