[SCM] beast/master.experimental: Refresh patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun Jan 27 03:31:08 UTC 2013
The following commit has been merged in the master.experimental branch:
commit d563248b44b92fa3ace58e5be45011cdf0e4e9a9
Author: Alessio Treglia <alessio at debian.org>
Date: Sun Jan 27 03:30:50 2013 +0000
Refresh patches.
diff --git a/debian/patches/100_deprecated.diff b/debian/patches/100_deprecated.diff
index f52a4cc..b9c9b85 100644
--- a/debian/patches/100_deprecated.diff
+++ b/debian/patches/100_deprecated.diff
@@ -4,8 +4,8 @@
--- beast.orig/bse/Makefile.in
+++ beast/bse/Makefile.in
-@@ -519,7 +519,7 @@ top_srcdir = @top_srcdir@
- # need -I$(srcdir) for "bseserver.h" in .genprc.c
+@@ -503,7 +503,7 @@ top_srcdir = @top_srcdir@
+ # need -I$(srcdir) for "bseserver.hh" in .genprc.cc
# need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. \
- $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
diff --git a/debian/patches/210_volatile.diff b/debian/patches/210_volatile.diff
index 1386323..e50b91d 100644
--- a/debian/patches/210_volatile.diff
+++ b/debian/patches/210_volatile.diff
@@ -8,8 +8,8 @@ Bug-Debian: http://bugs.debian.org/540681
--- beast.orig/birnet/birnetthreadimpl.cc
+++ beast/birnet/birnetthreadimpl.cc
-@@ -1489,7 +1489,7 @@ birnet_g_atomic_int_get (volatile int *a
-
+@@ -1349,7 +1349,7 @@ birnet_g_atomic_int_get (volatile int *a
+ #endif
#ifdef g_atomic_pointer_get
static void*
-birnet_g_atomic_pointer_get (volatile void **atomic)
diff --git a/debian/patches/400-format-security.patch b/debian/patches/400-format-security.patch
index 60f5cae..86dfd15 100644
--- a/debian/patches/400-format-security.patch
+++ b/debian/patches/400-format-security.patch
@@ -8,21 +8,17 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647040
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=665097
Forwarded: Tim Janik <tim.janik at googlemail.com>
---
- bse/bseconstant.cc | 6 +++---
- bse/bsecxxvalue.cc | 4 ++--
- bse/bsedatapocket.cc | 2 +-
- bse/bseitem.cc | 2 +-
- bse/bsejanitor.cc | 6 +++---
- bse/bsemain.cc | 4 ++--
- bse/bsestorage.c | 2 +-
- bse/bsetrack.c | 2 +-
- sfi/sfidl-parser.cc | 2 +-
- tools/magictest.cc | 4 ++--
- 10 files changed, 17 insertions(+), 17 deletions(-)
+ bse/bseconstant.cc | 6 +++---
+ bse/bsecxxvalue.cc | 4 ++--
+ bse/bseitem.cc | 2 +-
+ bse/bsejanitor.cc | 6 +++---
+ bse/bsemain.cc | 4 ++--
+ sfi/sfidl-parser.cc | 2 +-
+ 6 files changed, 12 insertions(+), 12 deletions(-)
--- beast.orig/sfi/sfidl-parser.cc
+++ beast/sfi/sfidl-parser.cc
-@@ -238,7 +238,7 @@ Type Parser::typeOf (const String& type)
+@@ -204,7 +204,7 @@ Type Parser::typeOf (const String& type)
if (isSequence (type)) return SEQUENCE;
if (isRecord (type)) return RECORD;
if (isClass (type)) return OBJECT;
@@ -30,10 +26,10 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
+ g_error ("%s", ("invalid type: " + type).c_str());
return VOID;
}
-
+ Sequence Parser::findSequence(const String& name) const
--- beast.orig/bse/bsemain.cc
+++ beast/bse/bsemain.cc
-@@ -267,9 +267,9 @@ bse_init_core (void)
+@@ -216,9 +216,9 @@ bse_init_core (void)
/* dump device list */
if (bse_main_args->dump_driver_list)
{
@@ -47,7 +43,7 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
}
--- beast.orig/bse/bsecxxvalue.cc
+++ beast/bse/bsecxxvalue.cc
-@@ -56,9 +56,9 @@ Value::get_string () const
+@@ -37,9 +37,9 @@ Value::get_string () const
{
GValue *v = gvalue();
if (SFI_VALUE_HOLDS_STRING (v))
@@ -61,16 +57,16 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
}
--- beast.orig/bse/bseconstant.cc
+++ beast/bse/bseconstant.cc
-@@ -105,7 +105,7 @@ bse_constant_class_init (BseConstantClas
+@@ -70,7 +70,7 @@ bse_constant_class_init (BseConstantClas
+ {
gchar *ident, *label, *blurb, *group = g_strdup_printf (_("Constant Output %u"), i);
-
ident = g_strdup_printf ("value_%u", i);
- label = g_strdup_printf (_("Value [float]"));
+ label = g_strdup_printf ("%s", _("Value [float]"));
bse_object_class_add_param (object_class, group, PARAM_VALUE + (i - 1) * 3,
sfi_pspec_real (ident, label, _("Constant signal value"),
1.0, -1.0, 1.0, 0.01,
-@@ -113,7 +113,7 @@ bse_constant_class_init (BseConstantClas
+@@ -78,7 +78,7 @@ bse_constant_class_init (BseConstantClas
g_free (ident);
g_free (label);
ident = g_strdup_printf ("frequency_%u", i);
@@ -79,7 +75,7 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
bse_object_class_add_param (object_class, group, PARAM_FREQ + (i - 1) * 3,
sfi_pspec_log_scale (ident, label, _("Constant signal value interpreted as frequency value in Hertz"),
BSE_MAX_FREQUENCY,
-@@ -124,7 +124,7 @@ bse_constant_class_init (BseConstantClas
+@@ -89,7 +89,7 @@ bse_constant_class_init (BseConstantClas
g_free (ident);
g_free (label);
ident = g_strdup_printf ("note_%u", i);
@@ -88,42 +84,9 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
bse_object_class_add_param (object_class, group, PARAM_NOTE + (i - 1) * 3,
sfi_pspec_note (ident, label, _("Constant signal value as note, converted to Hertz according to the current musical tuning"),
SFI_KAMMER_NOTE, SFI_MIN_NOTE, SFI_MAX_NOTE,
---- beast.orig/bse/bsedatapocket.cc
-+++ beast/bse/bsedatapocket.cc
-@@ -552,7 +552,7 @@ object_entry_resolved (void *d
- BseDataPocket *pocket = BSE_DATA_POCKET (from_item);
-
- if (error)
-- bse_storage_warn (storage, error);
-+ bse_storage_warn (storage, "%s", error);
- else if (oentry->id)
- {
- BseDataPocketValue value;
---- beast.orig/bse/bsestorage.c
-+++ beast/bse/bsestorage.c
-@@ -601,7 +601,7 @@ item_link_resolved (gpointer data,
- const gchar *error)
- {
- if (error)
-- bse_storage_warn (self, error);
-+ bse_storage_warn (self, "%s", error);
- else
- {
- GParamSpec *pspec = data;
---- beast.orig/bse/bsetrack.c
-+++ beast/bse/bsetrack.c
-@@ -939,7 +939,7 @@ part_link_resolved (gpointer data
- BseTrack *self = BSE_TRACK (from_item);
-
- if (error)
-- bse_storage_warn (storage, error);
-+ bse_storage_warn (storage, "%s", error);
- else if (!BSE_IS_PART (to_item))
- bse_storage_warn (storage, "skipping invalid part reference: %s", bse_object_debug_name (to_item));
- else if (to_item->parent != from_item->parent)
--- beast.orig/bse/bseitem.cc
+++ beast/bse/bseitem.cc
-@@ -885,7 +885,7 @@ undo_call_proc (BseUndoStep *ustep,
+@@ -743,7 +743,7 @@ undo_call_proc (BseUndoStep *ustep,
{
const char *packed_item_pointer = g_value_get_string (ivalues + 0);
BseItem *item = (BseItem*) bse_undo_pointer_unpack (packed_item_pointer, ustack);
@@ -134,7 +97,7 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
redo_step->data[0].v_pointer = proc;
--- beast.orig/bse/bsejanitor.cc
+++ beast/bse/bsejanitor.cc
-@@ -532,9 +532,9 @@ janitor_idle_clean_jsource (void *data)
+@@ -445,9 +445,9 @@ janitor_idle_clean_jsource (void *data)
{
self->exit_code = 256; /* exit code used for signals */
if (port->exit_signal_sent && port->sigkill_sent)
@@ -146,7 +109,7 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
else if (port->exit_signal && port->dumped_core)
self->exit_reason = g_strdup_printf (_("%s (core dumped)"), g_strsignal (port->exit_signal));
else if (port->exit_signal)
-@@ -560,7 +560,7 @@ janitor_idle_clean_jsource (void *data)
+@@ -473,7 +473,7 @@ janitor_idle_clean_jsource (void *data)
{
/* not a janitor for a remote process */
self->exit_code = -256;
@@ -155,18 +118,3 @@ Forwarded: Tim Janik <tim.janik at googlemail.com>
}
sfi_com_port_unref (port);
self->port = NULL;
---- beast.orig/tools/magictest.cc
-+++ beast/tools/magictest.cc
-@@ -92,10 +92,10 @@ main (gint argc,
-
- g_print ("%s:", argv[i]);
- pad = g_strnfill (MAX (40, l) - l, ' ');
-- g_print (pad);
-+ g_print ("%s", pad);
- g_free (pad);
- if (!magic && !loader)
-- g_print (" no magic/loader found");
-+ g_print ("%s", " no magic/loader found");
- else
- {
- if (magic)
--
beast packaging
More information about the pkg-multimedia-commits
mailing list