callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refresh patches to apply cleanly.

Browse Source
This commit is contained in:
Michael Biebl 2010-04-10 13:01:35 +00:00
parent de1f27a3da
commit bc6af988b1
18 changed files with 354 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ gtk+2.0 (2.20.0-3) UNRELEASED; urgency=low
- Add support for tracker 0.8 stable and future 0.9 releases. Also add
support for loading the search engines on demand until they are actually
needed. Patch is backported from upstream Git branch "tracker-0.8".
* Refresh patches to apply cleanly.
-- Michael Biebl <biebl@debian.org> Sat, 10 Apr 2010 14:43:05 +0200

14
debian/patches/001_static-linking-dont-query-immodules.patch vendored
View File

@ -2,9 +2,11 @@ Description: Don't query immodules for the local tree when cross-compiling or
when --disable-shared was given
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
--- a/configure.in
+++ b/configure.in
@@ -157,6 +157,7 @@
Index: b/configure.in
===================================================================
--- a/configure.in 2010-04-10 14:52:05.069943955 +0200
+++ b/configure.in 2010-04-10 14:52:06.769944806 +0200
@@ -162,6 +162,7 @@
dnl Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
@ -12,8 +14,10 @@ Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
dnl
dnl Check for a working C++ compiler, but do not bail out, if none is found.
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
Index: b/modules/input/Makefile.am
===================================================================
--- a/modules/input/Makefile.am 2010-04-10 14:52:05.089945386 +0200
+++ b/modules/input/Makefile.am 2010-04-10 14:52:06.769944806 +0200
@@ -178,8 +178,12 @@
if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false

6
debian/patches/002_static-linking-dont-build-perf.patch vendored
View File

@ -1,10 +1,10 @@
Description: don't build perf measurement tools in static builds
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346559
Index: gtk+-2.14.7/Makefile.am
Index: b/Makefile.am
===================================================================
--- gtk+-2.14.7.orig/Makefile.am 2009-01-07 17:33:57.000000000 +0100
+++ gtk+-2.14.7/Makefile.am 2009-02-17 23:07:14.895082593 +0100
--- a/Makefile.am 2010-04-10 14:52:04.949938994 +0200
+++ b/Makefile.am 2010-04-10 14:52:07.085945966 +0200
@@ -1,7 +1,12 @@
## Makefile.am for GTK+
include $(top_srcdir)/Makefile.decl

14
debian/patches/003_gdk.pc_privates.patch vendored
View File

@ -1,6 +1,8 @@
--- a/configure.in
+++ b/configure.in
@@ -1720,19 +1720,22 @@
Index: b/configure.in
===================================================================
--- a/configure.in 2010-04-10 14:52:06.769944806 +0200
+++ b/configure.in 2010-04-10 14:52:07.373945222 +0200
@@ -1721,19 +1721,22 @@
LDFLAGS="$saved_ldflags"
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
@ -27,8 +29,10 @@
AC_SUBST(GDK_EXTRA_LIBS)
AC_SUBST(GDK_EXTRA_CFLAGS)
AC_SUBST(GDK_DEP_LIBS)
--- a/gdk-2.0.pc.in
+++ b/gdk-2.0.pc.in
Index: b/gdk-2.0.pc.in
===================================================================
--- a/gdk-2.0.pc.in 2010-04-10 14:52:04.881945980 +0200
+++ b/gdk-2.0.pc.in 2010-04-10 14:52:07.373945222 +0200
@@ -8,5 +8,6 @@
Description: GTK+ Drawing Kit (${target} target)
Version: @VERSION@

