[SCM] gsequencer/master: Imported Upstream version 0.4.2-62

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Tue Jun 16 10:47:54 UTC 2015 

The following commit has been merged in the master branch:
commit c8d6b71c6e6d582adfb63eccb63ea083123e886f
Author: Joël Krähemann <jkraehemann at gmail.com>
Date:   Tue Jun 16 12:01:14 2015 +0200

    Imported Upstream version 0.4.2-62

diff --git a/Makefile.am b/Makefile.am
index 7975bac..b516f29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
 # SUBDIRS = src doc
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\" -D_FORTIFY_SOURCE=2
 
 # what flags you want to pass to the C compiler & linker
-CFLAGS = 
-LDFLAGS = 
+CFLAGS = -g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security
+LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
 
 # this lists the binaries to produce, the (non-PHONY, binary) targets in
 # the previous manual Makefile
diff --git a/Makefile.in b/Makefile.in
index c87d96f..9417cba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -463,7 +463,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 
 # what flags you want to pass to the C compiler & linker
-CFLAGS = 
+CFLAGS = -g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -486,7 +486,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = 
+LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
 LIBAO_CFLAGS = @LIBAO_CFLAGS@
 LIBAO_LIBS = @LIBAO_LIBS@
 LIBASOUND2_CFLAGS = @LIBASOUND2_CFLAGS@
@@ -565,7 +565,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 # SUBDIRS = src doc
-AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\" -D_FORTIFY_SOURCE=2
 
 # this lists the binaries to produce, the (non-PHONY, binary) targets in
 # the previous manual Makefile
diff --git a/ags.desktop.in b/ags.desktop.in
index 36b1ea6..b81b7b7 100644
--- a/ags.desktop.in
+++ b/ags.desktop.in
@@ -6,4 +6,4 @@ Terminal=false
 Exec=ags
 Icon=@datadir@/gsequencer/icons/jumper.png
 Name=Advanced Gtk+ Sequencer
-Categories=AudioVideo;Editor;
+Categories=AudioVideo;Audio;
diff --git a/configure b/configure
index 5fdabba..6c27606 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ags 0.4.2-61.
+# Generated by GNU Autoconf 2.69 for ags 0.4.2-62.
 #
 # Report bugs to <weedlight at gmail.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ags'
 PACKAGE_TARNAME='ags'
-PACKAGE_VERSION='0.4.2-61'
-PACKAGE_STRING='ags 0.4.2-61'
+PACKAGE_VERSION='0.4.2-62'
+PACKAGE_STRING='ags 0.4.2-62'
 PACKAGE_BUGREPORT='weedlight at gmail.com'
 PACKAGE_URL=''
 
@@ -1317,7 +1317,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ags 0.4.2-61 to adapt to many kinds of systems.
+\`configure' configures ags 0.4.2-62 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1387,7 +1387,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ags 0.4.2-61:";;
+     short | recursive ) echo "Configuration of ags 0.4.2-62:";;
    esac
   cat <<\_ACEOF
 
@@ -1523,7 +1523,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ags configure 0.4.2-61
+ags configure 0.4.2-62
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2000,7 +2000,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ags $as_me 0.4.2-61, which was
+It was created by ags $as_me 0.4.2-62, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2866,7 +2866,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ags'
- VERSION='0.4.2-61'
+ VERSION='0.4.2-62'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7161,7 +7161,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ags $as_me 0.4.2-61, which was
+This file was extended by ags $as_me 0.4.2-62, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7227,7 +7227,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ags config.status 0.4.2-61
+ags config.status 0.4.2-62
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 1a1f43d..43be725 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([ags],[0.4.2-61],[weedlight at gmail.com])
+AC_INIT([ags],[0.4.2-62],[weedlight at gmail.com])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
diff --git a/src/ags/X/ags_audio_preferences.c b/src/ags/X/ags_audio_preferences.c
index 265a5f6..1d5b7ce 100644
--- a/src/ags/X/ags_audio_preferences.c
+++ b/src/ags/X/ags_audio_preferences.c
@@ -414,7 +414,7 @@ ags_audio_preferences_reset(AgsApplicable *applicable)
 							 GTK_DIALOG_MODAL,
 							 GTK_MESSAGE_ERROR,
 							 GTK_BUTTONS_CLOSE,
-							 error->message);
+							 "%s\0", error->message);
     gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(GTK_WIDGET(dialog));
 
diff --git a/src/ags/X/machine/ags_ffplayer.c b/src/ags/X/machine/ags_ffplayer.c
index d99b306..1b12d56 100644
--- a/src/ags/X/machine/ags_ffplayer.c
+++ b/src/ags/X/machine/ags_ffplayer.c
@@ -694,7 +694,7 @@ ags_ffplayer_launch_task(AgsFileLaunch *file_launch, AgsFFPlayer *ffplayer)
 			      &error);
 
     if(error != NULL){
-      g_warning(error->message);
+      g_warning("%s\0", error->message);
     }
     
     /* select first preset */
@@ -707,7 +707,7 @@ ags_ffplayer_launch_task(AgsFileLaunch *file_launch, AgsFFPlayer *ffplayer)
 			      &error);
 
     if(error != NULL){
-      g_warning(error->message);
+      g_warning("%s\0", error->message);
     }
     
     /* fill ffplayer->preset */
@@ -751,7 +751,7 @@ ags_ffplayer_launch_task(AgsFileLaunch *file_launch, AgsFFPlayer *ffplayer)
 			      &error);
 
     if(error != NULL){
-      g_warning(error->message);
+      g_warning("%s\0", error->message);
     }
     
     /* fill ffplayer->instrument */
diff --git a/src/ags/audio/ags_audio.c b/src/ags/audio/ags_audio.c
index 73fed40..4994a1f 100644
--- a/src/ags/audio/ags_audio.c
+++ b/src/ags/audio/ags_audio.c
@@ -3519,7 +3519,7 @@ ags_audio_open_files(AgsAudio *audio,
 			       &error);
 
 	  if(error != NULL){
-	    g_message(error->message);
+	    g_warning("%s\0", error->message);
 	  }
 
 	  AGS_AUDIO_SIGNAL(audio_signal_list->data)->flags |= AGS_AUDIO_SIGNAL_TEMPLATE;
diff --git a/src/ags/audio/ags_config.c b/src/ags/audio/ags_config.c
index 61888fe..cba9851 100644
--- a/src/ags/audio/ags_config.c
+++ b/src/ags/audio/ags_config.c
@@ -343,7 +343,7 @@ ags_config_save(AgsConfig *config)
 				 &error);
     
     if(error != NULL){
-      g_message(error->message);
+      g_warning("%s\0", error->message);
       //TODO:JK: do recovery
       goto ags_config_save_END;
     }
diff --git a/src/ags/audio/task/ags_link_channel.c b/src/ags/audio/task/ags_link_channel.c
index 6886208..987be70 100644
--- a/src/ags/audio/task/ags_link_channel.c
+++ b/src/ags/audio/task/ags_link_channel.c
@@ -152,7 +152,7 @@ ags_link_channel_launch(AgsTask *task)
 		       &(link_channel->error));
 
   if(link_channel->error != NULL){
-    g_message(link_channel->error->message);
+    g_message("%s\0", link_channel->error->message);
   }
 }
 
diff --git a/src/ags/audio/task/ags_open_file.c b/src/ags/audio/task/ags_open_file.c
index eed5134..8fa89dc 100644
--- a/src/ags/audio/task/ags_open_file.c
+++ b/src/ags/audio/task/ags_open_file.c
@@ -254,7 +254,7 @@ ags_open_file_launch(AgsTask *task)
 			     &error);
 
 	if(error != NULL){
-	  g_warning(error->message);
+	  g_warning("%s\0", error->message);
 	}
       }
 
diff --git a/src/ags/audio/task/ags_open_single_file.c b/src/ags/audio/task/ags_open_single_file.c
index 72b3ebb..40054aa 100644
--- a/src/ags/audio/task/ags_open_single_file.c
+++ b/src/ags/audio/task/ags_open_single_file.c
@@ -172,7 +172,7 @@ ags_open_single_file_launch(AgsTask *task)
 			   &error);
 
       if(error != NULL){
-	g_warning(error->message);
+	g_warning("%s\0", error->message);
       }
     }
 
diff --git a/src/ags/file/ags_file_thread.c b/src/ags/file/ags_file_thread.c
index 09dd0da..ad7d2f4 100644
--- a/src/ags/file/ags_file_thread.c
+++ b/src/ags/file/ags_file_thread.c
@@ -96,8 +96,6 @@ ags_file_read_thread(AgsFile *file, xmlNode *node, AgsThread **thread)
     gobject = *thread;
   }
 
-  g_message(G_OBJECT_TYPE_NAME(gobject));
-
   ags_file_add_id_ref(file,
 		      g_object_new(AGS_TYPE_FILE_ID_REF,
 				   "main\0", file->ags_main,
diff --git a/src/ags/file/ags_file_util.c b/src/ags/file/ags_file_util.c
index a1cf80c..418f62e 100644
--- a/src/ags/file/ags_file_util.c
+++ b/src/ags/file/ags_file_util.c
@@ -1151,7 +1151,7 @@ ags_file_util_read_file_link_launch(AgsFileLaunch *file_launch,
 		   NULL);
 
       if(error != NULL){
-	g_warning(error->message);
+	g_warning("%s\0", error->message);
       }
     }else{
       g_object_set(G_OBJECT(input),
diff --git a/src/ags/plugin/ags_ladspa_manager.c b/src/ags/plugin/ags_ladspa_manager.c
index 32ad958..78f4bc4 100644
--- a/src/ags/plugin/ags_ladspa_manager.c
+++ b/src/ags/plugin/ags_ladspa_manager.c
@@ -297,7 +297,7 @@ ags_ladspa_manager_load_default_directory()
 		   &error);
 
   if(error != NULL){
-    g_warning(error->message);
+    g_warning("%s\0", error->message);
   }
 
   while((filename = g_dir_read_name(dir)) != NULL){

-- 
gsequencer packaging

More information about the pkg-multimedia-commits mailing list