Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8841
Modified Files: metacity.info metacity.patch Log Message: fix format spec complaints from gcc 4.2.1, still works with 4.0.1 Index: metacity.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/metacity.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- metacity.patch 7 Jun 2009 16:05:53 -0000 1.2 +++ metacity.patch 14 Sep 2009 04:34:25 -0000 1.3 @@ -37,3 +37,333 @@ include/compositor.h \ core/constraints.c \ core/constraints.h \ +diff -Nurd metacity-2.26.0/src/core/keybindings.c metacity-2.26.0new/src/core/keybindings.c +--- metacity-2.26.0/src/core/keybindings.c 2009-02-04 20:10:05.000000000 -0500 ++++ metacity-2.26.0new/src/core/keybindings.c 2009-09-06 23:51:59.000000000 -0400 +@@ -3332,7 +3332,7 @@ + "No terminal command to run in response to " + "keybinding press\n"); + +- s = g_strdup_printf (_("No terminal command has been defined.\n")); ++ s = g_strdup_printf ("%s", _("No terminal command has been defined.\n")); + error_on_command (-1, NULL, s, screen->number, event->xkey.time); + g_free (s); + +diff -Nurd metacity-2.26.0/src/core/prefs.c metacity-2.26.0new/src/core/prefs.c +--- metacity-2.26.0/src/core/prefs.c 2009-02-04 20:10:05.000000000 -0500 ++++ metacity-2.26.0new/src/core/prefs.c 2009-09-06 23:53:03.000000000 -0400 +@@ -1228,7 +1228,7 @@ + { + first_disable = FALSE; + +- meta_warning (_("Workarounds for broken applications disabled. " ++ meta_warning ("%s", _("Workarounds for broken applications disabled. " + "Some applications may not behave properly.\n")); + } + } +diff -Nurd metacity-2.26.0/src/core/session.c metacity-2.26.0new/src/core/session.c +--- metacity-2.26.0/src/core/session.c 2009-02-04 20:10:05.000000000 -0500 ++++ metacity-2.26.0new/src/core/session.c 2009-09-06 23:54:26.000000000 -0400 +@@ -1177,7 +1177,7 @@ + { + g_set_error (error, + G_MARKUP_ERROR, +- G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR_PARSE, "%s", + _("<metacity_session> attribute seen but we already have the session ID")); + return; + } +@@ -1207,7 +1207,7 @@ + { + g_set_error (error, + G_MARKUP_ERROR, +- G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR_PARSE, "%s", + _("nested <window> tag")); + return; + } +diff -Nurd metacity-2.26.0/src/ui/menu.c metacity-2.26.0new/src/ui/menu.c +--- metacity-2.26.0/src/ui/menu.c 2009-02-04 20:10:06.000000000 -0500 ++++ metacity-2.26.0new/src/ui/menu.c 2009-09-06 23:55:35.000000000 -0400 +@@ -210,7 +210,7 @@ + * a copy copy so we can have our wicked way with it. + */ + if (number == 10) +- new_name = g_strdup_printf (_("Workspace 1_0")); ++ new_name = g_strdup_printf ("%s", _("Workspace 1_0")); + else + new_name = g_strdup_printf (_("Workspace %s%d"), + number < 10 ? "_" : "", +diff -Nurd metacity-2.26.0/src/ui/metacity-dialog.c metacity-2.26.0new/src/ui/metacity-dialog.c +--- metacity-2.26.0/src/ui/metacity-dialog.c 2009-02-04 20:10:06.000000000 -0500 ++++ metacity-2.26.0new/src/ui/metacity-dialog.c 2009-09-06 23:57:50.000000000 -0400 +@@ -240,7 +240,7 @@ + dialog = gtk_message_dialog_new (NULL, + 0, + GTK_MESSAGE_WARNING, +- GTK_BUTTONS_NONE, ++ GTK_BUTTONS_NONE, "%s", + _("These windows do not support \"save current setup\" and will have to be restarted manually next time you log in.")); + gtk_window_set_icon_name (GTK_WINDOW (dialog), "stock_dialog-warning"); + +diff -Nurd metacity-2.26.0/src/ui/theme-parser.c metacity-2.26.0new/src/ui/theme-parser.c +--- metacity-2.26.0/src/ui/theme-parser.c 2009-02-04 20:10:06.000000000 -0500 ++++ metacity-2.26.0new/src/ui/theme-parser.c 2009-09-06 23:46:07.000000000 -0400 +@@ -1109,7 +1109,7 @@ + } + else if (alpha != NULL) + { +- set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("You must specify a background for an alpha value to be meaningful")); + return; + } +@@ -1339,7 +1339,7 @@ + if (!(info->layout->button_sizing == META_BUTTON_SIZING_LAST || + info->layout->button_sizing == META_BUTTON_SIZING_FIXED)) + { +- set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("Cannot specify both \"button_width\"/\"button_height\" and \"aspect_ratio\" for buttons")); + return; + } +@@ -1353,7 +1353,7 @@ + if (!(info->layout->button_sizing == META_BUTTON_SIZING_LAST || + info->layout->button_sizing == META_BUTTON_SIZING_FIXED)) + { +- set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("Cannot specify both \"button_width\"/\"button_height\" and \"aspect_ratio\" for buttons")); + return; + } +@@ -1398,7 +1398,7 @@ + + if (info->layout->button_sizing != META_BUTTON_SIZING_LAST) + { +- set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("Cannot specify both \"button_width\"/\"button_height\" and \"aspect_ratio\" for buttons")); + return; + } +@@ -3135,7 +3135,7 @@ + if (info->op_list) + { + set_error (error, context, +- G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("Can't have a two draw_ops for a <piece> element (theme specified a draw_ops attribute and also a <draw_ops> element, or specified two elements)")); + return; + } +@@ -3173,7 +3173,7 @@ + if (info->op_list) + { + set_error (error, context, +- G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("Can't have a two draw_ops for a <button> element (theme specified a draw_ops attribute and also a <draw_ops> element, or specified two elements)")); + return; + } +@@ -3211,7 +3211,7 @@ + if (info->op_list) + { + set_error (error, context, +- G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("Can't have a two draw_ops for a <menu_icon> element (theme specified a draw_ops attribute and also a <draw_ops> element, or specified two elements)")); + return; + } +@@ -3590,7 +3590,7 @@ + g_assert (info->style); + if (info->op_list == NULL) + { +- set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("No draw_ops provided for frame piece")); + } + else +@@ -3605,7 +3605,7 @@ + g_assert (info->style); + if (info->op_list == NULL) + { +- set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, ++ set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, "%s", + _("No draw_ops provided for button")); + } + else +@@ -3712,7 +3712,7 @@ + if (info->theme->readable_name != NULL) + { + set_error (error, context, G_MARKUP_ERROR, +- G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR_PARSE, "%s", + _("<name> specified twice for this theme")); + return; + } +@@ -3723,7 +3723,7 @@ + if (info->theme->author != NULL) + { + set_error (error, context, G_MARKUP_ERROR, +- G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR_PARSE, "%s", + _("<author> specified twice for this theme")); + return; + } +@@ -3734,7 +3734,7 @@ + if (info->theme->copyright != NULL) + { + set_error (error, context, G_MARKUP_ERROR, +- G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR_PARSE, "%s", + _("<copyright> specified twice for this theme")); + return; + } +@@ -3745,7 +3745,7 @@ + if (info->theme->date != NULL) + { + set_error (error, context, G_MARKUP_ERROR, +- G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR_PARSE, "%s", + _("<date> specified twice for this theme")); + return; + } +@@ -3756,7 +3756,7 @@ + if (info->theme->description != NULL) + { + set_error (error, context, G_MARKUP_ERROR, +- G_MARKUP_ERROR_PARSE, ++ G_MARKUP_ERROR_PARSE, "%s", + _("<description> specified twice for this theme")); + return; + } +diff -Nurd metacity-2.26.0/src/ui/theme-viewer.c metacity-2.26.0new/src/ui/theme-viewer.c +--- metacity-2.26.0/src/ui/theme-viewer.c 2009-02-04 20:10:06.000000000 -0500 ++++ metacity-2.26.0new/src/ui/theme-viewer.c 2009-09-06 23:56:39.000000000 -0400 +@@ -795,7 +795,7 @@ + global_theme = meta_theme_load (argv[1], &err); + else + { +- g_printerr (_("Usage: metacity-theme-viewer [THEMENAME]\n")); ++ g_printerr ("%s", _("Usage: metacity-theme-viewer [THEMENAME]\n")); + exit (1); + } + end = clock (); +diff -Nurd metacity-2.26.0/src/ui/theme.c metacity-2.26.0new/src/ui/theme.c +--- metacity-2.26.0/src/ui/theme.c 2009-02-04 20:10:06.000000000 -0500 ++++ metacity-2.26.0new/src/ui/theme.c 2009-09-06 23:49:47.000000000 -0400 +@@ -351,7 +351,7 @@ + break; + case META_BUTTON_SIZING_LAST: + g_set_error (error, META_THEME_ERROR, +- META_THEME_ERROR_FRAME_GEOMETRY, ++ META_THEME_ERROR_FRAME_GEOMETRY, "%s", + _("Frame geometry does not specify size of buttons")); + return FALSE; + } +@@ -1016,7 +1016,7 @@ + if (g_slist_length (spec->color_specs) < 2) + { + g_set_error (error, META_THEME_ERROR, +- META_THEME_ERROR_FAILED, ++ META_THEME_ERROR_FAILED, "%s", + _("Gradients should have at least two colors")); + return FALSE; + } +@@ -1798,7 +1798,7 @@ + if (n_tokens == 0) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_FAILED, ++ META_THEME_ERROR_FAILED, "%s", + _("Coordinate expression was empty or not understood")); + + goto error; +@@ -1909,7 +1909,7 @@ + if (b->d.int_val == 0) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_DIVIDE_BY_ZERO, ++ META_THEME_ERROR_DIVIDE_BY_ZERO, "%s", + _("Coordinate expression results in division by zero")); + return FALSE; + } +@@ -1919,7 +1919,7 @@ + if (b->d.int_val == 0) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_DIVIDE_BY_ZERO, ++ META_THEME_ERROR_DIVIDE_BY_ZERO, "%s", + _("Coordinate expression results in division by zero")); + return FALSE; + } +@@ -1953,7 +1953,7 @@ + if (b->d.double_val == 0.0) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_DIVIDE_BY_ZERO, ++ META_THEME_ERROR_DIVIDE_BY_ZERO, "%s", + _("Coordinate expression results in division by zero")); + return FALSE; + } +@@ -1961,7 +1961,7 @@ + break; + case POS_OP_MOD: + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_MOD_ON_FLOAT, ++ META_THEME_ERROR_MOD_ON_FLOAT, "%s", + _("Coordinate expression tries to use mod operator on a floating-point number")); + return FALSE; + case POS_OP_ADD: +@@ -2026,7 +2026,7 @@ + if (exprs[i].type != POS_EXPR_OPERATOR) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_FAILED, ++ META_THEME_ERROR_FAILED, "%s", + _("Coordinate expression had an operand where an operator was expected")); + return FALSE; + } +@@ -2034,7 +2034,7 @@ + if (i == (*n_exprs - 1)) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_FAILED, ++ META_THEME_ERROR_FAILED, "%s", + _("Coordinate expression ended with an operator instead of an operand")); + return FALSE; + } +@@ -2286,7 +2286,7 @@ + if (n_exprs >= MAX_EXPRS) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_FAILED, ++ META_THEME_ERROR_FAILED, "%s", + _("Coordinate expression parser overflowed its buffer.")); + return FALSE; + } +@@ -2315,7 +2315,7 @@ + + case POS_TOKEN_CLOSE_PAREN: + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_BAD_PARENS, ++ META_THEME_ERROR_BAD_PARENS, "%s", + _("Coordinate expression had a close parenthesis with no open parenthesis")); + return FALSE; + +@@ -2379,7 +2379,7 @@ + if (paren_level > 0) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_BAD_PARENS, ++ META_THEME_ERROR_BAD_PARENS, "%s", + _("Coordinate expression had an open parenthesis with no close parenthesis")); + return FALSE; + } +@@ -2390,7 +2390,7 @@ + if (n_exprs == 0) + { + g_set_error (err, META_THEME_ERROR, +- META_THEME_ERROR_FAILED, ++ META_THEME_ERROR_FAILED, "%s", + _("Coordinate expression doesn't seem to have any operators or operands")); + return FALSE; + } Index: metacity.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/metacity.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- metacity.info 9 Jun 2009 03:57:24 -0000 1.16 +++ metacity.info 14 Sep 2009 04:34:25 -0000 1.17 @@ -1,6 +1,6 @@ Package: metacity Version: 2.26.0 -Revision: 4 +Revision: 5 Depends: << %N-shlibs (>= %v-%r), atk1-shlibs (>= 1.26.0-1), @@ -57,7 +57,7 @@ Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2 Source-MD5: eafb624e79fbcdab6da59acc222430b1 PatchFile: %n.patch -PatchFile-MD5: baea192109dd3092a116d59b2374eb6a +PatchFile-MD5: 92e928ae8c74c2e9d502d0eb60dd0450 SetCPPFLAGS: -I%p/lib/fontconfig2/include SetLDFLAGS: -L%p/lib/fontconfig2/lib SetCFLAGS: -Os ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs