[SCM] vlc/master: Drop link-binaries-with-c++.patch.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 821917e65b78cf1b621b90cb1a6482dedeeeaf7d
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Oct 29 01:12:29 2013 +0100

    Drop link-binaries-with-c++.patch.

diff --git a/debian/patches/link-binaries-with-c++.patch b/debian/patches/link-binaries-with-c++.patch
deleted file mode 100644
index f95a09b..0000000
--- a/debian/patches/link-binaries-with-c++.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Sam Hocevar <sam at hocevar.net>
-Subject: [PATCH] Link vlc-cache-gen with the C++ standard library to avoid
- issues when we dlclose() a C++ plugin that was built with a
- faulty library that may have registered __cxa_atexit
- callbacks (usually through the libstdc++ that library was
- built with).
- .
- Upgrading libstdc++ is not always a solution since some code may have been
- inlined and we can't get rid of it.
-Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commitdiff;h=07d38617832be934896fa7a14fe52f1a65c901ab
-Bug-Debian: http://bugs.debian.org/660934
-Bug-Debian: http://bugs.debian.org/660935
-Bug-Debian: http://bugs.debian.org/661819
-
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -17,7 +17,7 @@
- 
- if !HAVE_WIN32
- bin_PROGRAMS += vlc-wrapper
--vlc_SOURCES = vlc.c override.c
-+vlc_SOURCES = vlc.c override.c dummy.cpp
- endif
- 
- EXTRA_vlc_SOURCES = vlc.c winvlc.c
-@@ -56,7 +56,7 @@
- vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
- 	$(WINDRES) --include-dir $(top_srcdir)/share/icons --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
- 
--vlc_cache_gen_SOURCES = cachegen.c
-+vlc_cache_gen_SOURCES = cachegen.c dummy.cpp
- vlc_cache_gen_LDADD = \
- 	$(GNUGETOPT_LIBS) \
- 	../compat/libcompat.la \
---- /dev/null
-+++ b/bin/dummy.cpp
-@@ -0,0 +1 @@
-+/* This file is only here to force cachegen to be linked against libstdc++ */
diff --git a/debian/patches/series b/debian/patches/series
index 894cdda..4164551 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-link-binaries-with-c++.patch
 pnap-grammar.patch
 altivec.patch

-- 
VLC media player packaging