summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-22 17:32:17 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-22 17:32:17 +0100
commit856af3fa63cb970fd0ebecc307702e50cb5c2f35 (patch)
treef76d2f2f4c3cb855b057bd7e1ff290d41739ac46
parent7d3cc76c04b0dea2ab9b37cf804d4484ffd48080 (diff)
downloadpoky-856af3fa63cb970fd0ebecc307702e50cb5c2f35.tar.gz
libcanberra: Add patch to fix failures when the fallback theme is missing
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch b/meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch
new file mode 100644
index 0000000000..89a4fbf9f1
--- /dev/null
+++ b/meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch
@@ -0,0 +1,16 @@
1Index: libcanberra-0.10/src/sound-theme-spec.c
2===================================================================
3--- libcanberra-0.10.orig/src/sound-theme-spec.c 2009-05-22 17:08:23.000000000 +0100
4+++ libcanberra-0.10/src/sound-theme-spec.c 2009-05-22 17:12:50.000000000 +0100
5@@ -398,9 +398,9 @@
6 if ((ret = load_theme_dir(t, name)) < 0)
7 goto fail;
8
9+ /* The fallback theme may intentionally not exist so ignore failure */
10 if (!t->loaded_fallback_theme)
11- if ((ret = load_theme_dir(t, FALLBACK_THEME)) < 0)
12- goto fail;
13+ load_theme_dir(t, FALLBACK_THEME);
14
15 if (*_t)
16 ca_theme_data_free(*_t);