[SCM] beast/master.experimental: Remove debian/patches/*gcc4*.patch patches, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Nov 6 09:52:22 UTC 2012
The following commit has been merged in the master.experimental branch:
commit 479304e24e38288167fcb829de93a89a41d04dc6
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Nov 6 09:44:56 2012 +0000
Remove debian/patches/*gcc4*.patch patches, applied upstream.
diff --git a/debian/patches/203_gcc45.patch b/debian/patches/203_gcc45.patch
deleted file mode 100644
index 66eca2f..0000000
--- a/debian/patches/203_gcc45.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: When DBL_MIN/DBL_MAX or DBL_EPSILON are used in a static
- assertions g++-4.5 rejects the code.
-From: http://mail.gnome.org/archives/beast/2011-April/msg00004.html
----
- birnet/birnetcdefs.h | 10 ++++++++++
- birnet/birnetutils.cc | 6 +++---
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
---- beast.orig/birnet/birnetcdefs.h
-+++ beast/birnet/birnetcdefs.h
-@@ -111,6 +111,16 @@ BIRNET_EXTERN_C_BEGIN();
- #define BIRNET_CPP_PASTE2(a,b) BIRNET_CPP_PASTE2i (a,b)
- #define BIRNET_STATIC_ASSERT_NAMED(expr,asname) typedef struct { char asname[(expr) ? 1 : -1]; } BIRNET_CPP_PASTE2 (Birnet_StaticAssertion_LINE, __LINE__)
- #define BIRNET_STATIC_ASSERT(expr) BIRNET_STATIC_ASSERT_NAMED (expr, compile_time_assertion_failed)
-+#define BIRNET_STARTUP_ASSERT_IMPL(expr,asname) \
-+ namespace Birnet { \
-+ namespace StartupAssert { \
-+ struct asname { \
-+ asname() { g_assert (expr); } \
-+ } BIRNET_CPP_PASTE2(asname,_instance); \
-+ } \
-+ }
-+#define BIRNET_STARTUP_ASSERT(expr) BIRNET_STARTUP_ASSERT_IMPL(expr, BIRNET_CPP_PASTE2 (Assertion_LINE, __LINE__))
-+
-
- /* --- attributes --- */
- #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
---- beast.orig/birnet/birnetutils.cc
-+++ beast/birnet/birnetutils.cc
-@@ -250,9 +250,9 @@ BIRNET_STATIC_ASSERT (UINT64_MAX == +1
- BIRNET_STATIC_ASSERT (FLT_MIN <= 1E-37);
- BIRNET_STATIC_ASSERT (FLT_MAX >= 1E+37);
- BIRNET_STATIC_ASSERT (FLT_EPSILON <= 1E-5);
--BIRNET_STATIC_ASSERT (DBL_MIN <= 1E-37);
--BIRNET_STATIC_ASSERT (DBL_MAX >= 1E+37);
--BIRNET_STATIC_ASSERT (DBL_EPSILON <= 1E-9);
-+BIRNET_STARTUP_ASSERT (DBL_MIN <= 1E-37);
-+BIRNET_STARTUP_ASSERT (DBL_MAX >= 1E+37);
-+BIRNET_STARTUP_ASSERT (DBL_EPSILON <= 1E-9);
- BIRNET_STATIC_ASSERT (LDBL_MIN <= 1E-37);
- BIRNET_STATIC_ASSERT (LDBL_MAX >= 1E+37);
- BIRNET_STATIC_ASSERT (LDBL_EPSILON <= 1E-9);
diff --git a/debian/patches/500-gcc47.patch b/debian/patches/500-gcc47.patch
deleted file mode 100644
index 9534123..0000000
--- a/debian/patches/500-gcc47.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Description: Fix #includes to avoid FTBFS with GCC 4.7.
- Applied upstream, commits:
- - 71ac19f78569f287f7e6db0147b6627a4d4acb0d
- - c17259d4b29dbc47a9657f172322d4d908fcd4cf
- - 0bc5582c9d6ddeb23d236b2f55b59bf9b414a66a
- - 7b63939eb6e22f3bf2a99719d8b8443236f4476c
- - fd03d7275711266e1350f7fb85c23b0996060fcd
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672030
----
- birnet/birnetutils.cc | 1 +
- birnet/tests/threads.cc | 1 +
- bse/bsetype.c | 18 ++++++------------
- sfi/sfidl-parser.hh | 2 +-
- sfi/sfifilecrawler.c | 4 ++--
- tools/bsewavetool.hh | 1 +
- tools/bwtwave.cc | 1 +
- 7 files changed, 13 insertions(+), 15 deletions(-)
-
---- beast.orig/birnet/birnetutils.cc
-+++ beast/birnet/birnetutils.cc
-@@ -21,6 +21,7 @@
- #include "birnetmsg.hh"
- #include "birnetcpu.hh"
- #include <errno.h>
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
---- 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 <unistd.h>
-
- namespace {
- using namespace Birnet;
---- beast.orig/sfi/sfidl-parser.hh
-+++ beast/sfi/sfidl-parser.hh
-@@ -31,7 +31,7 @@ private:
-
- public:
- const Value& get(const Key& k) const {
-- typename std::map<Key,Value>::const_iterator i = find(k);
-+ typename std::map<Key,Value>::const_iterator i = this->find(k);
- if (i != this->end())
- return i->second;
- else
---- beast.orig/tools/bsewavetool.hh
-+++ beast/tools/bsewavetool.hh
-@@ -18,6 +18,7 @@
- #include <bse/gslwavechunk.h>
- #include "bseloopfuncs.h"
- #include "bwtwave.hh"
-+#include <unistd.h>
- #include <typeinfo>
- #include <string>
-
---- beast.orig/tools/bwtwave.cc
-+++ beast/tools/bwtwave.cc
-@@ -21,6 +21,7 @@
- #include <bse/bseloader.h>
- #include <bse/bsecxxutils.hh>
- #include <sys/stat.h>
-+#include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <stdio.h>
---- beast.orig/sfi/sfifilecrawler.c
-+++ beast/sfi/sfifilecrawler.c
-@@ -31,7 +31,7 @@ static gchar* get_user_home (const gch
-
-
- /* --- variables --- */
--static gchar *init_cwd = NULL;
-+static char *init_cwd = NULL;
-
-
- /* --- functions --- */
-@@ -42,7 +42,7 @@ _sfi_init_file_crawler (void)
- if (!init_cwd || !g_path_is_absolute (init_cwd))
- {
- g_free (init_cwd);
-- init_cwd = g_get_tmp_dir ();
-+ init_cwd = g_strdup (g_get_tmp_dir ());
- }
- if (!init_cwd || !g_path_is_absolute (init_cwd))
- {
---- beast.orig/bse/bsetype.c
-+++ beast/bse/bsetype.c
-@@ -113,22 +113,19 @@ bse_type_register_static (GType
- guint line,
- const GTypeInfo *info)
- {
-- GType type;
-+ GTypeInfo tmp_info;
-
- /* some builtin types have destructors eventhough they are registered
- * statically, compensate for that
- */
- if (G_TYPE_IS_INSTANTIATABLE (parent_type) && info->class_finalize)
- {
-- GTypeInfo tmp_info;
--
- tmp_info = *info;
- tmp_info.class_finalize = NULL;
- info = &tmp_info;
- }
--
-- type = g_type_register_static (parent_type, type_name, info, 0);
--
-+
-+ const GType type = g_type_register_static (parent_type, type_name, info, 0);
- bse_type_add_blurb (type, type_blurb, file, line);
-
- return type;
-@@ -142,22 +139,19 @@ bse_type_register_abstract (GType
- guint line,
- const GTypeInfo *info)
- {
-- GType type;
-+ GTypeInfo tmp_info;
-
- /* some builtin types have destructors eventhough they are registered
- * statically, compensate for that
- */
- if (G_TYPE_IS_INSTANTIATABLE (parent_type) && info->class_finalize)
- {
-- GTypeInfo tmp_info;
--
- tmp_info = *info;
- tmp_info.class_finalize = NULL;
- info = &tmp_info;
- }
--
-- type = g_type_register_static (parent_type, type_name, info, G_TYPE_FLAG_ABSTRACT);
--
-+
-+ const GType type = g_type_register_static (parent_type, type_name, info, G_TYPE_FLAG_ABSTRACT);
- bse_type_add_blurb (type, type_blurb, file, line);
-
- return type;
diff --git a/debian/patches/series b/debian/patches/series
index 550c99e..9574865 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
100_deprecated.diff
-203_gcc45.patch
210_volatile.diff
300-desktop_file.patch
400-format-security.patch
-500-gcc47.patch
--
beast packaging
More information about the pkg-multimedia-commits
mailing list