[SCM] beast/master.experimental: Drop 100_deprecated.diff, 210_volatile.diff, 400-format-security.patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri Apr 5 16:32:49 UTC 2013
The following commit has been merged in the master.experimental branch:
commit 43e40462dc37f66c2e28d574fb2ce828a43bd00d
Author: Alessio Treglia <alessio at debian.org>
Date: Fri Apr 5 17:32:15 2013 +0100
Drop 100_deprecated.diff, 210_volatile.diff, 400-format-security.patch, applied upstream.
diff --git a/debian/patches/100_deprecated.diff b/debian/patches/100_deprecated.diff
deleted file mode 100644
index b9c9b85..0000000
--- a/debian/patches/100_deprecated.diff
+++ /dev/null
@@ -1,15 +0,0 @@
----
- bse/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- beast.orig/bse/Makefile.in
-+++ beast/bse/Makefile.in
-@@ -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
-+ $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
- EXTRA_HEADERS =
- MAINTAINERCLEANFILES = $(GENERATED) $(am__append_2)
- # -Wl,-Bsymbolic
diff --git a/debian/patches/210_volatile.diff b/debian/patches/210_volatile.diff
deleted file mode 100644
index e50b91d..0000000
--- a/debian/patches/210_volatile.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Correct signature for the g_atomic_pointer_get() function.
-Author: Jakub Wilk <ubanus at users.sf.net>
-Bug-Debian: http://bugs.debian.org/540681
-
----
- birnet/birnetthreadimpl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- beast.orig/birnet/birnetthreadimpl.cc
-+++ beast/birnet/birnetthreadimpl.cc
-@@ -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)
-+birnet_g_atomic_pointer_get (void * volatile *atomic)
- {
- return (void*) g_atomic_pointer_get (atomic);
- }
diff --git a/debian/patches/400-format-security.patch b/debian/patches/400-format-security.patch
deleted file mode 100644
index 3b5ae33..0000000
--- a/debian/patches/400-format-security.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Description: Fix build failure with -Wformat-security.
-From:
- Ilya Barygin <randomaction at ubuntu.com>
- Alessio Treglia <alessio at debian.org>
-Reviewed-by: Alessio Treglia <alessio at debian.org>
-Last-Update: 2012-11-06
-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/bseitem.cc | 2 +-
- bse/bsejanitor.cc | 6 +++---
- bse/bsemain.cc | 4 ++--
- bse/bseserver.cc | 38 +++++++++++++++++++-------------------
- configure.in | 4 +++-
- sfi/sfidl-parser.cc | 2 +-
- 8 files changed, 34 insertions(+), 32 deletions(-)
-
---- beast.orig/sfi/sfidl-parser.cc
-+++ beast/sfi/sfidl-parser.cc
-@@ -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;
-- g_error (("invalid type: " + type).c_str());
-+ 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
-@@ -216,9 +216,9 @@ bse_init_core (void)
- /* dump device list */
- if (bse_main_args->dump_driver_list)
- {
-- g_printerr (_("\nAvailable PCM drivers:\n"));
-+ g_printerr ("%s", _("\nAvailable PCM drivers:\n"));
- bse_device_dump_list (BSE_TYPE_PCM_DEVICE, " ", TRUE, NULL, NULL);
-- g_printerr (_("\nAvailable MIDI drivers:\n"));
-+ g_printerr ("%s", _("\nAvailable MIDI drivers:\n"));
- bse_device_dump_list (BSE_TYPE_MIDI_DEVICE, " ", TRUE, NULL, NULL);
- }
- }
---- beast.orig/bse/bsecxxvalue.cc
-+++ beast/bse/bsecxxvalue.cc
-@@ -37,9 +37,9 @@ Value::get_string () const
- {
- GValue *v = gvalue();
- if (SFI_VALUE_HOLDS_STRING (v))
-- return sfi_value_get_string (v);
-+ return (const SfiString) sfi_value_get_string (v);
- else if (SFI_VALUE_HOLDS_CHOICE (v))
-- return sfi_value_get_choice (v);
-+ return (const SfiString) sfi_value_get_choice (v);
- else
- throw WrongTypeGValue (G_STRLOC);
- }
---- beast.orig/bse/bseconstant.cc
-+++ beast/bse/bseconstant.cc
-@@ -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,
-@@ -78,7 +78,7 @@ bse_constant_class_init (BseConstantClas
- g_free (ident);
- g_free (label);
- ident = g_strdup_printf ("frequency_%u", i);
-- label = g_strdup_printf (_("Frequency"));
-+ label = g_strdup_printf ("%s", _("Frequency"));
- 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,
-@@ -89,7 +89,7 @@ bse_constant_class_init (BseConstantClas
- g_free (ident);
- g_free (label);
- ident = g_strdup_printf ("note_%u", i);
-- label = g_strdup_printf (_("Note"));
-+ label = g_strdup_printf ("%s", _("Note"));
- 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/bseitem.cc
-+++ beast/bse/bseitem.cc
-@@ -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);
-- BseUndoStack *redo_stack = (BseUndoStack*) bse_item_undo_open (item, BSE_PROCEDURE_NAME (proc));
-+ BseUndoStack *redo_stack = (BseUndoStack*) bse_item_undo_open (item, "%s", BSE_PROCEDURE_NAME (proc));
- BseUndoStep *redo_step;
- redo_step = bse_undo_step_new (undo_call_proc, unde_free_proc, 3);
- redo_step->data[0].v_pointer = proc;
---- beast.orig/bse/bsejanitor.cc
-+++ beast/bse/bsejanitor.cc
-@@ -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)
-- self->exit_reason = g_strdup_printf (_("killed by janitor"));
-+ self->exit_reason = g_strdup_printf ("%s", _("killed by janitor"));
- else if (port->exit_signal_sent && port->sigterm_sent)
-- self->exit_reason = g_strdup_printf (_("connection terminated"));
-+ self->exit_reason = g_strdup_printf ("%s", _("connection terminated"));
- 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)
-@@ -473,7 +473,7 @@ janitor_idle_clean_jsource (void *data)
- {
- /* not a janitor for a remote process */
- self->exit_code = -256;
-- self->exit_reason = g_strdup_printf ("unknown intern termination");
-+ self->exit_reason = g_strdup_printf ("%s", "unknown intern termination");
- }
- sfi_com_port_unref (port);
- self->port = NULL;
---- beast.orig/bse/bseserver.cc
-+++ beast/bse/bseserver.cc
-@@ -395,9 +395,9 @@ bse_server_require_pcm_input (BseServer
- server->pcm_input_checked = TRUE;
- if (!BSE_DEVICE_READABLE (server->pcm_device))
- sfi_msg_display (SFI_MSG_WARNING,
-- SFI_MSG_TITLE (_("Recording Audio Input")),
-- SFI_MSG_TEXT1 (_("Failed to start recording from audio device.")),
-- SFI_MSG_TEXT2 (_("An audio project is in use which processes an audio input signal, but the audio device "
-+ SFI_MSG_TITLE ("%s", _("Recording Audio Input")),
-+ SFI_MSG_TEXT1 ("%s", _("Failed to start recording from audio device.")),
-+ SFI_MSG_TEXT2 ("%s", _("An audio project is in use which processes an audio input signal, but the audio device "
- "has not been opened in recording mode. "
- "An audio signal of silence will be used instead of a recorded signal, "
- "so playback operation may produce results not actually intended "
-@@ -406,7 +406,7 @@ bse_server_require_pcm_input (BseServer
- BSE_DEVICE (server->pcm_device)->open_device_name,
- BSE_DEVICE_GET_CLASS (server->pcm_device)->driver_name,
- BSE_DEVICE (server->pcm_device)->open_device_args),
-- SFI_MSG_CHECK (_("Show messages about audio input problems")));
-+ SFI_MSG_CHECK ("%s", _("Show messages about audio input problems")));
- }
- }
- typedef struct {
-@@ -444,12 +444,12 @@ server_open_pcm_device (BseServer *serve
- pcm_request_callback, &pr, error ? NULL : &error);
- if (!server->pcm_device)
- sfi_msg_display (SFI_MSG_ERROR,
-- SFI_MSG_TITLE (_("No Audio")),
-- SFI_MSG_TEXT1 (_("No available audio device was found.")),
-- SFI_MSG_TEXT2 (_("No available audio device could be found and opened successfully. "
-- "Sorry, no fallback selection can be made for audio devices, giving up.")),
-+ SFI_MSG_TITLE ("%s", _("No Audio")),
-+ SFI_MSG_TEXT1 ("%s", _("No available audio device was found.")),
-+ SFI_MSG_TEXT2 ("%s", _("No available audio device could be found and opened successfully. "
-+ "Sorry, no fallback selection can be made for audio devices, giving up.")),
- SFI_MSG_TEXT3 (_("Failed to open PCM devices: %s"), bse_error_blurb (error)),
-- SFI_MSG_CHECK (_("Show messages about PCM device selections problems")));
-+ SFI_MSG_CHECK ("%s", _("Show messages about PCM device selections problems")));
- server->pcm_input_checked = FALSE;
- return server->pcm_device ? BSE_ERROR_NONE : error;
- }
-@@ -466,12 +466,12 @@ server_open_midi_device (BseServer *serv
- sfi_ring_free (ring);
- if (server->midi_device)
- sfi_msg_display (SFI_MSG_WARNING,
-- SFI_MSG_TITLE (_("No MIDI")),
-- SFI_MSG_TEXT1 (_("MIDI input or oputput is not available.")),
-- SFI_MSG_TEXT2 (_("No available MIDI device could be found and opened successfully. "
-- "Reverting to null device, no MIDI events will be received or sent.")),
-+ SFI_MSG_TITLE ("%s", _("No MIDI")),
-+ SFI_MSG_TEXT1 ("%s", _("MIDI input or oputput is not available.")),
-+ SFI_MSG_TEXT2 ("%s", _("No available MIDI device could be found and opened successfully. "
-+ "Reverting to null device, no MIDI events will be received or sent.")),
- SFI_MSG_TEXT3 (_("Failed to open MIDI devices: %s"), bse_error_blurb (error)),
-- SFI_MSG_CHECK (_("Show messages about MIDI device selections problems")));
-+ SFI_MSG_CHECK ("%s", _("Show messages about MIDI device selections problems")));
- }
- return server->midi_device ? BSE_ERROR_NONE : error;
- }
-@@ -521,12 +521,12 @@ bse_server_open_devices (BseServer *self
- if (error)
- {
- sfi_msg_display (SFI_MSG_ERROR,
-- SFI_MSG_TITLE (_("Start Disk Recording")),
-- SFI_MSG_TEXT1 (_("Failed to start recording to disk.")),
-- SFI_MSG_TEXT2 (_("An error occoured while opening the recording file, selecting a different "
-- "file might fix this situation.")),
-+ SFI_MSG_TITLE ("%s", _("Start Disk Recording")),
-+ SFI_MSG_TEXT1 ("%s", _("Failed to start recording to disk.")),
-+ SFI_MSG_TEXT2 ("%s", _("An error occoured while opening the recording file, selecting a different "
-+ "file might fix this situation.")),
- SFI_MSG_TEXT3 (_("Failed to open file \"%s\" for output: %s"), self->wave_file, bse_error_blurb (error)),
-- SFI_MSG_CHECK (_("Show recording file errors")));
-+ SFI_MSG_CHECK ("%s", _("Show recording file errors")));
- g_object_unref (self->pcm_writer);
- self->pcm_writer = NULL;
- }
---- beast.orig/configure.in
-+++ beast/configure.in
-@@ -126,7 +126,9 @@ AC_C_CONST
- AC_C_INLINE
- AC_HEADER_STDC
-
--# == C++11 ==
-+# == Compiler Flags ==
-+MC_EVAR_ADD(CFLAGS, -Werror=format-security, -Werror=format-security)
-+MC_EVAR_ADD(CXXFLAGS, -Werror=format-security, -Werror=format-security)
- MC_EVAR_ADD(CXXFLAGS, -std=gnu++0x, -std=gnu++0x -pthread)
-
- # Checks for programs
diff --git a/debian/patches/series b/debian/patches/series
index 9574865..3ac0cf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-100_deprecated.diff
-210_volatile.diff
300-desktop_file.patch
-400-format-security.patch
--
beast packaging
More information about the pkg-multimedia-commits
mailing list