]> code.ossystems Code Review - openembedded-core.git/commitdiff
libcanberra: Add patch to fix failures when the fallback theme is missing
authorRichard Purdie <rpurdie@linux.intel.com>
Fri, 22 May 2009 16:32:17 +0000 (17:32 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Fri, 22 May 2009 16:32:17 +0000 (17:32 +0100)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch [new file with mode: 0644]

diff --git a/meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch b/meta-moblin/packages/pulseaudio/libcanberra/nofallbackfix.patch
new file mode 100644 (file)
index 0000000..89a4fbf
--- /dev/null
@@ -0,0 +1,16 @@
+Index: libcanberra-0.10/src/sound-theme-spec.c
+===================================================================
+--- libcanberra-0.10.orig/src/sound-theme-spec.c       2009-05-22 17:08:23.000000000 +0100
++++ libcanberra-0.10/src/sound-theme-spec.c    2009-05-22 17:12:50.000000000 +0100
+@@ -398,9 +398,9 @@
+     if ((ret = load_theme_dir(t, name)) < 0)
+         goto fail;
++    /* The fallback theme may intentionally not exist so ignore failure */
+     if (!t->loaded_fallback_theme)
+-        if ((ret = load_theme_dir(t, FALLBACK_THEME)) < 0)
+-            goto fail;
++        load_theme_dir(t, FALLBACK_THEME);
+     if (*_t)
+         ca_theme_data_free(*_t);