26
debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+-2.14.7/gtk/gtkfilesel.c
Index: b/gtk/gtkfilesel.c
===================================================================
--- gtk+-2.14.7.orig/gtk/gtkfilesel.c 2009-01-07 17:32:57.000000000 +0100
+++ gtk+-2.14.7/gtk/gtkfilesel.c 2009-02-17 23:07:34.883084908 +0100
--- a/gtk/gtkfilesel.c 2010-04-10 14:52:04.761941596 +0200
+++ b/gtk/gtkfilesel.c 2010-04-10 14:52:07.733941648 +0200
@@ -80,9 +80,13 @@
#include "gtkeventbox.h"
#include "gtkoptionmenu.h"
@ -16,7 +16,7 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
#include "gtkalias.h"
#ifdef G_OS_WIN32
@@ -318,6 +322,9 @@ static gint cmpl_last_val
@@ -318,6 +322,9 @@
*/
static gchar* cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state);
@ -26,7 +26,7 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
/* Directory operations. */
static CompletionDir* open_ref_dir (gchar* text_to_complete,
@@ -627,6 +634,10 @@ gtk_file_selection_init (GtkFileSelectio
@@ -627,6 +634,10 @@
GtkWidget *spacer;
GtkDialog *dialog;
@ -37,7 +37,7 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
GtkListStore *model;
GtkTreeViewColumn *column;
@@ -640,18 +651,9 @@ gtk_file_selection_init (GtkFileSelectio
@@ -640,18 +651,9 @@
filesel->main_vbox = dialog->vbox;
gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
@ -57,7 +57,7 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0);
gtk_widget_show (pulldown_hbox);
@@ -663,14 +665,27 @@ gtk_file_selection_init (GtkFileSelectio
@@ -663,14 +665,27 @@
/* The horizontal box containing the directory and file listboxes */
@ -87,7 +87,7 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
if (WANT_HPANED)
list_container = g_object_new (GTK_TYPE_HPANED,
"visible", TRUE,
@@ -682,9 +697,78 @@ gtk_file_selection_init (GtkFileSelectio
@@ -682,9 +697,78 @@
spacer = gtk_hbox_new (FALSE, 0);
gtk_widget_set_size_request (spacer, -1, 5);
@ -167,7 +167,7 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
/* The directories list */
model = gtk_list_store_new (1, G_TYPE_STRING);
@@ -757,6 +841,15 @@ gtk_file_selection_init (GtkFileSelectio
@@ -757,6 +841,15 @@
gtk_widget_show (filesel->file_list);
gtk_widget_show (scrolled_win);
@ -183,7 +183,7 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
/* action area for packing buttons into. */
filesel->action_area = gtk_hbox_new (TRUE, 0);
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area,
@@ -1012,39 +1105,94 @@ gtk_file_selection_new (const gchar *tit
@@ -1012,39 +1105,94 @@
void
gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel)
{
@ -292,7 +292,7 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
gtk_widget_show (filesel->fileop_ren_file);
}
@@ -1746,6 +1894,95 @@ gtk_file_selection_update_fileops (GtkFi
@@ -1752,6 +1900,95 @@
gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive);
}
@ -388,10 +388,10 @@ Index: gtk+-2.14.7/gtk/gtkfilesel.c
static gint
gtk_file_selection_key_press (GtkWidget *widget,
GdkEventKey *event,
Index: gtk+-2.14.7/gtk/stock-icons/ximian-icons.h
Index: b/gtk/stock-icons/ximian-icons.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gtk+-2.14.7/gtk/stock-icons/ximian-icons.h 2009-02-17 23:07:34.887082553 +0100
+++ b/gtk/stock-icons/ximian-icons.h 2010-04-10 14:52:07.762499475 +0200
@@ -0,0 +1,825 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+

6
debian/patches/005_support_disabling_x11_extensions.patch vendored
View File

@ -3,8 +3,10 @@ Author: Cyril Brulebois <kibi@debian.org>
Support disabling X11 extensions
--- a/configure.in
+++ b/configure.in
Index: b/configure.in
===================================================================
--- a/configure.in 2010-04-10 14:52:07.373945222 +0200
+++ b/configure.in 2010-04-10 14:52:08.109945409 +0200
@@ -253,6 +253,18 @@
[AC_HELP_STRING([--enable-xinerama],
[support xinerama extension if available [default=yes]])],,

58
debian/patches/009_gtk-export-filechooser.patch vendored
View File

@ -34,9 +34,11 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -42,6 +42,8 @@
Index: b/gtk/Makefile.am
===================================================================
--- a/gtk/Makefile.am 2010-04-10 14:52:04.441943282 +0200
+++ b/gtk/Makefile.am 2010-04-10 14:52:08.761942152 +0200
@@ -52,6 +52,8 @@
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_DISABLE_DEPRECATED \
@ -45,7 +47,7 @@
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
@@ -348,12 +350,16 @@
@@ -360,12 +362,16 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@ -65,7 +67,7 @@
gtksearchenginesimple.h \
gtkdndcursors.h \
gtkentryprivate.h \
@@ -362,11 +368,7 @@
@@ -374,11 +380,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@ -77,9 +79,11 @@
gtkiconcache.h \
gtkintl.h \
gtkkeyhash.h \
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1610,6 +1610,12 @@
Index: b/gtk/gtk.symbols
===================================================================
--- a/gtk/gtk.symbols 2010-04-10 14:52:04.489943535 +0200
+++ b/gtk/gtk.symbols 2010-04-10 14:52:08.765946852 +0200
@@ -1633,6 +1633,12 @@
#endif
#endif
@ -92,8 +96,10 @@
#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
gtk_file_chooser_widget_get_type G_GNUC_CONST
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
Index: b/gtk/gtkfilechooserprivate.h
===================================================================
--- a/gtk/gtkfilechooserprivate.h 2010-04-10 14:52:04.461944715 +0200
+++ b/gtk/gtkfilechooserprivate.h 2010-04-10 14:52:08.765946852 +0200
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@ -109,8 +115,10 @@
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
Index: b/gtk/gtkfilechooserutils.c
===================================================================
--- a/gtk/gtkfilechooserutils.c 2010-04-10 14:52:04.469943779 +0200
+++ b/gtk/gtkfilechooserutils.c 2010-04-10 14:52:08.765946852 +0200
@@ -122,6 +122,22 @@
"create-folders");
}
@ -141,8 +149,10 @@
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
--- a/gtk/gtkfilechooserutils.h
+++ b/gtk/gtkfilechooserutils.h
Index: b/gtk/gtkfilechooserutils.h
===================================================================
--- a/gtk/gtkfilechooserutils.h 2010-04-10 14:52:04.429939517 +0200
+++ b/gtk/gtkfilechooserutils.h 2010-04-10 14:52:08.765946852 +0200
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@ -168,8 +178,10 @@
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
--- a/gtk/gtkfilesystemmodel.h
+++ b/gtk/gtkfilesystemmodel.h
Index: b/gtk/gtkfilesystemmodel.h
===================================================================
--- a/gtk/gtkfilesystemmodel.h 2010-04-10 14:52:04.525944493 +0200
+++ b/gtk/gtkfilesystemmodel.h 2010-04-10 14:52:08.765946852 +0200
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@ -180,9 +192,11 @@
+
#include <gio/gio.h>
#include <gtk/gtkfilefilter.h>
--- a/gtk/gtkquery.h
+++ b/gtk/gtkquery.h
#include <gtk/gtktreemodel.h>
Index: b/gtk/gtkquery.h
===================================================================
--- a/gtk/gtkquery.h 2010-04-10 14:52:04.409943955 +0200
+++ b/gtk/gtkquery.h 2010-04-10 14:52:08.765946852 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_QUERY_H__
#define __GTK_QUERY_H__
@ -198,8 +212,10 @@
#include <glib-object.h>
G_BEGIN_DECLS
--- a/gtk/gtksearchengine.h
+++ b/gtk/gtksearchengine.h
Index: b/gtk/gtksearchengine.h
===================================================================
--- a/gtk/gtksearchengine.h 2010-04-10 14:52:04.501945345 +0200
+++ b/gtk/gtksearchengine.h 2010-04-10 14:52:08.765946852 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__

8
debian/patches/010_gdkpixbuf_-lm.patch vendored
View File

@ -1,6 +1,8 @@
--- a/configure.in
+++ b/configure.in
@@ -1782,7 +1782,7 @@
Index: b/configure.in
===================================================================
--- a/configure.in 2010-04-10 14:52:08.109945409 +0200
+++ b/configure.in 2010-04-10 14:52:09.177943468 +0200
@@ -1806,7 +1806,7 @@
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
if test $enable_explicit_deps != yes ; then

8
debian/patches/015_default-fallback-icon-theme.patch vendored
View File

@ -1,6 +1,8 @@
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -301,7 +301,7 @@
Index: b/gtk/gtksettings.c
===================================================================
--- a/gtk/gtksettings.c 2010-04-10 14:52:04.289945999 +0200
+++ b/gtk/gtksettings.c 2010-04-10 14:52:09.473946523 +0200
@@ -310,7 +310,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"),

6
debian/patches/020_immodules-files-d.patch vendored
View File

@ -1,5 +1,7 @@
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
Index: b/gtk/gtkimmodule.c
===================================================================
--- a/gtk/gtkimmodule.c 2010-04-10 14:52:04.229942828 +0200
+++ b/gtk/gtkimmodule.c 2010-04-10 14:52:09.765946296 +0200
@@ -70,6 +70,9 @@
#define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST ((im_module), GTK_TYPE_IM_MODULE, GtkIMModule))
#define GTK_IS_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_TYPE ((im_module), GTK_TYPE_IM_MODULE))

20
debian/patches/021_loader-files-d.patch vendored
View File

@ -1,6 +1,8 @@
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -62,6 +62,7 @@
Index: b/gdk-pixbuf/Makefile.am
===================================================================
--- a/gdk-pixbuf/Makefile.am 2010-04-10 14:52:04.113943135 +0200
+++ b/gdk-pixbuf/Makefile.am 2010-04-10 14:52:10.065944562 +0200
@@ -65,6 +65,7 @@
libgdk_pixbuf-2.0.la
loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
@ -8,7 +10,7 @@
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
@@ -513,7 +514,7 @@
@@ -532,7 +533,7 @@
$(GDK_PIXBUF_DEP_CFLAGS) \
-DGDK_PIXBUF_ENABLE_BACKEND
@ -17,8 +19,10 @@
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
noinst_PROGRAMS = test-gdk-pixbuf
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
Index: b/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- a/gdk-pixbuf/gdk-pixbuf-io.c 2010-04-10 14:52:04.137946193 +0200
+++ b/gdk-pixbuf/gdk-pixbuf-io.c 2010-04-10 14:52:10.065944562 +0200
@@ -51,6 +51,9 @@
#define SNIFF_BUFFER_SIZE 4096
#define LOAD_BUFFER_SIZE 65536
@ -29,7 +33,7 @@
#ifndef GDK_PIXBUF_USE_GIO_MIME
static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size)
@@ -316,118 +319,93 @@
@@ -317,118 +320,93 @@
gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
GError **error);
@ -224,7 +228,7 @@
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p;
@@ -562,8 +543,159 @@
@@ -566,8 +544,159 @@
g_free (line_buf);
}
g_string_free (tmp_buf, TRUE);

6
debian/patches/022_disable-viqr-im-for-vi-locale.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.15.2/modules/input/imviqr.c
Index: b/modules/input/imviqr.c
===================================================================
--- gtk+2.0-2.15.2.orig/modules/input/imviqr.c 2009-01-27 05:03:01.000000000 +0100
+++ gtk+2.0-2.15.2/modules/input/imviqr.c 2009-01-27 11:21:08.000000000 +0100
--- a/modules/input/imviqr.c 2010-04-10 14:52:04.009941613 +0200
+++ b/modules/input/imviqr.c 2010-04-10 14:52:10.389945321 +0200
@@ -244,7 +244,7 @@
N_("Vietnamese (VIQR)"), /* Human readable name */
GETTEXT_PACKAGE, /* Translation domain */

18
debian/patches/022_module-files-append-compat-module-files-d.patch vendored
View File

@ -1,5 +1,7 @@
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
Index: b/gtk/gtkimmodule.c
===================================================================
--- a/gtk/gtkimmodule.c 2010-04-10 14:52:09.765946296 +0200
+++ b/gtk/gtkimmodule.c 2010-04-10 14:52:10.681942580 +0200
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
@ -51,9 +53,11 @@
g_free (im_module_files_d_str);
g_free (im_module_file_str);
}
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -553,6 +553,18 @@
Index: b/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- a/gdk-pixbuf/gdk-pixbuf-io.c 2010-04-10 14:52:10.065944562 +0200
+++ b/gdk-pixbuf/gdk-pixbuf-io.c 2010-04-10 14:52:10.685945884 +0200
@@ -554,6 +554,18 @@
#ifdef USE_GMODULE
GIOChannel *channel;
gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
@ -72,7 +76,7 @@
gchar *list_str;
char **files;
GError *error = NULL;
@@ -636,6 +648,18 @@
@@ -640,6 +652,18 @@
#undef load_one_builtin_module
#ifdef USE_GMODULE
@ -91,7 +95,7 @@
list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
gdkpixbuf_module_file_str,
PIXBUF_FILES_LIBDIR,
@@ -691,6 +715,10 @@
@@ -695,6 +719,10 @@
}
g_strfreev (files);

