[SCM] cmus/master: Handle missing dependencies more gracefully.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ee86029743a3aca685c94890cdde938e0277f487
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 30 09:19:39 2011 +0200

    Handle missing dependencies more gracefully.
    
    cmus silently skips plugins with missing dependencies, and instead
    outputs a debug message.

diff --git a/debian/patches/21-missing_plugins.patch b/debian/patches/21-missing_plugins.patch
new file mode 100644
index 0000000..58c0911
--- /dev/null
+++ b/debian/patches/21-missing_plugins.patch
@@ -0,0 +1,30 @@
+Subject: Handle missing dependencies more gracefully.
+Author: Johannes Weißl <jargon at molb.org>
+Applied-Upstream: https://gitorious.org/cmus/cmus/commit/391272701
+---
+ input.c  |    2 +-
+ output.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- cmus.orig/input.c
++++ cmus/input.c
+@@ -399,7 +399,7 @@ void ip_load_plugins(void)
+ 
+ 		so = dlopen(filename, RTLD_NOW);
+ 		if (so == NULL) {
+-			error_msg("%s", dlerror());
++			d_print("%s: %s\n", filename, dlerror());
+ 			continue;
+ 		}
+ 
+--- cmus.orig/output.c
++++ cmus/output.c
+@@ -105,7 +105,7 @@ void op_load_plugins(void)
+ 
+ 		so = dlopen(filename, RTLD_NOW);
+ 		if (so == NULL) {
+-			error_msg("%s", dlerror());
++			d_print("%s: %s\n", filename, dlerror());
+ 			continue;
+ 		}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9b32268..701dce9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10-roaraudio_support.patch
 20-segfault_on_adding_to_queue.patch
+21-missing_plugins.patch

-- 
cmus packaging