[SCM] beast/master: Remove 202_gcc43_44.diff, no longer needed.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat May 7 09:46:00 UTC 2011
The following commit has been merged in the master branch:
commit 2591056518fd1de429be4c6056918a257e1763b8
Author: Alessio Treglia <alessio at debian.org>
Date: Sat May 7 11:45:44 2011 +0200
Remove 202_gcc43_44.diff, no longer needed.
diff --git a/debian/patches/202_gcc43_44.diff b/debian/patches/202_gcc43_44.diff
deleted file mode 100644
index 355304b..0000000
--- a/debian/patches/202_gcc43_44.diff
+++ /dev/null
@@ -1,314 +0,0 @@
----
- birnet/birnetmsg.cc | 2 ++
- birnet/birnetutils.cc | 4 ++++
- birnet/birnetutils.hh | 1 +
- birnet/tests/sorting.cc | 1 +
- birnet/tests/strings.cc | 2 ++
- birnet/tests/threads.cc | 1 +
- bse/bsecxxplugin.hh | 8 ++++++++
- bse/bseloader-guspatch.cc | 1 +
- bse/bseprocidl.cc | 1 +
- bse/bseresamplerimpl.hh | 3 +++
- bse/bsesequencer.cc | 1 +
- bse/tests/filtertest.cc | 2 ++
- bse/tests/firhandle.cc | 1 +
- bse/tests/resamplehandle.cc | 1 +
- sfi/sficxx.hh | 1 +
- sfi/sfidl-cxxbase.cc | 1 +
- sfi/sfidl-options.cc | 2 ++
- sfi/sfidl-parser.cc | 3 +++
- tests/bse/cxxbinding.cc | 1 +
- tests/bse/filtertest.cc | 2 ++
- tests/latency/bselatencytest.cc | 1 +
- tests/perftest.cc | 2 ++
- tools/bsefcompare.cc | 2 ++
- tools/bsefextract.cc | 2 ++
- tools/bsewavetool.cc | 2 ++
- tools/bwtwave.cc | 3 ++-
- 26 files changed, 50 insertions(+), 1 deletion(-)
-
---- beast.orig/bse/tests/firhandle.cc
-+++ beast/bse/tests/firhandle.cc
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <complex>
- #include <vector>
-+#include <cstdlib>
-
- using std::vector;
- using std::min;
---- beast.orig/bse/tests/filtertest.cc
-+++ beast/bse/tests/filtertest.cc
-@@ -26,6 +26,8 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <complex>
-+#include <cstdlib>
-+#include <cstdio>
-
- typedef std::complex<double> Complex;
- using namespace Birnet;
---- beast.orig/bse/bseprocidl.cc
-+++ beast/bse/bseprocidl.cc
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <string>
- #include <set>
-+#include <cstring>
-
- std::set<std::string> needTypes;
- std::set<std::string> needClasses;
---- beast.orig/bse/bsecxxplugin.hh
-+++ beast/bse/bsecxxplugin.hh
-@@ -17,6 +17,14 @@
- #ifndef __BSE_CXX_PLUGIN_H__
- #define __BSE_CXX_PLUGIN_H__
-
-+#define static_template static
-+#if defined __GNUC__
-+# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-+# undef static_template
-+# define static_template
-+# endif
-+#endif
-+
- #include <bse/bsecxxmodule.hh>
- #include <bse/bseexports.h>
- #include <bse/bseparam.h>
---- beast.orig/bse/bseloader-guspatch.cc
-+++ beast/bse/bseloader-guspatch.cc
-@@ -21,6 +21,7 @@
- #include <string.h>
- #include <vector>
- #include <string>
-+#include <cstring>
-
- #undef WITH_GUSPATCH_XINFOS
- static SFI_MSG_TYPE_DEFINE (debug_guspatch, "guspatch", SFI_MSG_DEBUG, NULL);
---- beast.orig/bse/bsesequencer.cc
-+++ beast/bse/bsesequencer.cc
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <string.h>
- #include <vector>
-+#include <cstring>
-
- /* due to a linker/compiler bug on SuSE 9.2, we need to
- * define extern "C" symbols outside of any C++ namespace,
---- beast.orig/sfi/sfidl-cxxbase.cc
-+++ beast/sfi/sfidl-cxxbase.cc
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include <ctype.h>
-+#include <cstring>
- #include "sfidl-namespace.hh"
- #include "sfidl-options.hh"
- #include "sfidl-parser.hh"
---- beast.orig/sfi/sficxx.hh
-+++ beast/sfi/sficxx.hh
-@@ -22,6 +22,7 @@
- #include <string>
- #include <string.h>
- #include <new>
-+#include <cstring>
-
- namespace Sfi {
-
---- beast.orig/tools/bsefextract.cc
-+++ beast/tools/bsefextract.cc
-@@ -27,6 +27,8 @@
- #include <errno.h>
- #include <assert.h>
- #include "topconfig.h"
-+#include <cstring>
-+#include <cstdlib>
-
- #include <map>
- #include <string>
---- beast.orig/birnet/birnetmsg.cc
-+++ beast/birnet/birnetmsg.cc
-@@ -21,6 +21,8 @@
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdio>
-
- #ifndef _ // FIXME
- #define _(x) (x)
---- beast.orig/birnet/birnetutils.cc
-+++ beast/birnet/birnetutils.cc
-@@ -31,6 +31,10 @@
- #include <signal.h>
- #include <string.h>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdio>
-+#include <cstring>
-+#include <cerrno>
-
- #ifndef _
- #define _(s) s
---- beast.orig/birnet/tests/sorting.cc
-+++ beast/birnet/tests/sorting.cc
-@@ -18,6 +18,7 @@
- #include <birnet/birnettests.h>
- #include <math.h>
- #include <stdlib.h>
-+#include <cstdlib>
- #include <algorithm>
-
- namespace {
---- beast.orig/birnet/tests/strings.cc
-+++ beast/birnet/tests/strings.cc
-@@ -18,6 +18,8 @@
- #include <birnet/birnettests.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <cstdlib>
-+#include <cstdio>
-
- using namespace Birnet;
-
---- beast.orig/birnet/tests/threads.cc
-+++ beast/birnet/tests/threads.cc
-@@ -17,6 +17,7 @@
- //#define TEST_VERBOSE
- #include <birnet/birnettests.h>
- #include <stdlib.h>
-+#include <cstdlib>
-
- namespace {
- using namespace Birnet;
---- beast.orig/bse/bseresamplerimpl.hh
-+++ beast/bse/bseresamplerimpl.hh
-@@ -24,6 +24,9 @@
- #include <string.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <cstdlib>
-+#include <cstdio>
-+#include <cstring>
- #ifdef __SSE__
- #include <xmmintrin.h>
- #endif
---- beast.orig/bse/tests/resamplehandle.cc
-+++ beast/bse/tests/resamplehandle.cc
-@@ -22,6 +22,7 @@
- #include <bse/gsldatautils.h>
- #include <bse/bseblockutils.hh>
- #include <stdlib.h>
-+#include <cstdlib>
- #include <vector>
- #include <string>
- #include <map>
---- beast.orig/sfi/sfidl-parser.cc
-+++ beast/sfi/sfidl-parser.cc
-@@ -21,6 +21,9 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cstdio>
- #include "sfidl-parser.hh"
- #include "sfidl-namespace.hh"
- #include "sfidl-options.hh"
---- beast.orig/sfi/sfidl-options.cc
-+++ beast/sfi/sfidl-options.cc
-@@ -21,6 +21,8 @@
- #include <sfi/glib-extra.h>
- #include <stdio.h>
- #include <string.h>
-+#include <cstring>
-+#include <cstdio>
-
- /* FIXME: should be filled out and written into topconfig.h by configure */
- #define SFIDL_VERSION BST_VERSION
---- beast.orig/tests/bse/filtertest.cc
-+++ beast/tests/bse/filtertest.cc
-@@ -28,6 +28,8 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <cstdlib>
-+#include <cstdio>
-
- using std::string;
- using std::vector;
---- beast.orig/tools/bsefcompare.cc
-+++ beast/tools/bsefcompare.cc
-@@ -27,6 +27,8 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <string.h>
-+#include <cstring>
-+#include <cstdio>
-
- #include "topconfig.h"
-
---- beast.orig/tools/bsewavetool.cc
-+++ beast/tools/bsewavetool.cc
-@@ -27,6 +27,8 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-+#include <cstring>
-+#include <cstdlib>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- beast.orig/birnet/birnetutils.hh
-+++ beast/birnet/birnetutils.hh
-@@ -23,6 +23,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <cstdarg>
- #include <stdarg.h>
-
- namespace Birnet {
---- beast.orig/tests/bse/cxxbinding.cc
-+++ beast/tests/bse/cxxbinding.cc
-@@ -18,6 +18,7 @@
- #include <bse/bse.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <cstdio>
-
- static SfiGlueContext *bse_context = NULL;
-
---- beast.orig/tests/latency/bselatencytest.cc
-+++ beast/tests/latency/bselatencytest.cc
-@@ -19,6 +19,7 @@
- #include <string>
- #include <errno.h>
- #include <stdio.h>
-+#include <cstdio>
-
- using namespace std;
- using namespace Sfi;
---- beast.orig/tests/perftest.cc
-+++ beast/tests/perftest.cc
-@@ -20,6 +20,8 @@
- #include <sys/time.h>
- #include <time.h>
- #include <stdio.h>
-+#include <cstdio>
-+#include <ctime>
-
- static SfiGlueContext *bse_context = NULL;
-
---- beast.orig/tools/bwtwave.cc
-+++ beast/tools/bwtwave.cc
-@@ -27,7 +27,8 @@
- #include <algorithm>
- #include <vector>
- #include <map>
--
-+#include <cerrno>
-+#include <cstdio>
-
- namespace BseWaveTool {
-
diff --git a/debian/patches/series b/debian/patches/series
index 0ca6936..f13ef38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
100_deprecated.diff
-202_gcc43_44.diff
203_gcc45.patch
210_volatile.diff
300-desktop_file.patch
--
beast packaging
More information about the pkg-multimedia-commits
mailing list