[SCM] vlc/master: Make vlc compatible with xulrunner 1.9.1.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2347918a66056a8b5bcac4f465bf9f6d07691451
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Feb 7 23:08:04 2011 +0100

    Make vlc compatible with xulrunner 1.9.1.

diff --git a/debian/control b/debian/control
index 819651d..56415e7 100644
--- a/debian/control
+++ b/debian/control
@@ -92,7 +92,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                lua5.1,
                nasm,
                pkg-config,
-               xulrunner-dev (>= 1.9.2),
+               xulrunner-dev (>= 1.9.1),
                yasm [amd64 kfreebsd-amd64],
                zlib1g-dev
 Standards-Version: 3.9.1
diff --git a/debian/patches/series b/debian/patches/series
index 7e96ff5..ac233f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 052_as-needed.patch
 200_osdmenu_paths.patch
+xulrunner-1.9.1.patch
diff --git a/debian/patches/xulrunner-1.9.1.patch b/debian/patches/xulrunner-1.9.1.patch
new file mode 100644
index 0000000..3a684f3
--- /dev/null
+++ b/debian/patches/xulrunner-1.9.1.patch
@@ -0,0 +1,54 @@
+Description: Make vlc compatible with xulrunner 1.9.1
+Author: Benjamin Drung <bdrung at debian.org>
+Forwarded: not-needed
+
+--- vlc-1.1.7.orig/configure
++++ vlc-1.1.7/configure
+@@ -47498,9 +47498,9 @@ $as_echo "$as_me: Checking for Mozilla"
+           if test -n "$i"
+           then
+             echo "Trying to find $i package" >&5
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i >= 1.9.2" >&5
+-$as_echo_n "checking for $i >= 1.9.2... " >&6; }
+-            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i >= 1.9.1" >&5
++$as_echo_n "checking for $i >= 1.9.1... " >&6; }
++            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.1" 2>&5
+             then
+               echo "Using $i pkg-config package." >&5
+               echo "Using $i package." >&6
+@@ -47728,7 +47728,7 @@ fi
+ done
+ test -n "$MOZILLA_CONFIG" || MOZILLA_CONFIG="no"
+ 
+-            test "${MOZILLA_CONFIG}" = "no" && as_fn_error $? "Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla." "$LINENO" 5
++            test "${MOZILLA_CONFIG}" = "no" && as_fn_error $? "Please install the Mozilla development tools (version 1.9.1 or higher) or use --disable-mozilla." "$LINENO" 5
+ 
+ 
+ fi
+--- vlc-1.1.7.orig/configure.ac
++++ vlc-1.1.7/configure.ac
+@@ -4554,8 +4554,8 @@ then
+           if test -n "$i"
+           then
+             echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
+-            AC_MSG_CHECKING([for $i >= 1.9.2])
+-            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD
++            AC_MSG_CHECKING([for $i >= 1.9.1])
++            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.1" 2>&AS_MESSAGE_LOG_FD
+             then
+               echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
+               echo "Using $i package." >&AS_MESSAGE_FD
+--- vlc-1.1.7.orig/projects/mozilla/vlcplugin.h
++++ vlc-1.1.7/projects/mozilla/vlcplugin.h
+@@ -29,6 +29,10 @@
+ #ifndef __VLCPLUGIN_H__
+ #define __VLCPLUGIN_H__
+ 
++// Changes for compatibility to xulrunner 1.9.1
++#define UTF8Characters utf8characters
++#define UTF8Length utf8length
++
+ #include <vlc/vlc.h>
+ 
+ // Setup XP_MACOSX, XP_UNIX, XP_WIN

-- 
VLC media player packaging