r14351 - in /desktop/unstable/gtk+2.0/debian: changelog patches/033_treeview_resizing.patch patches/042_treeview_single-focus.patch patches/070_mandatory-relibtoolize.patch
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Tue Jan 29 09:08:19 UTC 2008
Author: lool
Date: Tue Jan 29 09:08:19 2008
New Revision: 14351
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14351
Log:
* New upstream stable release; no API change; bug fixes and translation
updates.
- Refresh patches 033_treeview_resizing, 042_treeview_single-focus to
apply cleanly.
- Update relibtoolizing patch, 070_mandatory-relibtoolize
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch
desktop/unstable/gtk+2.0/debian/patches/042_treeview_single-focus.patch
desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=14351&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Tue Jan 29 09:08:19 2008
@@ -1,8 +1,13 @@
-gtk+2.0 (2.12.5-3) UNRELEASED; urgency=low
+gtk+2.0 (2.12.6-1) unstable; urgency=low
* Fix GNOME casing in gtk-faq and gtk doc base descriptions.
* Drop cruft trying to convert /usr/share/doc/libgtk2.0-0 directory into a
symlink in libgtk2.0-0.postinst; thanks Sven Joachim; closes: #462057.
+ * New upstream stable release; no API change; bug fixes and translation
+ updates.
+ - Refresh patches 033_treeview_resizing, 042_treeview_single-focus to
+ apply cleanly.
+ - Update relibtoolizing patch, 070_mandatory-relibtoolize
-- Loic Minier <lool at dooz.org> Mon, 21 Jan 2008 18:42:28 +0100
Modified: desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/033_treeview_resizing.patch?rev=14351&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch Tue Jan 29 09:08:19 2008
@@ -1,8 +1,6 @@
-Index: gtk+-2.12.1/gtk/gtktreeview.c
-===================================================================
---- gtk+-2.12.1.orig/gtk/gtktreeview.c 2007-10-16 15:20:39.000000000 +0200
-+++ gtk+-2.12.1/gtk/gtktreeview.c 2007-11-15 20:06:34.282370218 +0100
-@@ -2158,19 +2158,21 @@ gtk_tree_view_get_real_requested_width_f
+--- a/gtk/gtktreeview.c 2008-01-29 04:35:46.000000000 +0100
++++ b/gtk/gtktreeview.c 2008-01-29 09:57:35.000000000 +0100
+@@ -2158,19 +2158,21 @@
}
/* GtkWidget::size_allocate helper */
@@ -27,7 +25,7 @@
tree_view = GTK_TREE_VIEW (widget);
-@@ -2179,7 +2181,7 @@ gtk_tree_view_size_allocate_columns (Gtk
+@@ -2179,7 +2181,7 @@
last_column = last_column->prev)
;
if (last_column == NULL)
@@ -36,7 +34,7 @@
for (first_column = g_list_first (tree_view->priv->columns);
first_column && !(GTK_TREE_VIEW_COLUMN (first_column->data)->visible);
-@@ -2205,12 +2207,38 @@ gtk_tree_view_size_allocate_columns (Gtk
+@@ -2205,12 +2207,38 @@
number_of_expand_columns++;
}
@@ -76,7 +74,7 @@
for (list = (rtl ? last_column : first_column);
list != (rtl ? first_column->prev : last_column->next);
list = (rtl ? list->prev : list->next))
-@@ -2266,6 +2294,12 @@ gtk_tree_view_size_allocate_columns (Gtk
+@@ -2266,6 +2294,12 @@
column->width += extra;
}
@@ -89,7 +87,7 @@
g_object_notify (G_OBJECT (column), "width");
allocation.width = column->width;
-@@ -2283,8 +2317,17 @@ gtk_tree_view_size_allocate_columns (Gtk
+@@ -2283,8 +2317,17 @@
TREE_VIEW_DRAG_WIDTH, allocation.height);
}
@@ -107,7 +105,7 @@
}
-@@ -2299,13 +2342,13 @@ gtk_tree_view_size_allocate (GtkWidget
+@@ -2299,13 +2342,13 @@
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
@@ -124,7 +122,7 @@
tmp_list = tree_view->priv->children;
while (tmp_list)
-@@ -2323,6 +2366,7 @@ gtk_tree_view_size_allocate (GtkWidget
+@@ -2323,6 +2366,7 @@
gtk_widget_size_allocate (child->widget, &allocation);
}
@@ -132,7 +130,7 @@
tree_view->priv->hadjustment->page_size = allocation->width;
tree_view->priv->hadjustment->page_increment = allocation->width * 0.9;
-@@ -2331,28 +2375,30 @@ gtk_tree_view_size_allocate (GtkWidget
+@@ -2331,28 +2375,30 @@
tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width);
if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
@@ -183,7 +181,7 @@
gtk_adjustment_changed (tree_view->priv->hadjustment);
-@@ -2392,8 +2438,6 @@ gtk_tree_view_size_allocate (GtkWidget
+@@ -2392,8 +2438,6 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
@@ -192,7 +190,7 @@
if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view);
-@@ -2837,7 +2881,7 @@ gtk_tree_view_button_press (GtkWidget
+@@ -2837,7 +2881,7 @@
gtk_grab_add (widget);
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@@ -201,7 +199,7 @@
/* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
-@@ -3546,6 +3590,8 @@ gtk_tree_view_motion_resize_column (GtkW
+@@ -3549,6 +3593,8 @@
{
column->use_resized_width = TRUE;
column->resized_width = new_width;
@@ -210,7 +208,7 @@
gtk_widget_queue_resize (widget);
}
-@@ -11479,7 +11525,7 @@ gtk_tree_view_move_column_after (GtkTree
+@@ -11484,7 +11530,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -219,11 +217,9 @@
}
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
-Index: gtk+-2.12.1/gtk/gtktreeviewcolumn.c
-===================================================================
---- gtk+-2.12.1.orig/gtk/gtktreeviewcolumn.c 2007-10-16 15:20:39.000000000 +0200
-+++ gtk+-2.12.1/gtk/gtktreeviewcolumn.c 2007-11-15 19:58:41.667437428 +0100
-@@ -2142,6 +2142,7 @@ gtk_tree_view_column_set_expand (GtkTree
+--- a/gtk/gtktreeviewcolumn.c 2008-01-29 04:35:46.000000000 +0100
++++ b/gtk/gtktreeviewcolumn.c 2008-01-29 09:57:35.000000000 +0100
+@@ -2142,6 +2142,7 @@
tree_column->tree_view != NULL &&
GTK_WIDGET_REALIZED (tree_column->tree_view))
{
@@ -231,11 +227,9 @@
gtk_widget_queue_resize (tree_column->tree_view);
}
-Index: gtk+-2.12.1/gtk/gtktreeprivate.h
-===================================================================
---- gtk+-2.12.1.orig/gtk/gtktreeprivate.h 2007-10-16 15:20:39.000000000 +0200
-+++ gtk+-2.12.1/gtk/gtktreeprivate.h 2007-11-15 19:58:41.667437428 +0100
-@@ -266,6 +266,10 @@ struct _GtkTreeViewPrivate
+--- a/gtk/gtktreeprivate.h 2008-01-29 04:35:47.000000000 +0100
++++ b/gtk/gtktreeprivate.h 2008-01-29 09:57:35.000000000 +0100
+@@ -268,6 +268,10 @@
GdkGC *tree_line_gc;
gint tooltip_column;
Modified: desktop/unstable/gtk+2.0/debian/patches/042_treeview_single-focus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/042_treeview_single-focus.patch?rev=14351&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/042_treeview_single-focus.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/042_treeview_single-focus.patch Tue Jan 29 09:08:19 2008
@@ -1,6 +1,6 @@
---- gtk+2.0-2.12.3.orig/gtk/gtktreeview.c 2007-12-04 22:37:26.000000000 +0100
-+++ gtk+2.0-2.12.3/gtk/gtktreeview.c 2007-12-04 22:37:28.000000000 +0100
-@@ -9661,7 +9661,8 @@
+--- a/gtk/gtktreeview.c 2008-01-29 09:57:35.000000000 +0100
++++ b/gtk/gtktreeview.c 2008-01-29 09:58:06.000000000 +0100
+@@ -9664,7 +9664,8 @@
if (cursor_path)
{
Modified: desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=14351&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch Tue Jan 29 09:08:19 2008
@@ -9,8 +9,8 @@
This is required because of patches touching autotools files, but also because
of upstream using an older libtool; see GNOME #484426; Debian #445001.
---- gtk+2.0-2.12.4.orig/aclocal.m4 2008-01-08 05:46:51.000000000 +0100
-+++ gtk+2.0-2.12.4/aclocal.m4 2008-01-08 17:57:41.000000000 +0100
+--- a/aclocal.m4 2008-01-29 10:05:20.000000000 +0100
++++ b/aclocal.m4 2008-01-29 10:05:43.000000000 +0100
@@ -941,7 +941,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -123,7 +123,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -8311,7 +8324,7 @@
+@@ -8313,7 +8326,7 @@
esac
done
@@ -132,8 +132,8 @@
no_glib=""
---- gtk+2.0-2.12.4.orig/configure 2008-01-08 05:47:00.000000000 +0100
-+++ gtk+2.0-2.12.4/configure 2008-01-08 17:57:41.000000000 +0100
+--- a/configure 2008-01-29 10:05:20.000000000 +0100
++++ b/configure 2008-01-29 10:05:43.000000000 +0100
@@ -863,6 +863,8 @@
CCDEPMODE
am__fastdepCC_TRUE
@@ -588,7 +588,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -23999,7 +24057,7 @@
+@@ -24002,7 +24060,7 @@
fi
if test -n "$PKG_CONFIG"; then
@@ -597,7 +597,7 @@
{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-@@ -32441,8 +32499,18 @@
+@@ -32444,8 +32502,18 @@
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
{ echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6; }
@@ -618,7 +618,7 @@
else
{ { echo "$as_me:$LINENO: error:
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -32578,20 +32646,21 @@
+@@ -32581,20 +32649,21 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
@@ -645,7 +645,7 @@
fi
-@@ -32601,6 +32670,7 @@
+@@ -32604,6 +32673,7 @@
@@ -653,7 +653,7 @@
########################################
# Check for Accessibility Toolkit flags
########################################
-@@ -32706,7 +32776,7 @@
+@@ -32709,7 +32779,7 @@
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
if test $enable_explicit_deps != yes ; then
@@ -662,7 +662,7 @@
fi
-@@ -33891,6 +33961,13 @@
+@@ -33894,6 +33964,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -676,7 +676,7 @@
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -34961,9 +35038,9 @@
+@@ -34964,9 +35041,9 @@
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
@@ -688,7 +688,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -35005,6 +35082,8 @@
+@@ -35008,6 +35085,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -697,7 +697,7 @@
CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-@@ -35100,8 +35179,6 @@
+@@ -35103,8 +35182,6 @@
INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim
INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim
INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim
@@ -706,7 +706,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -35143,6 +35220,8 @@
+@@ -35146,6 +35223,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -715,7 +715,7 @@
INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim
INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim
-@@ -35196,6 +35275,7 @@
+@@ -35199,6 +35278,7 @@
USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim
USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim
GDK_PACKAGES!$GDK_PACKAGES$ac_delim
@@ -723,7 +723,7 @@
GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim
GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim
GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim
-@@ -35237,9 +35317,6 @@
+@@ -35240,9 +35320,6 @@
HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim
XSLTPROC!$XSLTPROC$ac_delim
XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim
@@ -733,7 +733,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -35281,11 +35358,14 @@
+@@ -35284,11 +35361,14 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -749,27 +749,27 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- gtk+2.0-2.12.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2008-01-08 05:46:55.000000000 +0100
-+++ gtk+2.0-2.12.4/contrib/gdk-pixbuf-xlib/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/contrib/Makefile.in 2008-01-08 05:46:55.000000000 +0100
-+++ gtk+2.0-2.12.4/contrib/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/contrib/gdk-pixbuf-xlib/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/contrib/gdk-pixbuf-xlib/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/contrib/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/contrib/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -787,27 +787,27 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/demos/gtk-demo/Makefile.in 2008-01-08 05:46:56.000000000 +0100
-+++ gtk+2.0-2.12.4/demos/gtk-demo/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/demos/Makefile.in 2008-01-08 05:46:55.000000000 +0100
-+++ gtk+2.0-2.12.4/demos/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/demos/gtk-demo/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/demos/gtk-demo/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/demos/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/demos/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -825,46 +825,46 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/docs/faq/Makefile.in 2008-01-08 05:46:56.000000000 +0100
-+++ gtk+2.0-2.12.4/docs/faq/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/docs/Makefile.in 2008-01-08 05:46:56.000000000 +0100
-+++ gtk+2.0-2.12.4/docs/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/docs/reference/gdk/Makefile.in 2008-01-08 15:12:39.000000000 +0100
-+++ gtk+2.0-2.12.4/docs/reference/gdk/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/docs/faq/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/docs/faq/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/docs/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/docs/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/docs/reference/gdk/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/docs/reference/gdk/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -882,8 +882,8 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/docs/reference/gdk-pixbuf/Makefile.in 2008-01-08 15:12:38.000000000 +0100
-+++ gtk+2.0-2.12.4/docs/reference/gdk-pixbuf/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/docs/reference/gdk-pixbuf/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/docs/reference/gdk-pixbuf/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -901,8 +901,8 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/docs/reference/gtk/Makefile.in 2008-01-08 15:12:42.000000000 +0100
-+++ gtk+2.0-2.12.4/docs/reference/gtk/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/docs/reference/gtk/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/docs/reference/gtk/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -95,6 +95,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -920,160 +920,160 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/docs/reference/Makefile.in 2008-01-08 05:46:56.000000000 +0100
-+++ gtk+2.0-2.12.4/docs/reference/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/docs/tools/Makefile.in 2008-01-08 05:46:56.000000000 +0100
-+++ gtk+2.0-2.12.4/docs/tools/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/docs/tutorial/Makefile.in 2008-01-08 05:46:56.000000000 +0100
-+++ gtk+2.0-2.12.4/docs/tutorial/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gdk/directfb/Makefile.in 2008-01-08 05:46:57.000000000 +0100
-+++ gtk+2.0-2.12.4/gdk/directfb/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gdk/Makefile.in 2008-01-08 05:46:57.000000000 +0100
-+++ gtk+2.0-2.12.4/gdk/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gdk/quartz/Makefile.in 2008-01-08 05:46:57.000000000 +0100
-+++ gtk+2.0-2.12.4/gdk/quartz/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gdk/win32/Makefile.in 2008-01-08 05:46:57.000000000 +0100
-+++ gtk+2.0-2.12.4/gdk/win32/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gdk/win32/rc/Makefile.in 2008-01-08 05:46:57.000000000 +0100
-+++ gtk+2.0-2.12.4/gdk/win32/rc/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gdk/x11/Makefile.in 2008-01-08 05:46:57.000000000 +0100
-+++ gtk+2.0-2.12.4/gdk/x11/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/docs/reference/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/docs/reference/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/docs/tools/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/docs/tools/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/docs/tutorial/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/docs/tutorial/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gdk/directfb/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gdk/directfb/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gdk/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gdk/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gdk/quartz/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gdk/quartz/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gdk/win32/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gdk/win32/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gdk/win32/rc/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gdk/win32/rc/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gdk/x11/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gdk/x11/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1091,46 +1091,46 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gdk-pixbuf/Makefile.in 2008-01-08 05:46:56.000000000 +0100
-+++ gtk+2.0-2.12.4/gdk-pixbuf/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gdk-pixbuf/pixops/Makefile.in 2008-01-08 05:46:56.000000000 +0100
-+++ gtk+2.0-2.12.4/gdk-pixbuf/pixops/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gtk/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/gtk/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/gdk-pixbuf/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gdk-pixbuf/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gdk-pixbuf/pixops/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gdk-pixbuf/pixops/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gtk/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gtk/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -113,6 +113,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1188,46 +1188,46 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
---- gtk+2.0-2.12.4.orig/gtk/theme-bits/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/gtk/theme-bits/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/gtk/xdgmime/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/gtk/xdgmime/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/ltmain.sh 2007-08-29 13:52:51.000000000 +0200
-+++ gtk+2.0-2.12.4/ltmain.sh 2008-01-08 17:57:41.000000000 +0100
+--- a/gtk/theme-bits/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gtk/theme-bits/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/gtk/xdgmime/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/gtk/xdgmime/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/ltmain.sh 2008-01-29 10:05:20.000000000 +0100
++++ b/ltmain.sh 2008-01-29 10:05:43.000000000 +0100
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
@@ -1261,27 +1261,27 @@
esac
;;
no)
---- gtk+2.0-2.12.4.orig/m4macros/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/m4macros/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/Makefile.in 2008-01-08 05:46:55.000000000 +0100
-+++ gtk+2.0-2.12.4/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/m4macros/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/m4macros/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1330,103 +1330,103 @@
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
---- gtk+2.0-2.12.4.orig/modules/engines/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/engines/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/engines/ms-windows/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/engines/ms-windows/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/engines/ms-windows/Theme/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/engines/ms-windows/Theme/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/engines/pixbuf/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/engines/pixbuf/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/input/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/input/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/modules/engines/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/engines/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/engines/ms-windows/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/engines/ms-windows/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/engines/ms-windows/Theme/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/engines/ms-windows/Theme/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/engines/pixbuf/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/engines/pixbuf/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/input/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/input/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1476,84 +1476,84 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
---- gtk+2.0-2.12.4.orig/modules/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/printbackends/cups/Makefile.in 2008-01-08 05:46:59.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/printbackends/cups/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/printbackends/file/Makefile.in 2008-01-08 05:46:59.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/printbackends/file/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/printbackends/lpr/Makefile.in 2008-01-08 05:46:59.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/printbackends/lpr/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/printbackends/Makefile.in 2008-01-08 05:46:58.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/printbackends/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/modules/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/printbackends/cups/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/printbackends/cups/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/printbackends/file/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/printbackends/file/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/printbackends/lpr/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/printbackends/lpr/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/modules/printbackends/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/printbackends/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -1571,46 +1571,46 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/modules/printbackends/test/Makefile.in 2008-01-08 05:46:59.000000000 +0100
-+++ gtk+2.0-2.12.4/modules/printbackends/test/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/perf/Makefile.in 2008-01-08 05:46:59.000000000 +0100
-+++ gtk+2.0-2.12.4/perf/Makefile.in 2008-01-08 17:57:41.000000000 +0100
-@@ -89,6 +89,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -112,6 +114,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
---- gtk+2.0-2.12.4.orig/tests/Makefile.in 2008-01-08 05:46:59.000000000 +0100
-+++ gtk+2.0-2.12.4/tests/Makefile.in 2008-01-08 17:57:41.000000000 +0100
+--- a/modules/printbackends/test/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/modules/printbackends/test/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/perf/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/perf/Makefile.in 2008-01-29 10:05:43.000000000 +0100
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -112,6 +114,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+--- a/tests/Makefile.in 2008-01-29 10:05:20.000000000 +0100
++++ b/tests/Makefile.in 2008-01-29 10:05:43.000000000 +0100
@@ -92,6 +92,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
More information about the pkg-gnome-commits
mailing list