[SCM] lives/master: Attempt to fix FTBFS on kfreebsd.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 110901c25f819729f6a52ff5596549e8ab31f75f
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 1 13:38:39 2012 +0100

    Attempt to fix FTBFS on kfreebsd.

diff --git a/debian/patches/91-lives_160_ftbfs.patch b/debian/patches/91-lives_160_ftbfs.patch
new file mode 100644
index 0000000..20cd298
--- /dev/null
+++ b/debian/patches/91-lives_160_ftbfs.patch
@@ -0,0 +1,20 @@
+Description: Attempt to fix FTBFS on kfreebsd.
+From: http://lives.svn.sf.net/viewvc/lives/trunk/src/callbacks.c?r1=1324&r2=1327
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657775
+---
+ src/callbacks.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- lives.orig/src/callbacks.c
++++ lives/src/callbacks.c
+@@ -5857,7 +5857,9 @@ void on_fs_preview_clicked (GtkButton *b
+   if (!(height*width)) {
+     // media preview
+     if (!capable->has_mplayer) {
+-      do_blocking_error_dialog(_ ("\n\nYou need to install mplayer to be able to preview this file.\n"));
++      gchar *msg=g_strdup(_ ("\n\nYou need to install mplayer to be able to preview this file.\n"));
++      do_blocking_error_dialog(msg);
++      g_free(msg);
+       return;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 28e26b8..6926891 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
+91-lives_160_ftbfs.patch

-- 
lives packaging