[SCM] vlc/master: Drop xulrunner-1.9.1.patch (accepted upstream).

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Thu Oct 6 23:44:18 UTC 2011


The following commit has been merged in the master branch:
commit 951f2b9921ae771e76aafc091baf7a3ecaf330a7
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Oct 6 23:24:58 2011 +0200

    Drop xulrunner-1.9.1.patch (accepted upstream).

diff --git a/debian/patches/series b/debian/patches/series
index 909c771..79caf8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 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
deleted file mode 100644
index 2cafca9..0000000
--- a/debian/patches/xulrunner-1.9.1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Make vlc compatible with xulrunner 1.9.1
-Author: Benjamin Drung <bdrung at debian.org>
-Forwarded: not-needed
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -4559,8 +4559,8 @@
-           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
---- a/projects/mozilla/vlcplugin.h
-+++ b/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
---- a/projects/mozilla/control/nporuntime.cpp
-+++ b/projects/mozilla/control/nporuntime.cpp
-@@ -27,8 +27,8 @@
- #include <string.h>
- #include <stdlib.h>
- 
--#include "nporuntime.h"
- #include "vlcplugin.h"
-+#include "nporuntime.h"
- 
- char* RuntimeNPObject::stringValue(const NPString &s)
- {

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list