14
debian/patches/041_ia32-libs.patch vendored
View File

@ -1,6 +1,8 @@
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -307,8 +307,20 @@
Index: b/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- a/gdk-pixbuf/gdk-pixbuf-io.c 2010-04-10 14:52:10.685945884 +0200
+++ b/gdk-pixbuf/gdk-pixbuf-io.c 2010-04-10 14:52:10.997945392 +0200
@@ -308,8 +308,20 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
@ -23,8 +25,10 @@
return result;
}
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
Index: b/gtk/gtkrc.c
===================================================================
--- a/gtk/gtkrc.c 2010-04-10 14:52:03.789945438 +0200
+++ b/gtk/gtkrc.c 2010-04-10 14:52:11.025941140 +0200
@@ -450,7 +450,20 @@
if (im_module_file)
result = g_strdup (im_module_file);

8
debian/patches/042_treeview_single-focus.patch vendored
View File

@ -1,6 +1,8 @@
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9482,7 +9482,8 @@
Index: b/gtk/gtktreeview.c
===================================================================
--- a/gtk/gtktreeview.c 2010-04-10 14:52:03.729940590 +0200
+++ b/gtk/gtktreeview.c 2010-04-10 14:52:11.345946704 +0200
@@ -9570,7 +9570,8 @@
if (cursor_path)
{

6
debian/patches/060_ignore-random-icons.patch vendored
View File

@ -1,5 +1,7 @@
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
Index: b/gtk/updateiconcache.c
===================================================================
--- a/gtk/updateiconcache.c 2010-04-10 14:52:03.669943004 +0200
+++ b/gtk/updateiconcache.c 2010-04-10 14:52:11.645942185 +0200
@@ -660,7 +660,7 @@
directories = g_list_append (directories, g_strdup (subdir));
}

20
debian/patches/061_use_pdf_as_default_printing_standard.patch vendored
View File

