[gimp-gap] fixes for #660250, #642512

[Wolfgang Hofer <wolfgangh src gnome org>]

commit 2431bd4f33e9654de29e5fbf27b45893b37971c0
Author: Wolfgang Hofer <wolfgangh svn gnome org>
Date:   Wed Oct 12 21:45:20 2011 +0200

    fixes for #660250, #642512

 ChangeLog                                 |   29 +++++++++++++++++++++++++++++
 extern_libs/Makefile.am                   |    6 +++---
 gap/gap_arr_dialog.c                      |    2 +-
 gap/gap_fmac_base.c                       |    2 +-
 gap/gap_fmac_main.c                       |    2 +-
 gap/gap_morph_exec.c                      |    2 +-
 gap/gap_split.c                           |    2 +-
 gap/gap_vex_dialog.c                      |    2 +-
 libgapvidutil/gap_gve_sox.c               |    4 ++--
 vid_common/gap_cme_gui.c                  |   16 ++++++++--------
 vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c |    4 ++--
 11 files changed, 50 insertions(+), 21 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d327377..0e0f677 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2011-10-12 Wolfgang Hofer <hof gimp org>
+
+
+- applied changes based on patche provided Thibaut Paumard 
+  to fix build problems with option -Werror=format-security #660250
+  
+  note that patch provided at #660262 was not applied 
+  because all the adresses issues for 64 bit environment
+  are already fixed in the main latest version.
+
+
+
+- fixed bug in the makefile for extern_lib (data hook for removing static libs)
+  as reported in #642512
+
+ * extern_libs/Makefile.am
+
+ * gap/gap_arr_dialog.c
+ * gap/gap_split.c
+ * gap/gap_fmac_base.c
+ * gap/gap_fmac_main.c
+ * gap/gap_morph_exec.c
+ * gap/gap_vex_dialog.c
+ * libgapvidutil/gap_gve_sox.c
+ * vid_common/gap_cme_gui.c
+
+ * vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c
+
+
 2011-10-02 Wolfgang Hofer <hof gimp org>
 
 - explicitly link with libm (patch provided by Ismail Donmez <idonmez suse com>. #660443)
diff --git a/extern_libs/Makefile.am b/extern_libs/Makefile.am
index c9a5f7b..dffce35 100644
--- a/extern_libs/Makefile.am
+++ b/extern_libs/Makefile.am
@@ -69,9 +69,9 @@ endif
 
 install-data-hook:
 	rm -f $(DESTDIR)$(GAPLIBDIR)/libavformat.a \
-	rm -f $(DESTDIR)$(GAPLIBDIR)/libavcodec.a \
-	rm -f $(DESTDIR)$(GAPLIBDIR)/libavutil.a \
-	rm -f $(DESTDIR)$(GAPLIBDIR)/libmpeg3.a
+	$(DESTDIR)$(GAPLIBDIR)/libavcodec.a \
+	$(DESTDIR)$(GAPLIBDIR)/libavutil.a \
+	$(DESTDIR)$(GAPLIBDIR)/libmpeg3.a
 
 EXTRA_DIST = \
 	README_extern_libs		\
diff --git a/gap/gap_arr_dialog.c b/gap/gap_arr_dialog.c
index 3dd5d60..0c76058 100644
--- a/gap/gap_arr_dialog.c
+++ b/gap/gap_arr_dialog.c
@@ -1859,7 +1859,7 @@ gap_arr_msg_win(GimpRunMode run_mode, const char *msg)
 
        if(run_mode == GIMP_RUN_INTERACTIVE)
        {
-         g_message (msg);
+         g_message ("%s", msg);
        }
     }
   }
diff --git a/gap/gap_fmac_base.c b/gap/gap_fmac_base.c
index 0e1c44f..a4984df 100644
--- a/gap/gap_fmac_base.c
+++ b/gap/gap_fmac_base.c
@@ -96,7 +96,7 @@ p_print_and_free_msg(char *msg, GimpRunMode run_mode)
 {
   if(run_mode == GIMP_RUN_INTERACTIVE)
   {
-    g_message(msg);
+    g_message("%s", msg);
   }
   printf("%s\n", msg);
   g_free(msg);
diff --git a/gap/gap_fmac_main.c b/gap/gap_fmac_main.c
index 34961cc..b075552 100644
--- a/gap/gap_fmac_main.c
+++ b/gap/gap_fmac_main.c
@@ -366,7 +366,7 @@ p_print_and_free_msg(char *msg, GimpRunMode run_mode)
 {
   if(run_mode == GIMP_RUN_INTERACTIVE)
   {
-    g_message(msg);
+    g_message("%s", msg);
   }
   printf("%s\n", msg);
   g_free(msg);
diff --git a/gap/gap_morph_exec.c b/gap/gap_morph_exec.c
index 45d37ca..a94e7d5 100644
--- a/gap/gap_morph_exec.c
+++ b/gap/gap_morph_exec.c
@@ -202,7 +202,7 @@ p_error_message_with_filename(GimpRunMode run_mode, const char *msg_fmt, const c
   
   if(run_mode != GIMP_RUN_NONINTERACTIVE)
   {
-    g_message(l_msg);
+    g_message("%s", l_msg);
   }
   g_free(l_msg);
 
diff --git a/gap/gap_split.c b/gap/gap_split.c
index cc3dad3..a32bc99 100644
--- a/gap/gap_split.c
+++ b/gap/gap_split.c
@@ -347,7 +347,7 @@ p_split_image(GapAnimInfo *ainfo_ptr, split_vals_t *valPtr)
                
                errMsg = g_strdup_printf(_("failed to overwrite %s (check permissions ?)")
                                       , l_sav_name);
-               g_message(errMsg);
+               g_message("%s", errMsg);
                g_free(errMsg);
                writePermission = FALSE;
              }
diff --git a/gap/gap_vex_dialog.c b/gap/gap_vex_dialog.c
index d2674c9..beb30b9 100644
--- a/gap/gap_vex_dialog.c
+++ b/gap/gap_vex_dialog.c
@@ -912,7 +912,7 @@ on_mw__combo_preferred_decoder  (GtkWidget     *widget,
      break;
  }
  g_snprintf(gpp->val.preferred_decoder, sizeof(gpp->val.preferred_decoder)
-               , preferred_decoder
+	    , "%s", preferred_decoder
                );
  entry = GTK_ENTRY(gpp->mw__entry_preferred_decoder);
  if(entry)
diff --git a/libgapvidutil/gap_gve_sox.c b/libgapvidutil/gap_gve_sox.c
index 99be589..52cc5de 100644
--- a/libgapvidutil/gap_gve_sox.c
+++ b/libgapvidutil/gap_gve_sox.c
@@ -153,7 +153,7 @@ gap_gve_sox_chk_and_resample(GapGveCommonValues *cval)
                            , cval->tmp_audfile);
         if(cval->run_mode == GIMP_RUN_INTERACTIVE)
         {
-          g_message(l_msg);
+          g_message("%s", l_msg);
             }
         return -1;
      }
