[SCM] beast/master: More GCC-4.7 fixes.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d509bd6c76e5f24c092f959b72b0cb8c31f0e81a
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 5 11:47:35 2012 +0000

    More GCC-4.7 fixes.

diff --git a/debian/patches/500-gcc47.patch b/debian/patches/500-gcc47.patch
index 393dcb4..9534123 100644
--- a/debian/patches/500-gcc47.patch
+++ b/debian/patches/500-gcc47.patch
@@ -2,15 +2,19 @@ Description: Fix #includes to avoid FTBFS with GCC 4.7.
  Applied upstream, commits:
   - 71ac19f78569f287f7e6db0147b6627a4d4acb0d
   - c17259d4b29dbc47a9657f172322d4d908fcd4cf
-Author: Alessio Treglia <alessio at debian.org>
+  - 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 +
- 5 files changed, 5 insertions(+), 1 deletion(-)
+ 7 files changed, 13 insertions(+), 15 deletions(-)
 
 --- beast.orig/birnet/birnetutils.cc
 +++ beast/birnet/birnetutils.cc
@@ -63,3 +67,77 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672030
  #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;

-- 
beast packaging