@ -1,6 +1,8 @@
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -340,8 +340,9 @@
Index: b/modules/printbackends/cups/gtkprintbackendcups.c
===================================================================
--- a/modules/printbackends/cups/gtkprintbackendcups.c 2010-04-10 14:52:03.613942573 +0200
+++ b/modules/printbackends/cups/gtkprintbackendcups.c 2010-04-10 14:52:11.941944957 +0200
@@ -343,8 +343,9 @@
/* TODO: check if it is a ps or pdf printer */
@ -11,7 +13,7 @@
ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
if (ppd_file != NULL)
@@ -408,6 +409,7 @@
@@ -402,6 +403,7 @@
if (level == 3)
cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3);
@ -19,8 +21,10 @@
cairo_surface_set_fallback_resolution (surface,
2.0 * gtk_print_settings_get_printer_lpi (settings),
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c
Index: b/modules/printbackends/lpr/gtkprintbackendlpr.c
===================================================================
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-04-10 14:52:03.585944592 +0200
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-04-10 14:52:11.941944957 +0200
@@ -31,6 +31,8 @@
#include <cairo.h>
#include <cairo-ps.h>
@ -37,5 +41,5 @@
- surface = cairo_ps_surface_create_for_stream (_cairo_write, cache_io, width, height);
+ surface = cairo_pdf_surface_create_for_stream (_cairo_write, cache_io, width, height);
if (gtk_print_settings_get_printer_lpi (settings) == 0.0)
gtk_print_settings_set_printer_lpi (settings, 150.0);
cairo_surface_set_fallback_resolution (surface,
2.0 * gtk_print_settings_get_printer_lpi (settings),

364
debian/patches/070_mandatory-relibtoolize.patch vendored
View File

@ -1,6 +1,7 @@
diff -Naur gtk+2.0-2.20.0.old/aclocal.m4 gtk+2.0-2.20.0/aclocal.m4
--- gtk+2.0-2.20.0.old/aclocal.m4 2010-03-23 04:32:53.000000000 +0100
+++ gtk+2.0-2.20.0/aclocal.m4 2010-03-23 16:10:17.568931245 +0100
Index: b/aclocal.m4
===================================================================
--- a/aclocal.m4 2010-04-10 14:52:02.565942575 +0200
+++ b/aclocal.m4 2010-04-10 14:52:12.261939919 +0200
@@ -732,14 +732,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
@ -38,9 +39,10 @@ diff -Naur gtk+2.0-2.20.0.old/aclocal.m4 gtk+2.0-2.20.0/aclocal.m4
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff -Naur gtk+2.0-2.20.0.old/configure gtk+2.0-2.20.0/configure
--- gtk+2.0-2.20.0.old/configure 2010-03-23 04:33:03.000000000 +0100
+++ gtk+2.0-2.20.0/configure 2010-03-23 16:10:19.056953886 +0100
Index: b/configure
===================================================================
--- a/configure 2010-04-10 14:52:03.525942253 +0200
+++ b/configure 2010-04-10 14:52:12.277947544 +0200
@@ -816,6 +816,7 @@
GDK_DEP_LIBS
GDK_EXTRA_CFLAGS
@ -741,9 +743,10 @@ diff -Naur gtk+2.0-2.20.0.old/configure gtk+2.0-2.20.0/configure
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
as_fn_error "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff -Naur gtk+2.0-2.20.0.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.20.0/contrib/gdk-pixbuf-xlib/Makefile.in
--- gtk+2.0-2.20.0.old/contrib/gdk-pixbuf-xlib/Makefile.in 2010-03-23 04:32:56.000000000 +0100
+++ gtk+2.0-2.20.0/contrib/gdk-pixbuf-xlib/Makefile.in 2010-03-23 16:10:20.284927621 +0100
Index: b/contrib/gdk-pixbuf-xlib/Makefile.in
===================================================================
--- a/contrib/gdk-pixbuf-xlib/Makefile.in 2010-04-10 14:52:02.937944988 +0200
+++ b/contrib/gdk-pixbuf-xlib/Makefile.in 2010-04-10 14:52:12.277947544 +0200
@@ -51,7 +51,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -761,9 +764,10 @@ diff -Naur gtk+2.0-2.20.0.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.20.0
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/contrib/Makefile.in gtk+2.0-2.20.0/contrib/Makefile.in
--- gtk+2.0-2.20.0.old/contrib/Makefile.in 2010-03-23 04:32:56.000000000 +0100
+++ gtk+2.0-2.20.0/contrib/Makefile.in 2010-03-23 16:10:20.164928008 +0100
Index: b/contrib/Makefile.in
===================================================================
--- a/contrib/Makefile.in 2010-04-10 14:52:02.921946862 +0200
+++ b/contrib/Makefile.in 2010-04-10 14:52:12.277947544 +0200
@@ -47,7 +47,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -781,9 +785,10 @@ diff -Naur gtk+2.0-2.20.0.old/contrib/Makefile.in gtk+2.0-2.20.0/contrib/Makefil
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/demos/gtk-demo/Makefile.in gtk+2.0-2.20.0/demos/gtk-demo/Makefile.in
--- gtk+2.0-2.20.0.old/demos/gtk-demo/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/demos/gtk-demo/Makefile.in 2010-03-23 16:10:20.496928036 +0100
Index: b/demos/gtk-demo/Makefile.in
===================================================================
--- a/demos/gtk-demo/Makefile.in 2010-04-10 14:52:02.893945811 +0200
+++ b/demos/gtk-demo/Makefile.in 2010-04-10 14:52:12.281943304 +0200
@@ -49,7 +49,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -801,9 +806,10 @@ diff -Naur gtk+2.0-2.20.0.old/demos/gtk-demo/Makefile.in gtk+2.0-2.20.0/demos/gt
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/demos/Makefile.in gtk+2.0-2.20.0/demos/Makefile.in
--- gtk+2.0-2.20.0.old/demos/Makefile.in 2010-03-23 04:32:56.000000000 +0100
+++ gtk+2.0-2.20.0/demos/Makefile.in 2010-03-23 16:10:20.396927968 +0100
Index: b/demos/Makefile.in
===================================================================
--- a/demos/Makefile.in 2010-04-10 14:52:02.869944431 +0200
+++ b/demos/Makefile.in 2010-04-10 14:52:12.281943304 +0200
@@ -53,7 +53,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -821,9 +827,10 @@ diff -Naur gtk+2.0-2.20.0.old/demos/Makefile.in gtk+2.0-2.20.0/demos/Makefile.in
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/faq/Makefile.in gtk+2.0-2.20.0/docs/faq/Makefile.in
--- gtk+2.0-2.20.0.old/docs/faq/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/faq/Makefile.in 2010-03-23 16:10:20.644927633 +0100
Index: b/docs/faq/Makefile.in
===================================================================
--- a/docs/faq/Makefile.in 2010-04-10 14:52:02.689947484 +0200
+++ b/docs/faq/Makefile.in 2010-04-10 14:52:12.281943304 +0200
@@ -46,7 +46,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -841,9 +848,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/faq/Makefile.in gtk+2.0-2.20.0/docs/faq/Makef
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/Makefile.in gtk+2.0-2.20.0/docs/Makefile.in
--- gtk+2.0-2.20.0.old/docs/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/Makefile.in 2010-03-23 16:10:20.572927701 +0100
Index: b/docs/Makefile.in
===================================================================
--- a/docs/Makefile.in 2010-04-10 14:52:02.577946060 +0200
+++ b/docs/Makefile.in 2010-04-10 14:52:12.281943304 +0200
@@ -46,7 +46,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -861,9 +869,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/Makefile.in gtk+2.0-2.20.0/docs/Makefile.in
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/reference/gdk/Makefile.in gtk+2.0-2.20.0/docs/reference/gdk/Makefile.in
--- gtk+2.0-2.20.0.old/docs/reference/gdk/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/reference/gdk/Makefile.in 2010-03-23 16:10:20.896927691 +0100
Index: b/docs/reference/gdk/Makefile.in
===================================================================
--- a/docs/reference/gdk/Makefile.in 2010-04-10 14:52:02.657945641 +0200
+++ b/docs/reference/gdk/Makefile.in 2010-04-10 14:52:12.281943304 +0200
@@ -53,7 +53,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -881,9 +890,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/reference/gdk/Makefile.in gtk+2.0-2.20.0/docs
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.20.0/docs/reference/gdk-pixbuf/Makefile.in
--- gtk+2.0-2.20.0.old/docs/reference/gdk-pixbuf/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/reference/gdk-pixbuf/Makefile.in 2010-03-23 16:10:20.812927904 +0100
Index: b/docs/reference/gdk-pixbuf/Makefile.in
===================================================================
--- a/docs/reference/gdk-pixbuf/Makefile.in 2010-04-10 14:52:02.677944558 +0200
+++ b/docs/reference/gdk-pixbuf/Makefile.in 2010-04-10 14:52:12.281943304 +0200
@@ -53,7 +53,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -901,9 +911,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.20
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/reference/gtk/Makefile.in gtk+2.0-2.20.0/docs/reference/gtk/Makefile.in
--- gtk+2.0-2.20.0.old/docs/reference/gtk/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/reference/gtk/Makefile.in 2010-03-23 16:10:20.992928088 +0100
Index: b/docs/reference/gtk/Makefile.in
===================================================================
--- a/docs/reference/gtk/Makefile.in 2010-04-10 14:52:02.617941660 +0200
+++ b/docs/reference/gtk/Makefile.in 2010-04-10 14:52:12.285943814 +0200
@@ -53,7 +53,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -921,9 +932,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/reference/gtk/Makefile.in gtk+2.0-2.20.0/docs
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.20.0/docs/reference/libgail-util/Makefile.in
--- gtk+2.0-2.20.0.old/docs/reference/libgail-util/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/reference/libgail-util/Makefile.in 2010-03-23 16:10:21.080928160 +0100
Index: b/docs/reference/libgail-util/Makefile.in
===================================================================
--- a/docs/reference/libgail-util/Makefile.in 2010-04-10 14:52:02.633943420 +0200
+++ b/docs/reference/libgail-util/Makefile.in 2010-04-10 14:52:12.285943814 +0200
@@ -52,7 +52,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -941,9 +953,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/reference/Makefile.in gtk+2.0-2.20.0/docs/reference/Makefile.in
--- gtk+2.0-2.20.0.old/docs/reference/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/reference/Makefile.in 2010-03-23 16:10:20.720928078 +0100
Index: b/docs/reference/Makefile.in
===================================================================
--- a/docs/reference/Makefile.in 2010-04-10 14:52:02.597946654 +0200
+++ b/docs/reference/Makefile.in 2010-04-10 14:52:12.285943814 +0200
@@ -46,7 +46,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -961,9 +974,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/reference/Makefile.in gtk+2.0-2.20.0/docs/ref
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/tools/Makefile.in gtk+2.0-2.20.0/docs/tools/Makefile.in
--- gtk+2.0-2.20.0.old/docs/tools/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/tools/Makefile.in 2010-03-23 16:10:21.172927840 +0100
Index: b/docs/tools/Makefile.in
===================================================================
--- a/docs/tools/Makefile.in 2010-04-10 14:52:02.713945234 +0200
+++ b/docs/tools/Makefile.in 2010-04-10 14:52:12.285943814 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -981,9 +995,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/tools/Makefile.in gtk+2.0-2.20.0/docs/tools/M
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/docs/tutorial/Makefile.in gtk+2.0-2.20.0/docs/tutorial/Makefile.in
--- gtk+2.0-2.20.0.old/docs/tutorial/Makefile.in 2010-03-23 04:32:57.000000000 +0100
+++ gtk+2.0-2.20.0/docs/tutorial/Makefile.in 2010-03-23 16:10:21.248928284 +0100
Index: b/docs/tutorial/Makefile.in
===================================================================
--- a/docs/tutorial/Makefile.in 2010-04-10 14:52:02.737943822 +0200
+++ b/docs/tutorial/Makefile.in 2010-04-10 14:52:12.285943814 +0200
@@ -46,7 +46,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1001,9 +1016,10 @@ diff -Naur gtk+2.0-2.20.0.old/docs/tutorial/Makefile.in gtk+2.0-2.20.0/docs/tuto
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gdk/directfb/Makefile.in gtk+2.0-2.20.0/gdk/directfb/Makefile.in
--- gtk+2.0-2.20.0.old/gdk/directfb/Makefile.in 2010-03-23 04:32:58.000000000 +0100
+++ gtk+2.0-2.20.0/gdk/directfb/Makefile.in 2010-03-23 16:10:21.884927771 +0100
Index: b/gdk/directfb/Makefile.in
===================================================================
--- a/gdk/directfb/Makefile.in 2010-04-10 14:52:03.429941187 +0200
+++ b/gdk/directfb/Makefile.in 2010-04-10 14:52:12.285943814 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1021,9 +1037,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk/directfb/Makefile.in gtk+2.0-2.20.0/gdk/direct
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gdk/Makefile.in gtk+2.0-2.20.0/gdk/Makefile.in
--- gtk+2.0-2.20.0.old/gdk/Makefile.in 2010-03-23 04:32:58.000000000 +0100
+++ gtk+2.0-2.20.0/gdk/Makefile.in 2010-03-23 16:10:21.784927902 +0100
Index: b/gdk/Makefile.in
===================================================================
--- a/gdk/Makefile.in 2010-04-10 14:52:03.349945806 +0200
+++ b/gdk/Makefile.in 2010-04-10 14:52:12.285943814 +0200
@@ -52,7 +52,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1041,9 +1058,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk/Makefile.in gtk+2.0-2.20.0/gdk/Makefile.in
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gdk/quartz/Makefile.in gtk+2.0-2.20.0/gdk/quartz/Makefile.in
--- gtk+2.0-2.20.0.old/gdk/quartz/Makefile.in 2010-03-23 04:32:58.000000000 +0100
+++ gtk+2.0-2.20.0/gdk/quartz/Makefile.in 2010-03-23 16:10:21.984927840 +0100
Index: b/gdk/quartz/Makefile.in
===================================================================
--- a/gdk/quartz/Makefile.in 2010-04-10 14:52:03.445942669 +0200
+++ b/gdk/quartz/Makefile.in 2010-04-10 14:52:12.289940412 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1061,9 +1079,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk/quartz/Makefile.in gtk+2.0-2.20.0/gdk/quartz/M
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gdk/tests/Makefile.in gtk+2.0-2.20.0/gdk/tests/Makefile.in
--- gtk+2.0-2.20.0.old/gdk/tests/Makefile.in 2010-03-23 04:32:58.000000000 +0100
+++ gtk+2.0-2.20.0/gdk/tests/Makefile.in 2010-03-23 16:10:22.064928013 +0100
Index: b/gdk/tests/Makefile.in
===================================================================
--- a/gdk/tests/Makefile.in 2010-04-10 14:52:03.405945393 +0200
+++ b/gdk/tests/Makefile.in 2010-04-10 14:52:12.289940412 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1081,9 +1100,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk/tests/Makefile.in gtk+2.0-2.20.0/gdk/tests/Mak
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gdk/win32/Makefile.in gtk+2.0-2.20.0/gdk/win32/Makefile.in
--- gtk+2.0-2.20.0.old/gdk/win32/Makefile.in 2010-03-23 04:32:59.000000000 +0100
+++ gtk+2.0-2.20.0/gdk/win32/Makefile.in 2010-03-23 16:10:22.168927890 +0100
Index: b/gdk/win32/Makefile.in
===================================================================
--- a/gdk/win32/Makefile.in 2010-04-10 14:52:03.365944212 +0200
+++ b/gdk/win32/Makefile.in 2010-04-10 14:52:12.289940412 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1101,9 +1121,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk/win32/Makefile.in gtk+2.0-2.20.0/gdk/win32/Mak
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gdk/win32/rc/Makefile.in gtk+2.0-2.20.0/gdk/win32/rc/Makefile.in
--- gtk+2.0-2.20.0.old/gdk/win32/rc/Makefile.in 2010-03-23 04:32:59.000000000 +0100
+++ gtk+2.0-2.20.0/gdk/win32/rc/Makefile.in 2010-03-23 16:10:22.244954176 +0100
Index: b/gdk/win32/rc/Makefile.in
===================================================================
--- a/gdk/win32/rc/Makefile.in 2010-04-10 14:52:03.381947646 +0200
+++ b/gdk/win32/rc/Makefile.in 2010-04-10 14:52:12.289940412 +0200
@@ -47,7 +47,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1121,9 +1142,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk/win32/rc/Makefile.in gtk+2.0-2.20.0/gdk/win32/
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gdk/x11/Makefile.in gtk+2.0-2.20.0/gdk/x11/Makefile.in
--- gtk+2.0-2.20.0.old/gdk/x11/Makefile.in 2010-03-23 04:32:59.000000000 +0100
+++ gtk+2.0-2.20.0/gdk/x11/Makefile.in 2010-03-23 16:10:22.357928458 +0100
Index: b/gdk/x11/Makefile.in
===================================================================
--- a/gdk/x11/Makefile.in 2010-04-10 14:52:03.465944660 +0200
+++ b/gdk/x11/Makefile.in 2010-04-10 14:52:12.289940412 +0200
@@ -53,7 +53,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1141,9 +1163,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk/x11/Makefile.in gtk+2.0-2.20.0/gdk/x11/Makefil
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gdk-pixbuf/Makefile.in gtk+2.0-2.20.0/gdk-pixbuf/Makefile.in
--- gtk+2.0-2.20.0.old/gdk-pixbuf/Makefile.in 2010-03-23 04:32:58.000000000 +0100
+++ gtk+2.0-2.20.0/gdk-pixbuf/Makefile.in 2010-03-23 16:10:21.524928241 +0100
Index: b/gdk-pixbuf/Makefile.in
===================================================================
--- a/gdk-pixbuf/Makefile.in 2010-04-10 14:52:03.489941574 +0200
+++ b/gdk-pixbuf/Makefile.in 2010-04-10 14:52:12.293945671 +0200
@@ -58,7 +58,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1178,9 +1201,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk-pixbuf/Makefile.in gtk+2.0-2.20.0/gdk-pixbuf/M
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
test_gdk_pixbuf_LDADD = $(LDADDS)
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
diff -Naur gtk+2.0-2.20.0.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.20.0/gdk-pixbuf/pixops/Makefile.in
--- gtk+2.0-2.20.0.old/gdk-pixbuf/pixops/Makefile.in 2010-03-23 04:32:58.000000000 +0100
+++ gtk+2.0-2.20.0/gdk-pixbuf/pixops/Makefile.in 2010-03-23 16:10:21.632928620 +0100
Index: b/gdk-pixbuf/pixops/Makefile.in
===================================================================
--- a/gdk-pixbuf/pixops/Makefile.in 2010-04-10 14:52:03.501945060 +0200
+++ b/gdk-pixbuf/pixops/Makefile.in 2010-04-10 14:52:12.293945671 +0200
@@ -49,7 +49,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1198,9 +1222,10 @@ diff -Naur gtk+2.0-2.20.0.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.20.0/gdk-p
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gtk/Makefile.in gtk+2.0-2.20.0/gtk/Makefile.in
--- gtk+2.0-2.20.0.old/gtk/Makefile.in 2010-03-23 04:32:59.000000000 +0100
+++ gtk+2.0-2.20.0/gtk/Makefile.in 2010-03-23 16:10:22.693928066 +0100
Index: b/gtk/Makefile.in
===================================================================
--- a/gtk/Makefile.in 2010-04-10 14:52:02.773946732 +0200
+++ b/gtk/Makefile.in 2010-04-10 14:52:12.293945671 +0200
@@ -84,7 +84,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1257,9 +1282,10 @@ diff -Naur gtk+2.0-2.20.0.old/gtk/Makefile.in gtk+2.0-2.20.0/gtk/Makefile.in
gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
gtkrbtree.h gtkrecentchooserdefault.h \
diff -Naur gtk+2.0-2.20.0.old/gtk/tests/Makefile.in gtk+2.0-2.20.0/gtk/tests/Makefile.in
--- gtk+2.0-2.20.0.old/gtk/tests/Makefile.in 2010-03-23 04:32:59.000000000 +0100
+++ gtk+2.0-2.20.0/gtk/tests/Makefile.in 2010-03-23 16:10:22.817927910 +0100
Index: b/gtk/tests/Makefile.in
===================================================================
--- a/gtk/tests/Makefile.in 2010-04-10 14:52:02.797946995 +0200
+++ b/gtk/tests/Makefile.in 2010-04-10 14:52:12.293945671 +0200
@@ -49,7 +49,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1277,9 +1303,10 @@ diff -Naur gtk+2.0-2.20.0.old/gtk/tests/Makefile.in gtk+2.0-2.20.0/gtk/tests/Mak
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/gtk/theme-bits/Makefile.in gtk+2.0-2.20.0/gtk/theme-bits/Makefile.in
--- gtk+2.0-2.20.0.old/gtk/theme-bits/Makefile.in 2010-03-23 04:32:59.000000000 +0100
+++ gtk+2.0-2.20.0/gtk/theme-bits/Makefile.in 2010-03-23 16:10:22.913927896 +0100
Index: b/gtk/theme-bits/Makefile.in
===================================================================
--- a/gtk/theme-bits/Makefile.in 2010-04-10 14:52:02.813946519 +0200
+++ b/gtk/theme-bits/Makefile.in 2010-04-10 14:52:12.297947018 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1297,9 +1324,10 @@ diff -Naur gtk+2.0-2.20.0.old/gtk/theme-bits/Makefile.in gtk+2.0-2.20.0/gtk/them
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/ltmain.sh gtk+2.0-2.20.0/ltmain.sh
--- gtk+2.0-2.20.0.old/ltmain.sh 2010-01-21 22:11:50.000000000 +0100
+++ gtk+2.0-2.20.0/ltmain.sh 2010-03-23 16:10:14.001945713 +0100
Index: b/ltmain.sh
===================================================================
--- a/ltmain.sh 2010-04-10 14:52:02.833946272 +0200
+++ b/ltmain.sh 2010-04-10 14:52:12.301944454 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@ -1378,9 +1406,10 @@ diff -Naur gtk+2.0-2.20.0.old/ltmain.sh gtk+2.0-2.20.0/ltmain.sh
esac
;;
no)
diff -Naur gtk+2.0-2.20.0.old/m4/libtool.m4 gtk+2.0-2.20.0/m4/libtool.m4
--- gtk+2.0-2.20.0.old/m4/libtool.m4 2010-01-21 22:11:50.000000000 +0100
+++ gtk+2.0-2.20.0/m4/libtool.m4 2010-03-23 16:10:14.108935558 +0100
Index: b/m4/libtool.m4
===================================================================
--- a/m4/libtool.m4 2010-04-10 14:52:03.337940088 +0200
+++ b/m4/libtool.m4 2010-04-10 14:52:12.305947199 +0200
@@ -2445,7 +2445,7 @@
;;
@ -1537,9 +1566,10 @@ diff -Naur gtk+2.0-2.20.0.old/m4/libtool.m4 gtk+2.0-2.20.0/m4/libtool.m4
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff -Naur gtk+2.0-2.20.0.old/m4macros/Makefile.in gtk+2.0-2.20.0/m4macros/Makefile.in
--- gtk+2.0-2.20.0.old/m4macros/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/m4macros/Makefile.in 2010-03-23 16:10:22.989927986 +0100
Index: b/m4macros/Makefile.in
===================================================================
--- a/m4macros/Makefile.in 2010-04-10 14:52:02.529940499 +0200
+++ b/m4macros/Makefile.in 2010-04-10 14:52:12.305947199 +0200
@@ -47,7 +47,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1557,9 +1587,10 @@ diff -Naur gtk+2.0-2.20.0.old/m4macros/Makefile.in gtk+2.0-2.20.0/m4macros/Makef
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/Makefile.in gtk+2.0-2.20.0/Makefile.in
--- gtk+2.0-2.20.0.old/Makefile.in 2010-03-23 04:33:02.000000000 +0100
+++ gtk+2.0-2.20.0/Makefile.in 2010-03-23 16:10:25.389927848 +0100
Index: b/Makefile.in
===================================================================
--- a/Makefile.in 2010-04-10 14:52:02.553940207 +0200
+++ b/Makefile.in 2010-04-10 14:52:12.305947199 +0200
@@ -47,7 +47,7 @@
$(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \
$(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \
@ -1608,9 +1639,10 @@ diff -Naur gtk+2.0-2.20.0.old/Makefile.in gtk+2.0-2.20.0/Makefile.in
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
diff -Naur gtk+2.0-2.20.0.old/mkinstalldirs gtk+2.0-2.20.0/mkinstalldirs
--- gtk+2.0-2.20.0.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
+++ gtk+2.0-2.20.0/mkinstalldirs 2010-03-23 16:10:25.336954632 +0100
Index: b/mkinstalldirs
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ b/mkinstalldirs 2010-04-10 14:52:12.305947199 +0200
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@ -1774,9 +1806,10 @@ diff -Naur gtk+2.0-2.20.0.old/mkinstalldirs gtk+2.0-2.20.0/mkinstalldirs
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Naur gtk+2.0-2.20.0.old/modules/engines/Makefile.in gtk+2.0-2.20.0/modules/engines/Makefile.in
--- gtk+2.0-2.20.0.old/modules/engines/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/modules/engines/Makefile.in 2010-03-23 16:10:23.149927918 +0100
Index: b/modules/engines/Makefile.in
===================================================================
--- a/modules/engines/Makefile.in 2010-04-10 14:52:03.201944836 +0200
+++ b/modules/engines/Makefile.in 2010-04-10 14:52:12.305947199 +0200
@@ -46,7 +46,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1794,9 +1827,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/engines/Makefile.in gtk+2.0-2.20.0/modules
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.20.0/modules/engines/ms-windows/Makefile.in
--- gtk+2.0-2.20.0.old/modules/engines/ms-windows/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Makefile.in 2010-03-23 16:10:23.249927713 +0100
Index: b/modules/engines/ms-windows/Makefile.in
===================================================================
--- a/modules/engines/ms-windows/Makefile.in 2010-04-10 14:52:03.281946366 +0200
+++ b/modules/engines/ms-windows/Makefile.in 2010-04-10 14:52:12.305947199 +0200
@@ -47,7 +47,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1814,9 +1848,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.2
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
--- gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-03-23 16:10:23.405928416 +0100
Index: b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
===================================================================
--- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-04-10 14:52:03.257943868 +0200
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-04-10 14:52:12.305947199 +0200
@@ -47,7 +47,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1834,9 +1869,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/Makefile.in
--- gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/Makefile.in 2010-03-23 16:10:23.325928020 +0100
Index: b/modules/engines/ms-windows/Theme/Makefile.in
===================================================================
--- a/modules/engines/ms-windows/Theme/Makefile.in 2010-04-10 14:52:03.233945839 +0200
+++ b/modules/engines/ms-windows/Theme/Makefile.in 2010-04-10 14:52:12.309942959 +0200
@@ -46,7 +46,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1854,9 +1890,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.20.0/modules/engines/pixbuf/Makefile.in
--- gtk+2.0-2.20.0.old/modules/engines/pixbuf/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/modules/engines/pixbuf/Makefile.in 2010-03-23 16:10:23.501927974 +0100
Index: b/modules/engines/pixbuf/Makefile.in
===================================================================
--- a/modules/engines/pixbuf/Makefile.in 2010-04-10 14:52:03.221943752 +0200
+++ b/modules/engines/pixbuf/Makefile.in 2010-04-10 14:52:12.309942959 +0200
@@ -47,7 +47,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1874,9 +1911,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.20.0/
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/input/Makefile.in gtk+2.0-2.20.0/modules/input/Makefile.in
--- gtk+2.0-2.20.0.old/modules/input/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/modules/input/Makefile.in 2010-03-23 16:10:23.689928326 +0100
Index: b/modules/input/Makefile.in
===================================================================
--- a/modules/input/Makefile.in 2010-04-10 14:52:03.297946169 +0200
+++ b/modules/input/Makefile.in 2010-04-10 14:52:12.309942959 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1924,9 +1962,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/input/Makefile.in gtk+2.0-2.20.0/modules/i
@CROSS_COMPILING_FALSE@all-local: gtk.immodules
diff -Naur gtk+2.0-2.20.0.old/modules/Makefile.in gtk+2.0-2.20.0/modules/Makefile.in
--- gtk+2.0-2.20.0.old/modules/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/modules/Makefile.in 2010-03-23 16:10:23.073929156 +0100
Index: b/modules/Makefile.in
===================================================================
--- a/modules/Makefile.in 2010-04-10 14:52:02.985945801 +0200
+++ b/modules/Makefile.in 2010-04-10 14:52:12.309942959 +0200
@@ -47,7 +47,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1944,9 +1983,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/Makefile.in gtk+2.0-2.20.0/modules/Makefil
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.20.0/modules/other/gail/libgail-util/Makefile.in
--- gtk+2.0-2.20.0.old/modules/other/gail/libgail-util/Makefile.in 2010-03-23 04:33:01.000000000 +0100
+++ gtk+2.0-2.20.0/modules/other/gail/libgail-util/Makefile.in 2010-03-23 16:10:24.177927917 +0100
Index: b/modules/other/gail/libgail-util/Makefile.in
===================================================================
--- a/modules/other/gail/libgail-util/Makefile.in 2010-04-10 14:52:03.073943331 +0200
+++ b/modules/other/gail/libgail-util/Makefile.in 2010-04-10 14:52:12.309942959 +0200
@@ -49,7 +49,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1964,9 +2004,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/libgail-util/Makefile.in gtk+2.
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/Makefile.in gtk+2.0-2.20.0/modules/other/gail/Makefile.in
--- gtk+2.0-2.20.0.old/modules/other/gail/Makefile.in 2010-03-23 04:33:01.000000000 +0100
+++ gtk+2.0-2.20.0/modules/other/gail/Makefile.in 2010-03-23 16:10:24.065928000 +0100
Index: b/modules/other/gail/Makefile.in
===================================================================
--- a/modules/other/gail/Makefile.in 2010-04-10 14:52:03.021942010 +0200
+++ b/modules/other/gail/Makefile.in 2010-04-10 14:52:12.313945424 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -1984,9 +2025,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/Makefile.in gtk+2.0-2.20.0/modu
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.20.0/modules/other/gail/tests/Makefile.in
--- gtk+2.0-2.20.0.old/modules/other/gail/tests/Makefile.in 2010-03-23 04:33:01.000000000 +0100
+++ gtk+2.0-2.20.0/modules/other/gail/tests/Makefile.in 2010-03-23 16:10:24.325927950 +0100
Index: b/modules/other/gail/tests/Makefile.in
===================================================================
--- a/modules/other/gail/tests/Makefile.in 2010-04-10 14:52:03.045942835 +0200
+++ b/modules/other/gail/tests/Makefile.in 2010-04-10 14:52:12.313945424 +0200
@@ -47,7 +47,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2004,9 +2046,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.20.
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/other/Makefile.in gtk+2.0-2.20.0/modules/other/Makefile.in
--- gtk+2.0-2.20.0.old/modules/other/Makefile.in 2010-03-23 04:33:00.000000000 +0100
+++ gtk+2.0-2.20.0/modules/other/Makefile.in 2010-03-23 16:10:23.769929417 +0100
Index: b/modules/other/Makefile.in
===================================================================
--- a/modules/other/Makefile.in 2010-04-10 14:52:02.993945145 +0200
+++ b/modules/other/Makefile.in 2010-04-10 14:52:12.313945424 +0200
@@ -46,7 +46,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2024,9 +2067,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/other/Makefile.in gtk+2.0-2.20.0/modules/o
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.20.0/modules/printbackends/cups/Makefile.in
--- gtk+2.0-2.20.0.old/modules/printbackends/cups/Makefile.in 2010-03-23 04:33:01.000000000 +0100
+++ gtk+2.0-2.20.0/modules/printbackends/cups/Makefile.in 2010-03-23 16:10:24.501928323 +0100
Index: b/modules/printbackends/cups/Makefile.in
===================================================================
--- a/modules/printbackends/cups/Makefile.in 2010-04-10 14:52:03.161944209 +0200
+++ b/modules/printbackends/cups/Makefile.in 2010-04-10 14:52:12.313945424 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2044,9 +2088,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.2
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/file/Makefile.in gtk+2.0-2.20.0/modules/printbackends/file/Makefile.in
--- gtk+2.0-2.20.0.old/modules/printbackends/file/Makefile.in 2010-03-23 04:33:01.000000000 +0100
+++ gtk+2.0-2.20.0/modules/printbackends/file/Makefile.in 2010-03-23 16:10:24.601927825 +0100
Index: b/modules/printbackends/file/Makefile.in
===================================================================
--- a/modules/printbackends/file/Makefile.in 2010-04-10 14:52:03.189944983 +0200
+++ b/modules/printbackends/file/Makefile.in 2010-04-10 14:52:12.313945424 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2064,9 +2109,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/file/Makefile.in gtk+2.0-2.2
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.20.0/modules/printbackends/lpr/Makefile.in
--- gtk+2.0-2.20.0.old/modules/printbackends/lpr/Makefile.in 2010-03-23 04:33:01.000000000 +0100
+++ gtk+2.0-2.20.0/modules/printbackends/lpr/Makefile.in 2010-03-23 16:10:24.701928035 +0100
Index: b/modules/printbackends/lpr/Makefile.in
===================================================================
--- a/modules/printbackends/lpr/Makefile.in 2010-04-10 14:52:03.125942136 +0200
+++ b/modules/printbackends/lpr/Makefile.in 2010-04-10 14:52:12.313945424 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2084,9 +2130,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.20
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/Makefile.in gtk+2.0-2.20.0/modules/printbackends/Makefile.in
--- gtk+2.0-2.20.0.old/modules/printbackends/Makefile.in 2010-03-23 04:33:01.000000000 +0100
+++ gtk+2.0-2.20.0/modules/printbackends/Makefile.in 2010-03-23 16:10:24.405927927 +0100
Index: b/modules/printbackends/Makefile.in
===================================================================
--- a/modules/printbackends/Makefile.in 2010-04-10 14:52:03.085946258 +0200
+++ b/modules/printbackends/Makefile.in 2010-04-10 14:52:12.313945424 +0200
@@ -49,7 +49,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2104,9 +2151,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/Makefile.in gtk+2.0-2.20.0/m
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.20.0/modules/printbackends/papi/Makefile.in
--- gtk+2.0-2.20.0.old/modules/printbackends/papi/Makefile.in 2010-03-23 04:33:02.000000000 +0100
+++ gtk+2.0-2.20.0/modules/printbackends/papi/Makefile.in 2010-03-23 16:10:24.797927670 +0100
Index: b/modules/printbackends/papi/Makefile.in
===================================================================
--- a/modules/printbackends/papi/Makefile.in 2010-04-10 14:52:03.105944895 +0200
+++ b/modules/printbackends/papi/Makefile.in 2010-04-10 14:52:12.317940346 +0200
@@ -46,7 +46,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2124,9 +2172,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.2
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/test/Makefile.in gtk+2.0-2.20.0/modules/printbackends/test/Makefile.in
--- gtk+2.0-2.20.0.old/modules/printbackends/test/Makefile.in 2010-03-23 04:33:02.000000000 +0100
+++ gtk+2.0-2.20.0/modules/printbackends/test/Makefile.in 2010-03-23 16:10:24.897927957 +0100
Index: b/modules/printbackends/test/Makefile.in
===================================================================
--- a/modules/printbackends/test/Makefile.in 2010-04-10 14:52:03.137945342 +0200
+++ b/modules/printbackends/test/Makefile.in 2010-04-10 14:52:12.317940346 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2144,9 +2193,10 @@ diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/test/Makefile.in gtk+2.0-2.2
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/perf/Makefile.in gtk+2.0-2.20.0/perf/Makefile.in
--- gtk+2.0-2.20.0.old/perf/Makefile.in 2010-03-23 04:33:02.000000000 +0100
+++ gtk+2.0-2.20.0/perf/Makefile.in 2010-03-23 16:10:24.993927866 +0100
Index: b/perf/Makefile.in
===================================================================
--- a/perf/Makefile.in 2010-04-10 14:52:02.845943610 +0200
+++ b/perf/Makefile.in 2010-04-10 14:52:12.317940346 +0200
@@ -48,7 +48,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -2164,9 +2214,10 @@ diff -Naur gtk+2.0-2.20.0.old/perf/Makefile.in gtk+2.0-2.20.0/perf/Makefile.in
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
diff -Naur gtk+2.0-2.20.0.old/po/Makefile.in.in gtk+2.0-2.20.0/po/Makefile.in.in
--- gtk+2.0-2.20.0.old/po/Makefile.in.in 2009-12-19 03:54:51.000000000 +0100
+++ gtk+2.0-2.20.0/po/Makefile.in.in 2010-03-23 16:10:14.465929058 +0100
Index: b/po/Makefile.in.in
===================================================================
--- a/po/Makefile.in.in 2010-04-10 14:52:02.961945814 +0200
+++ b/po/Makefile.in.in 2010-04-10 14:52:12.317940346 +0200
@@ -25,22 +25,23 @@
prefix = @prefix@
@ -2278,9 +2329,10 @@ diff -Naur gtk+2.0-2.20.0.old/po/Makefile.in.in gtk+2.0-2.20.0/po/Makefile.in.in
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
diff -Naur gtk+2.0-2.20.0.old/tests/Makefile.in gtk+2.0-2.20.0/tests/Makefile.in
--- gtk+2.0-2.20.0.old/tests/Makefile.in 2010-03-23 04:33:02.000000000 +0100
+++ gtk+2.0-2.20.0/tests/Makefile.in 2010-03-23 16:10:25.245928182 +0100
Index: b/tests/Makefile.in
===================================================================
--- a/tests/Makefile.in 2010-04-10 14:52:02.905944545 +0200
+++ b/tests/Makefile.in 2010-04-10 14:52:12.317940346 +0200
@@ -82,7 +82,7 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \