Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22762/main/finkinfo/x11-wm
Modified Files:
metacity.info metacity.patch
Log Message:
GNOME2.26 to stable
Index: metacity.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/metacity.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- metacity.patch 11 May 2009 18:02:00 -0000 1.3
+++ metacity.patch 15 Nov 2009 08:20:31 -0000 1.4
@@ -1,44 +1,7 @@
-diff -Nurd -x'*~' metacity-2.24.0.orig/configure.in
metacity-2.24.0/configure.in
---- metacity-2.24.0.orig/configure.in 2008-09-22 14:31:19.000000000 -0400
-+++ metacity-2.24.0/configure.in 2008-11-26 01:18:56.000000000 -0500
-@@ -211,17 +211,8 @@
- have_xrender=no
-
- XCOMPOSITE_VERSION=0.2
--AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
--if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
-- have_xcomposite=yes
--else
-- have_xcomposite=no
--fi
--AC_MSG_RESULT($have_xcomposite)
--
- if test x$enable_compositor = xyes; then
- have_xcomposite=yes
-- echo "CompositeExt support forced on"
- elif test x$enable_compositor = xauto; then
- echo "Building compositing manager by default now."
- have_xcomposite=yes
-@@ -230,15 +221,25 @@
- fi
-
- if test x$have_xcomposite = xyes; then
-- echo "Building with CompositeExt"
-+ AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
-+ if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_ERROR([no. Use --disable-compositor to disable.])
-+ fi
-+fi
-+
-+if test x$have_xcomposite = xyes; then
- METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION
xfixes xrender xdamage"
- AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager
support])
-+ echo "Building with compositing manager"
-
- ## force on render also
- have_xrender=yes
+diff -Nurd -x'*~' metacity-2.26.0.orig/configure.in
metacity-2.26.0/configure.in
+--- metacity-2.26.0.orig/configure.in 2009-03-16 13:58:12.000000000 -0400
++++ metacity-2.26.0/configure.in 2009-06-01 23:11:23.000000000 -0400
+@@ -239,6 +239,7 @@
else
echo "Building without compositing manager"
fi
@@ -46,16 +9,13 @@
## if no compositor, still possibly enable render
if test x$have_xcomposite = xno; then
-diff -Nurd -x'*~' metacity-2.24.0.orig/src/Makefile.am
metacity-2.24.0/src/Makefile.am
---- metacity-2.24.0.orig/src/Makefile.am 2008-09-09 10:31:35.000000000
-0400
-+++ metacity-2.24.0/src/Makefile.am 2008-11-26 01:17:11.000000000 -0500
-@@ -2,7 +2,15 @@
+diff -Nurd -x'*~' metacity-2.26.0.orig/src/Makefile.am
metacity-2.26.0/src/Makefile.am
+--- metacity-2.26.0.orig/src/Makefile.am 2009-02-04 20:10:06.000000000
-0500
++++ metacity-2.26.0/src/Makefile.am 2009-06-01 23:02:57.000000000 -0400
+@@ -4,6 +4,14 @@
- SUBDIRS=wm-tester tools themes
+ INCLUDES=-I$(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\"
-DHOST_ALIAS=\"@host_al...@\"
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\"
-DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 @METACITY_CFLAGS@
--includ...@metacity_cflags@ -I $(srcdir)/include
-DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@host_al...@\"
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\"
-DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
-+INCLUDES=-I$(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\"
-DHOST_ALIAS=\"@host_al...@\"
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\"
-DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 @METACITY_CFLAGS@
-+
+if USE_COMPOSITOR_EXTENSIONS
+compositor_ext_sources = \
+ compositor/compositor-xrender.c \
@@ -63,9 +23,10 @@
+else
+compositor_ext_sources =
+endif
-
++
metacity_SOURCES= \
core/async-getprop.c \
+ core/async-getprop.h \
@@ -14,8 +22,7 @@
include/boxes.h \
compositor/compositor.c \
@@ -76,15 +37,333 @@
include/compositor.h \
core/constraints.c \
core/constraints.h \
-diff -Nurd -x'*~' metacity-2.24.0.orig/src/core/util.c
metacity-2.24.0/src/core/util.c
---- metacity-2.24.0.orig/src/core/util.c 2008-08-18 08:29:06.000000000
-0400
-+++ metacity-2.24.0/src/core/util.c 2008-11-26 01:13:19.000000000 -0500
-@@ -23,7 +23,7 @@
- */
+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;
- #define _GNU_SOURCE
--#define _POSIX_C_SOURCE /* for fdopen() */
-+#define _POSIX_C_SOURCE 200112L /* for fdopen() */
+- 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 @@
- #include <config.h>
- #include "util.h"
+ 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/stable/main/finkinfo/x11-wm/metacity.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- metacity.info 11 May 2009 18:02:00 -0000 1.6
+++ metacity.info 15 Nov 2009 08:20:31 -0000 1.7
@@ -1,62 +1,64 @@
Package: metacity
-Version: 2.24.0
-Revision: 2
+Version: 2.26.0
+Revision: 5
Depends: <<
%N-shlibs (>= %v-%r),
- atk1-shlibs (>= 1.24.0-1),
+ atk1-shlibs (>= 1.26.0-1),
cairo-shlibs (>= 1.8-1),
dbus-shlibs (>= 1.2.1-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
- gconf2 (>= 2.24.0-1),
- glib2-shlibs (>= 2.18.0-1),
+ freetype219-shlibs (>= 2.3.8-2),
+ gconf2 (>= 2.26.0-1),
+ glib2-shlibs (>= 2.20.0-1),
glitz-shlibs,
- gtk+2-shlibs (>= 2.14.0-1),
+ gtk+2-shlibs (>= 2.16.0-1),
libgettext3-shlibs,
libiconv,
libpng3-shlibs,
- orbit2-shlibs (>= 2.14.16-1),
- pango1-xft2-ft219 (>= 1.22.0-4),
- pixman-shlibs (>= 0.12.0-1),
+ orbit2-shlibs (>= 2.14.17-1),
+ pango1-xft2-ft219 (>= 1.24.0-1),
+ pixman-shlibs (>= 0.14.0-1),
startup-notification-shlibs (>= 0.8-1),
- x11
+ x11,
+ zenity (>= 2.26.0-1)
<<
BuildDepends: <<
- atk1 (>= 1.24.0-1),
+ atk1 (>= 1.26.0-1),
autoconf,
- automake1.10,
+ automake1.11,
cairo (>= 1.8-1),
dbus-dev (>= 1.2.1-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
- gconf2-dev (>= 2.24.0-1),
+ freetype219 (>= 2.3.8-2),
+ gconf2-dev (>= 2.26.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.18.0-1),
+ glib2-dev (>= 2.20.0-1),
glitz,
- gtk+2-dev (>= 2.14.0-1),
+ gnome-doc-utils (>= 0.16.1-1),
+ gtk+2-dev (>= 2.16.0-1),
intltool40,
libgettext3-dev,
- libglade2 (>= 2.6.3-1),
+ libglade2 (>= 2.6.4-1),
libiconv-dev,
libpng3,
- libtool14,
+ libtool2,
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.16-1),
- pango1-xft2-ft219-dev (>= 1.22.0-4),
- pixman (>= 0.12.0-1),
+ orbit2-dev (>= 2.14.17-1),
+ pango1-xft2-ft219-dev (>= 1.24.0-1),
+ pixman (>= 0.14.0-1),
pkgconfig (>= 0.23),
startup-notification-dev (>= 0.8-1),
x11-dev,
xft2-dev
<<
-Source: mirror:gnome:sources/%n/2.24/%n-%v.tar.bz2
-Source-MD5: d4aa782d5f71b6c42514b239684a4aa3
+Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2
+Source-MD5: eafb624e79fbcdab6da59acc222430b1
PatchFile: %n.patch
-PatchFile-MD5: 07cf962a26049dde9b03ea6250308981
+PatchFile-MD5: 92e928ae8c74c2e9d502d0eb60dd0450
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
@@ -76,24 +78,25 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- atk1-shlibs (>= 1.24.0-1),
+ atk1-shlibs (>= 1.26.0-1),
cairo-shlibs (>= 1.8-1),
dbus-shlibs (>= 1.2.1-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
- gconf2-shlibs (>= 2.24.0-1),
- glib2-shlibs (>= 2.18.0-1),
+ freetype219-shlibs (>= 2.3.8-2),
+ gconf2-shlibs (>= 2.26.0-1),
+ glib2-shlibs (>= 2.20.0-1),
glitz-shlibs,
- gtk+2-shlibs (>= 2.14.0-1),
+ gtk+2-shlibs (>= 2.16.0-1),
libgettext3-shlibs,
libiconv,
libpng3-shlibs,
- orbit2-shlibs (>= 2.14.16-1),
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
- pixman-shlibs (>= 0.12.0-1),
+ orbit2-shlibs (>= 2.14.17-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.0-1),
+ pixman-shlibs (>= 0.14.0-1),
startup-notification-shlibs (>= 0.8-1),
- x11-shlibs
+ x11-shlibs,
+ zenity (>= 2.26.0-1)
<<
Replaces: %N (<< 2.6.1-1)
Description: Shared libraries from metacity
@@ -125,19 +128,10 @@
Metacity is a simple window manager that integrates nicely with
GNOME 2.
<<
-DescPort: <<
- Patch to make it possible to disable compositing manager. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=560990
-
- Fix -I ordering. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=562033
-
- _POSIX_C_SOURCE breaks /usr/include/sys/_types.h on 10.4. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=561962
-<<
DescPackaging: <<
Disable compositing manager because it requires x11 components
- we don't have.
+ we don't have. Needs small hack to make it doable. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=560990
Do we need to disable xrender and/or xrandr any more
stringently for portability among various x11 flavors?
------------------------------------------------------------------------------
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