@@ -175,7 +175,7 @@ gap_gve_sox_chk_and_resample(GapGveCommonValues *cval)
                        );
        if(cval->run_mode == GIMP_RUN_INTERACTIVE)
        {
-         g_message(l_msg);
+         g_message("%s", l_msg);
            }
        g_free(l_msg);
        return -1;
diff --git a/vid_common/gap_cme_gui.c b/vid_common/gap_cme_gui.c
index bae848c..14b794a 100644
--- a/vid_common/gap_cme_gui.c
+++ b/vid_common/gap_cme_gui.c
@@ -1598,7 +1598,7 @@ p_storybord_job_finished(GapCmeGlobalParams *gpp, t_global_stb *gstb)
   }
 
   /* info window of storyboard parsing report */
-  /* g_message(l_msg); */
+  /* g_message("%s", l_msg); */
   p_print_storyboard_text_label(gpp, l_msg);
 
   gstb->progress = 0.0;
@@ -2037,7 +2037,7 @@ gap_cme_gui_check_encode_OK (GapCmeGlobalParams *gpp)
                          , (int)(gpp->val.vid_width / 16) * 16
                          , (int)(gpp->val.vid_height / 16) * 16
                          );
-      g_message(l_msg);
+      g_message("%s", l_msg);
       g_free(l_msg);
       return (FALSE);
     }
@@ -2060,7 +2060,7 @@ gap_cme_gui_check_encode_OK (GapCmeGlobalParams *gpp)
                             , (int)bits
                             , gpp->val.audioname1
                             );
-         g_message(l_msg);
+         g_message("%s", l_msg);
          g_free(l_msg);
          return (FALSE);
        }
@@ -2079,7 +2079,7 @@ gap_cme_gui_check_encode_OK (GapCmeGlobalParams *gpp)
                             "file: %s\n")
                             , gpp->val.audioname1
                             );
-         g_message(l_msg);
+         g_message("%s", l_msg);
          g_free(l_msg);
          return (FALSE);
     }
@@ -2103,7 +2103,7 @@ gap_cme_gui_check_encode_OK (GapCmeGlobalParams *gpp)
                                 "supported rates: \n"
                                 " 22050, 24000, 32000, 44100, 48000")
                                 , (int)gpp->val.samplerate);
-             g_message(l_msg);
+             g_message("%s", l_msg);
              g_free(l_msg);
              return (FALSE);
              break;
@@ -2131,7 +2131,7 @@ gap_cme_gui_check_encode_OK (GapCmeGlobalParams *gpp)
                                 "supported rates:\n"
                                 " 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000")
                                 , (int)gpp->val.samplerate);
-             g_message(l_msg);
+             g_message("%s", l_msg);
              g_free(l_msg);
              return (FALSE);
              break;
@@ -3931,7 +3931,7 @@ p_call_encoder_procedure(GapCmeGlobalParams *gpp)
      l_msg = g_strdup_printf(_("Required Plugin %s not available"), gpp->val.ecp_sel.vid_enc_plugin);
      if(gpp->val.run_mode == GIMP_RUN_INTERACTIVE)
      {
-       g_message(l_msg);
+       g_message("%s", l_msg);
      }
      g_free(l_msg);
      return -1;
@@ -3983,7 +3983,7 @@ p_call_encoder_procedure(GapCmeGlobalParams *gpp)
      l_msg = g_strdup_printf(_("Call of Required Plugin %s failed"), gpp->val.ecp_sel.vid_enc_plugin);
      if(gpp->val.run_mode == GIMP_RUN_INTERACTIVE)
      {
-       g_message(l_msg);
+       g_message("%s", l_msg);
      }
      g_free(l_msg);
   }
diff --git a/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c b/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c
index c909509..f03cb3f 100644
--- a/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c
+++ b/vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c
@@ -96,7 +96,7 @@ on_ff_response (GtkWidget *widget,
         {
             l_msg = g_strdup_printf("Error:\nWidth (%d) must be an integer multiple of 2",
                                  (int)gpp->val.vid_width);
-           g_message(l_msg);
+           g_message("%s", l_msg);
            g_free(l_msg);
            return;
         }
@@ -104,7 +104,7 @@ on_ff_response (GtkWidget *widget,
         {
             l_msg = g_strdup_printf("Error:\nHeight (%d) must be an integer multiple of 2",
                                (int)gpp->val.vid_height);
-            g_message(l_msg);
+            g_message("%s", l_msg);
             g_free(l_msg);
             return;
         }