gtk+: various fixes

* drop 2.10.0 and 2.10.1 * ship gtk-update-icon-cache (from Poky) * fix -dev packages (from Poky) * fix -dbg packages (from Poky)
author: Koen Kooi <koen@openembedded.org> 2006-10-22 13:13:55 +0000
committer: Koen Kooi <koen@openembedded.org> 2006-10-22 13:13:55 +0000
commit: 9e145f35844fafa4ac278050d0ceedb4a064fcc9 (patch)
tree: 2d45eeedff7398ce6a62862a1bdc2c08df6bb518 /packages/gtk+
parent: 1aa0895dbfcc33e9d5b8c6c3f5d866545a81aaf4 (diff)
38 files changed, 52 insertions, 3554 deletions
diff --git a/packages/gtk+/gtk+-2.10.0/automake-lossage.patch b/packages/gtk+/gtk+-2.10.0/automake-lossage.patch
deleted file mode 100644
index 0d423ddbb9..0000000000
--- a/packages/gtk+/gtk+-2.10.0/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk+-2.4.1/docs/tutorial/Makefile.am~	2003-05-06 22:54:20.000000000 +0100
-+++ gtk+-2.4.1/docs/tutorial/Makefile.am	2004-05-08 12:31:41.000000000 +0100
-@@ -52,21 +52,5 @@
- 
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
--else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--dist-hook:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "*** DISTRIBUTION IS INCOMPLETE"
--	echo "***"
- endif
- 
diff --git a/packages/gtk+/gtk+-2.10.0/disable-print.patch b/packages/gtk+/gtk+-2.10.0/disable-print.patch
deleted file mode 100644
index 1067773f12..0000000000
--- a/packages/gtk+/gtk+-2.10.0/disable-print.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtk+-2.10.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
-+++ gtk+-2.10.0/configure.in	2006-07-05 18:11:44.000000000 +0200
-@@ -1539,26 +1539,27 @@
- # Printing system checks
- ################################################################
- 
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
--if test "x$CUPS_CONFIG" != "xno"; then
--  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
--  CUPS_LIBS=`cups-config --libs`
--
--  CUPS_API_VERSION=`cups-config --api-version`
--  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
--  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
--
--  if test $CUPS_API_MAJOR -gt 1 -o \
--          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
--    AC_DEFINE(HAVE_CUPS_API_1_2)
--  fi
--
--  AC_SUBST(CUPS_API_MAJOR)
--  AC_SUBST(CUPS_API_MINOR)
--  AC_SUBST(CUPS_CFLAGS)
--  AC_SUBST(CUPS_LIBS)
--fi
--AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-+#if test "x$CUPS_CONFIG" != "xno"; then
-+#  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-+#  CUPS_LIBS=`cups-config --libs`
-+#
-+#  CUPS_API_VERSION=`cups-config --api-version`
-+#  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-+#  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
-+#
-+#  if test $CUPS_API_MAJOR -gt 1 -o \
-+#          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-+#   AC_DEFINE(HAVE_CUPS_API_1_2)
-+# fi
-+#
-+#  AC_SUBST(CUPS_API_MAJOR)
-+#  AC_SUBST(CUPS_API_MINOR)
-+#  AC_SUBST(CUPS_CFLAGS)
-+#  AC_SUBST(CUPS_LIBS)
-+#fi
-+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+AM_CONDITIONAL(HAVE_CUPS,false)
- 
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
diff --git a/packages/gtk+/gtk+-2.10.0/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.0/disable-tooltips.patch
deleted file mode 100644
index d71d839c3c..0000000000
--- a/packages/gtk+/gtk+-2.10.0/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.4.3/gtk/gtktooltips.c.old	2004-07-04 18:52:04.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtktooltips.c	2004-07-04 18:52:08.000000000 +0100
-@@ -118,7 +118,7 @@
-   tooltips->tips_data_list = NULL;
-   
-   tooltips->delay = DEFAULT_DELAY;
--  tooltips->enabled = TRUE;
-+  tooltips->enabled = FALSE;
-   tooltips->timer_tag = 0;
-   tooltips->use_sticky_delay = FALSE;
-   tooltips->last_popdown.tv_sec = -1;
diff --git a/packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch
deleted file mode 100644
index 20481f059b..0000000000
--- a/packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- gtk+-2.4.1/gtk/gtkarrow.c	2004-03-13 09:51:13.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkarrow.c	2004-05-26 14:52:17.000000000 +1000
-@@ -29,7 +29,7 @@
- #include "gtkarrow.h"
- #include "gtkintl.h"
- 
--#define MIN_ARROW_SIZE  15
-+#define MIN_ARROW_SIZE  7
- 
- enum {
-   PROP_0,
-@@ -53,6 +53,8 @@
- 				    guint            prop_id,
- 				    GValue          *value,
- 				    GParamSpec      *pspec);
-+static void gtk_arrow_size_request (GtkWidget *arrow, 
-+				    GtkRequisition *requisition);
- 
- GType
- gtk_arrow_get_type (void)
-@@ -111,6 +113,7 @@
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-   widget_class->expose_event = gtk_arrow_expose;
-+  widget_class->size_request = gtk_arrow_size_request;
- }
- 
- static void
-@@ -166,13 +169,18 @@
- }
- 
- static void
-+gtk_arrow_size_request (GtkWidget *arrow, 
-+			GtkRequisition *requisition)
-+{
-+  requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
-+  requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
-+}
-+
-+static void
- gtk_arrow_init (GtkArrow *arrow)
- {
-   GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
- 
--  GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
--  GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
--
-   arrow->arrow_type = GTK_ARROW_RIGHT;
-   arrow->shadow_type = GTK_SHADOW_OUT;
- }
---- gtk+-2.4.1/gtk/gtkcalendar.c	2004-03-06 14:37:26.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkcalendar.c	2004-05-26 14:58:57.000000000 +1000
-@@ -340,6 +340,9 @@
- static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
- 					       guint        day);
- 
-+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
-+					guint	      day);
-+
- static void gtk_calendar_paint_arrow	(GtkWidget    *widget,
- 					 guint	       arrow);
- static void gtk_calendar_paint_day_num	(GtkWidget    *widget,
-@@ -861,13 +864,13 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
-     {
-       if (calendar->selected_day < 0)
- 	calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
--      gtk_calendar_select_day (calendar, calendar->selected_day);
-+      gtk_calendar_do_select_day (calendar, calendar->selected_day);
-     }
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-@@ -908,10 +911,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -939,10 +942,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -974,10 +977,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -2480,9 +2483,9 @@
-   return TRUE;
- }
- 
--void
--gtk_calendar_select_day (GtkCalendar *calendar,
--			 guint	      day)
-+static void
-+gtk_calendar_do_select_day (GtkCalendar *calendar,
-+			    guint	      day)
- {
-   g_return_if_fail (GTK_IS_CALENDAR (calendar));
-   g_return_if_fail (day <= 31);
-@@ -2499,6 +2502,13 @@
-       if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
- 	gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
-     }
-+}
-+
-+void
-+gtk_calendar_select_day (GtkCalendar *calendar,
-+			 guint	      day)
-+{
-+  gtk_calendar_do_select_day (calendar, day);
-   
-   calendar->selected_day = day;
-   
---- gtk+-2.4.1/gtk/gtkentry.c	2004-04-22 08:08:08.000000000 +1000
-+++ gtk+-2.4.1/gtk/gtkentry.c	2004-05-26 14:52:17.000000000 +1000
-@@ -557,6 +557,15 @@
- 						       0.0,
- 						       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("min_width",
-+                                                             _("Minimum width"),
-+                                                             _("Minimum width of the entry field"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             MIN_ENTRY_WIDTH,
-+                                                             G_PARAM_READABLE));
-+
-   signals[POPULATE_POPUP] =
-     g_signal_new ("populate_popup",
- 		  G_OBJECT_CLASS_TYPE (gobject_class),
-@@ -1124,7 +1133,7 @@
- {
-   GtkEntry *entry = GTK_ENTRY (widget);
-   PangoFontMetrics *metrics;
--  gint xborder, yborder;
-+  gint xborder, yborder, min_width;
-   PangoContext *context;
-   
-   gtk_widget_ensure_style (widget);
-@@ -1140,9 +1149,11 @@
-   
-   xborder += INNER_BORDER;
-   yborder += INNER_BORDER;
--  
-+
-+  gtk_widget_style_get (widget, "min_width", &min_width, NULL);
-+
-   if (entry->width_chars < 0)
--    requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
-+    requisition->width = min_width + xborder * 2;
-   else
-     {
-       gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
---- gtk+-2.4.1/gtk/gtkrange.c	2004-03-06 14:38:08.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkrange.c	2004-05-26 14:52:17.000000000 +1000
-@@ -180,6 +180,7 @@
- static GtkWidgetClass *parent_class = NULL;
- static guint signals[LAST_SIGNAL];
- 
-+static GdkAtom recognize_protocols_atom, atom_atom;
- 
- GType
- gtk_range_get_type (void)
-@@ -220,6 +221,9 @@
-   object_class = (GtkObjectClass*) class;
-   widget_class = (GtkWidgetClass*) class;
- 
-+  recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
-+  atom_atom = gdk_atom_intern ("ATOM", FALSE);
-+
-   parent_class = g_type_class_peek_parent (class);
- 
-   gobject_class->set_property = gtk_range_set_property;
-@@ -815,6 +819,12 @@
- 					&attributes, attributes_mask);
-   gdk_window_set_user_data (range->event_window, range);
- 
-+  gdk_property_change (range->event_window,
-+		       recognize_protocols_atom,
-+		       atom_atom,
-+		       32, GDK_PROP_MODE_REPLACE,
-+		       NULL, 0);
-+
-   widget->style = gtk_style_attach (widget->style, widget->window);
- }
- 
-@@ -1186,7 +1196,7 @@
- 
-   /* ignore presses when we're already doing something else. */
-   if (range->layout->grab_location != MOUSE_OUTSIDE)
--    return FALSE;
-+    return TRUE;
- 
-   range->layout->mouse_x = event->x;
-   range->layout->mouse_y = event->y;
-@@ -1364,7 +1374,7 @@
-       return TRUE;
-     }
- 
--  return FALSE;
-+  return TRUE;
- }
- 
- /**
diff --git a/packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch
deleted file mode 100644
index df29656343..0000000000
--- a/packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~	2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c	2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 
diff --git a/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch
deleted file mode 100644
index bdbdb32f97..0000000000
--- a/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gtk+-2.10.0/configure.in.orig	2006-07-07 09:31:34.000000000 +0100
-+++ gtk+-2.10.0/configure.in	2006-07-07 09:32:49.000000000 +0100
-@@ -370,7 +370,7 @@
- AC_MSG_CHECKING([Whether to write dependencies into .pc files])
- case $enable_explicit_deps in
-   auto)
--    deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh`
-+    deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh`
-     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -768,7 +768,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1600,7 +1600,7 @@
- #
- # We are using gmodule-no-export now, but I'm leaving the stripping
- # code in place for now, since pango and atk still require gmodule.
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- if test -n "$export_dynamic"; then
-   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
-   GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/packages/gtk+/gtk+-2.10.0/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.0/menu-deactivate.patch
deleted file mode 100644
index cfb8849e9f..0000000000
--- a/packages/gtk+/gtk+-2.10.0/menu-deactivate.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- gtk+-2.10.0/gtk/gtkmenushell.c.orig	2006-07-05 17:17:34.000000000 +0200
-+++ gtk+-2.10.0/gtk/gtkmenushell.c	2006-07-05 17:19:01.000000000 +0200
-@@ -42,7 +42,7 @@
- #include "gtkintl.h"
- #include "gtkalias.h"
- 
--#define MENU_SHELL_TIMEOUT   500
-+#define MENU_SHELL_TIMEOUT   2000
- 
- #define PACK_DIRECTION(m)                                 \
-    (GTK_IS_MENU_BAR (m)                                   \
-@@ -203,6 +203,8 @@
- 
- G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER)
- 
-+static int last_crossing_time;
-+
- static void
- gtk_menu_shell_class_init (GtkMenuShellClass *klass)
- {
-@@ -517,6 +519,7 @@
-       gtk_grab_add (GTK_WIDGET (menu_shell));
-       menu_shell->have_grab = TRUE;
-       menu_shell->active = TRUE;
-+      last_crossing_time = 0;
-     }
- }
- 
-@@ -669,6 +672,13 @@
- 	  menu_shell->activate_time = 0;
- 	  deactivate = FALSE;
- 	}
-+
-+      if (last_crossing_time != 0
-+	  && ((event->time - last_crossing_time) < 500))
-+	{
-+	  last_crossing_time = 0;
-+	  deactivate = FALSE;
-+	}
-       
-       if (deactivate)
- 	{
-@@ -716,6 +726,8 @@
-     {
-       menu_item = gtk_get_event_widget ((GdkEvent*) event);
- 
-+      last_crossing_time = event->time;
-+
-       if (!menu_item ||
- 	  (GTK_IS_MENU_ITEM (menu_item) && 
- 	   !_gtk_menu_item_is_selectable (menu_item)))
diff --git a/packages/gtk+/gtk+-2.10.0/migration.patch b/packages/gtk+/gtk+-2.10.0/migration.patch
deleted file mode 100644
index 4850f85e4f..0000000000
--- a/packages/gtk+/gtk+-2.10.0/migration.patch
+++ /dev/null
@@ -1,615 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gtk+/configure.in,v
-retrieving revision 1.419.2.4
-diff -u -r1.419.2.4 configure.in
---- configure.in	8 Feb 2005 21:39:42 -0000	1.419.2.4
-+++ configure.in	27 Feb 2005 13:10:16 -0000
-@@ -1495,6 +1495,16 @@
- GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
- GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
- 
-+AC_ARG_ENABLE(display-migration,
-+	[AC_HELP_STRING([--enable-display-migration],
-+			[include support for GPE_CHANGE_DISPLAY protocol])],
-+	enable_migration=yes, enable_migration=no)
-+if test "$enable_migration" = "yes"; then
-+	AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled])
-+	GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt"
-+fi
-+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes")
-+
- AC_SUBST(GTK_PACKAGES)
- AC_SUBST(GTK_EXTRA_LIBS)
- AC_SUBST(GTK_EXTRA_CFLAGS)
-Index: gtk/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
-retrieving revision 1.266.2.1
-diff -u -r1.266.2.1 Makefile.am
---- gtk/Makefile.am	13 Jan 2005 15:18:21 -0000	1.266.2.1
-+++ gtk/Makefile.am	27 Feb 2005 13:10:17 -0000
-@@ -520,6 +520,10 @@
- 	gtkwindow.c		\
- 	xembed.h
- 
-+if ENABLE_MIGRATION
-+gtk_c_sources += gtkmigration.c
-+endif
-+
- if OS_UNIX
- gtk_private_h_sources += gtkfilesystemunix.h
- gtk_c_sources +=         gtkfilesystemunix.c
-Index: gtk/gtkmain.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v
-retrieving revision 1.255
-diff -u -r1.255 gtkmain.c
---- gtk/gtkmain.c	27 Dec 2004 05:25:15 -0000	1.255
-+++ gtk/gtkmain.c	27 Feb 2005 13:10:19 -0000
-@@ -491,6 +491,10 @@
-   _gtk_accel_map_init ();  
-   _gtk_rc_init ();
- 
-+#ifdef ENABLE_MIGRATION
-+  gtk_migration_init ();
-+#endif
-+
-   /* Set the 'initialized' flag.
-    */
-   gtk_initialized = TRUE;
---- /dev/null	2005-02-20 01:07:50.714416160 +0000
-+++ gtk/gtkmigration.c	2005-02-27 15:05:04.052757352 +0000
-@@ -0,0 +1,529 @@
-+/*
-+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#include <stdlib.h>
-+#include <ctype.h>
-+#include <libintl.h>
-+#include <string.h>
-+#include <assert.h>
-+
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+
-+#include <gcrypt.h>
-+
-+#include "gtk.h"
-+#include "gdk.h"
-+#include "x11/gdkx.h"
-+
-+#define _(x) gettext(x)
-+
-+static GdkAtom string_gdkatom, display_change_gdkatom;
-+static GdkAtom rsa_challenge_gdkatom;
-+
-+#define DISPLAY_CHANGE_SUCCESS			0
-+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT	1
-+#define DISPLAY_CHANGE_NO_SUCH_SCREEN		2
-+#define DISPLAY_CHANGE_AUTHENTICATION_BAD	3
-+#define DISPLAY_CHANGE_INDETERMINATE_ERROR	4
-+
-+static gboolean no_auth;
-+
-+static GSList *all_widgets;
-+
-+static gboolean gtk_migration_initialised;
-+
-+#define CHALLENGE_LEN 64
-+
-+gchar *gtk_migration_auth_challenge_string;
-+
-+static unsigned char challenge_bytes[CHALLENGE_LEN];
-+static unsigned long challenge_seq;
-+
-+#define hexbyte(x)  ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0')
-+
-+struct rsa_key
-+{
-+  gcry_mpi_t n, e, d, p, q, u;
-+};
-+
-+static gcry_mpi_t
-+mpi_from_sexp (gcry_sexp_t r, char *tag)
-+{
-+  gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0);
-+  return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG);
-+}
-+
-+static char *
-+hex_from_mpi (gcry_mpi_t m)
-+{
-+  char *buf;
-+  gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m);
-+  return buf;
-+}
-+
-+static void
-+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result)
-+{
-+  size_t dlen = strlen (display);
-+  gchar *buf = g_malloc (dlen + 1 + len);
-+  strcpy (buf, display);
-+  memcpy (buf + dlen + 1, challenge, len);
-+  gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1);
-+  g_free (buf);
-+}
-+
-+static int
-+do_encode_md (const unsigned char *digest, size_t digestlen, int algo,
-+              unsigned int nbits, gcry_mpi_t *r_val)
-+{
-+  int nframe = (nbits+7) / 8;
-+  unsigned char *frame;
-+  int i, n;
-+  unsigned char asn[100];
-+  size_t asnlen;
-+
-+  asnlen = sizeof(asn);
-+  if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen))
-+    return -1;
-+
-+  if (digestlen + asnlen + 4  > nframe )
-+    return -1;
-+  
-+  /* We encode the MD in this way:
-+   *
-+   *	   0  1 PAD(n bytes)   0  ASN(asnlen bytes)  MD(len bytes)
-+   *
-+   * PAD consists of FF bytes.
-+   */
-+  frame = g_malloc (nframe);
-+  n = 0;
-+  frame[n++] = 0;
-+  frame[n++] = 1; /* block type */
-+  i = nframe - digestlen - asnlen -3 ;
-+  assert ( i > 1 );
-+  memset ( frame+n, 0xff, i ); n += i;
-+  frame[n++] = 0;
-+  memcpy ( frame+n, asn, asnlen ); n += asnlen;
-+  memcpy ( frame+n, digest, digestlen ); n += digestlen;
-+  assert ( n == nframe );
-+      
-+  gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe);
-+  g_free (frame);
-+  return 0;
-+}
-+
-+static gboolean
-+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf)
-+{
-+  gcry_mpi_t mpi, mpi2;
-+  gcry_sexp_t data, sig, key;
-+  int rc;
-+
-+  do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi);
-+
-+  gcry_sexp_build (&data, NULL, "(data (value %m))", mpi);
-+  
-+  gcry_mpi_release (mpi);
-+
-+  gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e);
-+
-+  if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL))
-+    {
-+      gcry_sexp_release (data);
-+      return FALSE;
-+    }
-+
-+  gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2);
-+
-+  rc = gcry_pk_verify (sig, data, key);
-+
-+  gcry_sexp_release (data);
-+  gcry_sexp_release (key);
-+  gcry_sexp_release (sig);
-+  gcry_mpi_release (mpi2);
-+
-+  if (rc)
-+    return FALSE;
-+
-+  return TRUE;
-+}
-+
-+static void 
-+gtk_migration_auth_update_challenge (void)
-+{
-+  int i;
-+  unsigned char *p;
-+
-+  if (gtk_migration_auth_challenge_string == NULL)
-+    gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9);
-+
-+  p = gtk_migration_auth_challenge_string;
-+
-+  for (i = 0; i < CHALLENGE_LEN; i++)
-+    {
-+      *p++ = hexbyte (challenge_bytes[i] >> 4);
-+      *p++ = hexbyte (challenge_bytes[i] & 15);
-+    }
-+  
-+  sprintf (p, "%08lx", challenge_seq++);
-+}
-+
-+static void
-+gtk_migration_auth_generate_challenge (void)
-+{
-+  gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM);
-+  gtk_migration_auth_update_challenge ();
-+}
-+
-+static struct rsa_key *
-+parse_pubkey (char *s)
-+{
-+  struct rsa_key *r;
-+  gcry_mpi_t n, e;
-+  gchar *sp;
-+
-+  sp = strtok (s, " \n");
-+  gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL);
-+  sp = strtok (NULL, " \n");
-+  gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL);
-+
-+  r = g_malloc0 (sizeof (struct rsa_key));
-+  r->e = e;
-+  r->n = n;
-+  return r;
-+}
-+
-+static struct rsa_key *
-+lookup_pubkey (u_int32_t id)
-+{
-+  const gchar *home_dir = g_get_home_dir ();
-+  gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir);
-+  FILE *fp = fopen (filename, "r");
-+  struct rsa_key *r = NULL;
-+
-+  if (fp)
-+    {
-+      while (!feof (fp))
-+	{
-+	  char buffer[4096];
-+	  if (fgets (buffer, 4096, fp))
-+	    {
-+	      char *p;
-+	      u_int32_t this_id = strtoul (buffer, &p, 16);
-+	      if (p != buffer && *p == ' ')
-+		{
-+#ifdef DEBUG
-+		  fprintf (stderr, "found id %x\n", this_id);
-+#endif
-+		  if (this_id == id)
-+		    {
-+		      r = parse_pubkey (++p);
-+		      break;
-+		    }
-+		}
-+	    }
-+	}
-+      fclose (fp);
-+    }
-+
-+  g_free (filename);
-+  return r;
-+}
-+
-+static void
-+free_pubkey (struct rsa_key *k)
-+{
-+  gcry_mpi_release (k->n);
-+  gcry_mpi_release (k->e);
-+
-+  g_free (k);
-+}
-+
-+static gboolean
-+gtk_migration_auth_validate_request (char *display, char *data)
-+{
-+  u_int32_t key_id;
-+  char *ep;
-+  char *p;
-+  struct rsa_key *k;
-+  char hash[20];
-+  gboolean rc;
-+
-+  p = strchr (data, ' ');
-+  if (p == NULL)
-+    return FALSE;
-+  *p++ = 0;
-+
-+  key_id = strtoul (data, &ep, 16);
-+  if (*ep)
-+    return FALSE;
-+
-+  k = lookup_pubkey (key_id);
-+  if (k == NULL)
-+    return FALSE;
-+
-+  gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, 
-+			   strlen (gtk_migration_auth_challenge_string), hash);
-+
-+  rc = gtk_migration_crypt_check_signature (k, hash, p);
-+
-+  free_pubkey (k);
-+
-+  return rc;
-+}
-+
-+static int
-+do_change_display (GtkWidget *w, char *display_name)
-+{
-+  GdkDisplay *newdisplay;
-+  guint screen_nr = 1;
-+  guint i;
-+
-+  if (display_name[0] == 0)
-+    return DISPLAY_CHANGE_INDETERMINATE_ERROR;
-+
-+  i = strlen (display_name) - 1;
-+  while (i > 0 && isdigit (display_name[i]))
-+    i--;
-+
-+  if (display_name[i] == '.')
-+    {
-+      screen_nr = atoi (display_name + i + 1);
-+      display_name[i] = 0;
-+    }
-+
-+  newdisplay = gdk_display_open (display_name);
-+  if (newdisplay)
-+    {
-+      GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr);
-+      if (screen)
-+	{
-+	  gtk_window_set_screen (GTK_WINDOW (w), screen);
-+	  gdk_display_manager_set_default_display (gdk_display_manager_get (),
-+						   newdisplay);
-+	  return DISPLAY_CHANGE_SUCCESS;
-+	}
-+      else
-+	return DISPLAY_CHANGE_NO_SUCH_SCREEN;
-+    }
-+
-+  return DISPLAY_CHANGE_UNABLE_TO_CONNECT;
-+}
-+
-+static void
-+set_challenge_on_window (GdkWindow *window)
-+{
-+  gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom,
-+		       8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, 
-+		       strlen (gtk_migration_auth_challenge_string));
-+}
-+
-+static void
-+update_challenge_on_windows (void)
-+{
-+  GSList *i;
-+
-+  gtk_migration_auth_update_challenge ();
-+
-+  for (i = all_widgets; i; i = i->next)
-+    {
-+      GtkWidget *w = GTK_WIDGET (i->data);
-+      if (w->window)
-+	set_challenge_on_window (w->window);
-+    }
-+}
-+
-+static void
-+reset_state (GdkWindow *window)
-+{
-+  gdk_property_change (window, display_change_gdkatom, string_gdkatom,
-+		       8, GDK_PROP_MODE_REPLACE, NULL, 0);
-+}
-+
-+static void
-+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code)
-+{
-+  XClientMessageEvent ev;
-+  Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, 
-+						 display_change_gdkatom);
-+  
-+  memset (&ev, 0, sizeof (ev));
-+  
-+  ev.type = ClientMessage;
-+  ev.window = window;
-+  ev.message_type = atom;
-+  ev.format = 32;
-+  
-+  ev.data.l[0] = window;
-+  ev.data.l[1] = code;
-+  
-+  XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev);
-+}
-+
-+static int
-+handle_request (GdkWindow *gwindow, char *prop)
-+{
-+  GtkWidget *widget;
-+  char *target, *auth_method, *auth_data;
-+  char *p;
-+
-+  target = prop;
-+  auth_method = "NULL";
-+  auth_data = NULL;
-+
-+  p = strchr (prop, ' ');
-+  if (p)
-+    {
-+      *p = 0;
-+      auth_method = ++p;
-+      
-+      p = strchr (p, ' ');
-+      if (p)
-+	{
-+	  *p = 0;
-+	  auth_data = ++p;
-+	}
-+    }
-+
-+  if (no_auth == FALSE)
-+    {
-+      if (!strcasecmp (auth_method, "null"))
-+	return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+      else if (!strcasecmp (auth_method, "rsa-sig"))
-+	{
-+	  if (gtk_migration_auth_validate_request (target, auth_data) == FALSE)
-+	    return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+	}
-+      else
-+	return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+    }
-+
-+  gdk_window_get_user_data (gwindow, (gpointer*) &widget);
-+
-+  if (widget)
-+    return do_change_display (widget, target);
-+
-+  return DISPLAY_CHANGE_INDETERMINATE_ERROR;
-+}
-+
-+static GdkFilterReturn 
-+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p)
-+{
-+  XPropertyEvent *xev = (XPropertyEvent *)xevp;
-+
-+  if (xev->type == PropertyNotify)
-+    {
-+      GdkDisplay *gdisplay;
-+      Atom atom;
-+
-+      gdisplay = gdk_x11_lookup_xdisplay (xev->display);
-+      if (gdisplay)
-+	{
-+	  atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom);
-+
-+	  if (xev->atom == atom)
-+	    {
-+	      GdkWindow *gwindow;
-+	      
-+	      gwindow = gdk_window_lookup_for_display (gdisplay, xev->window);
-+	      
-+	      if (gwindow)
-+		{
-+		  GdkAtom actual_type;
-+		  gint actual_format;
-+		  gint actual_length;
-+		  unsigned char *prop = NULL;
-+		  
-+		  if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom,
-+					0, G_MAXLONG, FALSE, &actual_type, &actual_format,
-+					&actual_length, &prop))
-+		    {
-+		      if (actual_length != 0)
-+			{
-+			  if (actual_type == string_gdkatom && actual_length > 8)
-+			    {
-+			      gchar *buf = g_malloc (actual_length + 1);
-+			      int rc;
-+			      
-+			      memcpy (buf, prop, actual_length);
-+			      buf[actual_length] = 0;
-+			      
-+			      rc = handle_request (gwindow, buf);
-+			      
-+			      g_free (buf);
-+			      generate_response (gdisplay, xev->display, xev->window, rc);
-+			      
-+			      if (rc == DISPLAY_CHANGE_SUCCESS)
-+				update_challenge_on_windows ();
-+			    }
-+			  
-+			  reset_state (gwindow);
-+			}
-+		    }
-+		  
-+		  if (prop)
-+		    g_free (prop);
-+		}
-+	    }
-+	  
-+	  return GDK_FILTER_REMOVE;
-+	}
-+    }
-+
-+  return GDK_FILTER_CONTINUE;
-+}
-+
-+static void
-+unrealize_window (GtkWidget *w)
-+{
-+  all_widgets = g_slist_remove (all_widgets, w);
-+}
-+
-+void
-+gtk_migration_mark_window (GtkWidget *w)
-+{
-+  if (! gtk_migration_initialised)
-+    {
-+      g_warning ("gtk_migration not initialised yet");
-+      return;
-+    }
-+
-+  if (GTK_WIDGET_REALIZED (w))
-+    {
-+      GdkWindow *window = w->window;
-+      
-+      gdk_window_add_filter (window, filter_func, NULL);
-+
-+      reset_state (window);
-+      set_challenge_on_window (window);
-+
-+      all_widgets = g_slist_append (all_widgets, w);
-+
-+      g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL);
-+    }
-+  else
-+    g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL);
-+}
-+
-+void
-+gtk_migration_init (void)
-+{
-+  if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL)
-+    no_auth = TRUE;
-+
-+  string_gdkatom = gdk_atom_intern ("STRING", FALSE);
-+  display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE);
-+  rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE);
-+
-+  gtk_migration_auth_generate_challenge ();
-+
-+  gtk_migration_initialised = TRUE;
-+}
---- gtk/gtkwindow.c~	2006-07-05 13:07:08.000000000 +0200
-+++ gtk/gtkwindow.c	2006-07-05 13:07:08.000000000 +0200
-@@ -50,6 +50,9 @@
- #include "x11/gdkx.h"
- #endif
- 
-+extern void gtk_migration_mark_window (GtkWidget *w);
-+                                                               
-+
- enum {
-   SET_FOCUS,
-   FRAME_EVENT,
-@@ -823,6 +826,10 @@
- 
-   g_signal_connect (window->screen, "composited_changed",
- 		    G_CALLBACK (gtk_window_on_composited_changed), window);
-+		    
-+#ifdef ENABLE_MIGRATION
-+  gtk_migration_mark_window (window);
-+#endif
- }
- 
- static void
diff --git a/packages/gtk+/gtk+-2.10.0/no-demos.patch b/packages/gtk+/gtk+-2.10.0/no-demos.patch
deleted file mode 100644
index 2f10a30dda..0000000000
--- a/packages/gtk+/gtk+-2.10.0/no-demos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.1/Makefile.am~	2004-01-17 22:15:56.000000000 +0000
-+++ gtk+-2.4.1/Makefile.am	2004-05-08 12:25:32.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Makefile.am for GTK+
- 
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
- 
- # require automake 1.4
diff --git a/packages/gtk+/gtk+-2.10.0/no-xwc.patch b/packages/gtk+/gtk+-2.10.0/no-xwc.patch
deleted file mode 100644
index affb4a303e..0000000000
--- a/packages/gtk+/gtk+-2.10.0/no-xwc.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c	2004-11-30 14:57:14 +00:00
-+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c	2005-01-02 15:38:06 +00:00
-@@ -576,12 +576,14 @@
- 			 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
- 	}
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
-       XmbDrawString (xdisplay, impl->xid,
- 		     fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-@@ -613,6 +615,7 @@
-                    GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
-       g_free (text_8bit);
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
-@@ -633,6 +636,7 @@
- 	  g_free (text_wchar);
- 	}
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c	2004-08-26 01:23:46 +01:00
-+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c	2005-01-02 15:45:39 +00:00
-@@ -525,10 +525,12 @@
- 	  width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
- 	}
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       width = XmbTextEscapement (fontset, text, text_length);
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -578,6 +580,7 @@
-           width = 0;
-         }
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
- 	{
-@@ -595,6 +598,7 @@
- 	  g_free (text_wchar);
- 	}
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -667,6 +671,7 @@
-       if (descent)
- 	*descent = overall.descent;
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       XmbTextExtents (fontset, text, text_length, &ink, &logical);
-@@ -681,6 +686,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
-@@ -753,6 +759,7 @@
- 	  *descent = overall.descent;
- 	break;
-       }
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
- 
-@@ -780,6 +787,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c	2004-11-17 00:55:10 +00:00
-+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c	2005-01-02 15:42:04 +00:00
-@@ -48,6 +48,7 @@
- void
- _gdk_x11_initialize_locale (void)
- {
-+#ifdef HAVE_XWC
-   wchar_t result;
-   gchar *current_locale;
-   static char *last_locale = NULL;
-@@ -93,7 +94,8 @@
-   GDK_NOTE (XIM,
- 	    g_message ("%s multi-byte string functions.", 
- 		       gdk_use_mb ? "Using" : "Not using"));
--  
-+#endif
-+    
-   return;
- }
- 
-@@ -136,6 +138,7 @@
- {
-   gchar *mbstr;
- 
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -178,6 +181,7 @@
-       XFree (tpr.value);
-     }
-   else
-+#endif
-     {
-       gint length = 0;
-       gint i;
-@@ -210,6 +214,7 @@
- gint
- gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
- {
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -242,6 +247,7 @@
-       return len_cpy;
-     }
-   else
-+#endif
-     {
-       gint i;
- 
diff --git a/packages/gtk+/gtk+-2.10.0/run-iconcache.patch b/packages/gtk+/gtk+-2.10.0/run-iconcache.patch
deleted file mode 100644
index f0bb6ba842..0000000000
--- a/packages/gtk+/gtk+-2.10.0/run-iconcache.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk+-2.10.0/gtk/Makefile.am~	2006-07-05 16:49:16.000000000 +0200
-+++ gtk+-2.10.0/gtk/Makefile.am	2006-07-05 16:49:16.000000000 +0200
-@@ -1088,11 +1088,11 @@
- 	done									\
- 	&& touch stamp-icons
- 
--gtkbuiltincache.h: @REBUILD@ stamp-icons
--	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
--	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
--	   ./gtk-update-icon-cache --force --ignore-theme-index 		\
--	   --source builtin_icons stock-icons > gtkbuiltincache.h
-+#gtkbuiltincache.h: @REBUILD@ stamp-icons
-+#	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
-+#	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
-+#	   ./gtk-update-icon-cache --force --ignore-theme-index 		\
-+#	   --source builtin_icons stock-icons > gtkbuiltincache.h
- 
- EXTRA_DIST +=                   \
- 	$(STOCK_ICONS)		\
diff --git a/packages/gtk+/gtk+-2.10.0/scroll-timings.patch b/packages/gtk+/gtk+-2.10.0/scroll-timings.patch
deleted file mode 100644
index 3f823a7880..0000000000
--- a/packages/gtk+/gtk+-2.10.0/scroll-timings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.10.0/gtk/gtkrange.c.orig	2006-07-05 12:41:39.000000000 +0200
-+++ gtk+-2.10.0/gtk/gtkrange.c	2006-07-05 12:41:58.000000000 +0200
-@@ -39,7 +39,7 @@
- #include "gtkalias.h"
- 
- #define SCROLL_DELAY_FACTOR 5    /* Scroll repeat multiplier */
--#define UPDATE_DELAY        300  /* Delay for queued update */
-+#define UPDATE_DELAY        1000  /* Delay for queued update */
- 
- enum {
-   PROP_0,
diff --git a/packages/gtk+/gtk+-2.10.0/single-click.patch b/packages/gtk+/gtk+-2.10.0/single-click.patch
deleted file mode 100644
index 3bb208d4d6..0000000000
--- a/packages/gtk+/gtk+-2.10.0/single-click.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c
---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c	2005-04-06 16:57:04 +01:00
-+++ gtk+-2.6.3/gtk/gtkcalendar.c	2005-04-06 20:05:18 +01:00
-@@ -1023,9 +1023,11 @@
- 	}
- 
-       gtk_calendar_select_and_focus_day (calendar, day);
--    }
-+      
-+      // This change causes the calendar to disappear after choosing a day
-+/*    }
-   else if (event->type == GDK_2BUTTON_PRESS)
--    {
-+    {*/
-       private_data->in_drag = 0;
-       if (day_month == MONTH_CURRENT)
- 	g_signal_emit (calendar,
-diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c
---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c	2005-04-06 16:57:07 +01:00
-+++ gtk+-2.6.3/gtk/gtkfilesel.c	2005-04-07 13:40:32 +01:00
-@@ -2468,6 +2468,33 @@
-       if (fs->last_selected != NULL)
- 	g_free (fs->last_selected);
- 
-+      // Single-click directory entry	
-+  	  if (new_names->len == 1)
-+  	    {
-+  	      GtkTreeView *tree_view;
-+  	      GtkTreeModel *model;
-+  	      GtkTreePath *path;
-+          GtkTreeIter iter;  
-+          gboolean is_file;
-+
-+          tree_view = gtk_tree_selection_get_tree_view (selection);
-+          
-+          if (gtk_tree_selection_get_selected (selection, &model, &iter))
-+            {
-+              path = gtk_tree_model_get_path (model, &iter);              
-+              gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
-+
-+              if (!is_file)
-+                {
-+                  gtk_file_selection_dir_activate (tree_view, path, 
-+                          gtk_tree_view_get_column (tree_view, DIR_COLUMN),
-+                          user_data);
-+                }
-+                
-+              gtk_tree_path_free (path);
-+            }
-+        }
-+        
-       fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
-       filename = get_real_filename (fs->last_selected, FALSE);
- 
diff --git a/packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch
deleted file mode 100644
index 20bf4cf366..0000000000
--- a/packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c	2004-07-10 05:02:10.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkfilesel.c	2004-09-13 13:40:09.000000000 +0100
-@@ -68,6 +68,7 @@
- #include "gtkprivate.h"
- #include "gtkscrolledwindow.h"
- #include "gtkstock.h"
-+#include "gtksignal.h"
- #include "gtktreeselection.h"
- #include "gtktreeview.h"
- #include "gtkvbox.h"
-@@ -77,6 +78,7 @@
- #include "gtkmessagedialog.h"
- #include "gtkdnd.h"
- #include "gtkeventbox.h"
-+#include "gtkimage.h"
- 
- #undef GTK_DISABLE_DEPRECATED
- #include "gtkoptionmenu.h"
-@@ -245,7 +247,8 @@
- };
- 
- enum {
--  DIR_COLUMN
-+  DIR_COLUMN,
-+  ISFILE_COLUMN
- };
- 
- enum {
-@@ -400,6 +403,12 @@
- 					      GtkTreePath       *path,
- 					      GtkTreeViewColumn *column,
- 					      gpointer           user_data);
-+
-+static void gtk_file_selection_activate (GtkTreeView       *tree_view,
-+					 GtkTreePath       *path,
-+					 GtkTreeViewColumn *column,
-+					 gpointer           user_data);
-+
- static void gtk_file_selection_file_changed  (GtkTreeSelection  *selection,
- 					      gpointer           user_data);
- static void gtk_file_selection_dir_activate  (GtkTreeView       *tree_view,
-@@ -419,6 +428,7 @@
- static void gtk_file_selection_create_dir  (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
-+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle  *prev_style);
- 
- static void free_selected_names (GPtrArray *names);
- 
-@@ -578,6 +588,23 @@
- 							 G_PARAM_WRITABLE));
-   object_class->destroy = gtk_file_selection_destroy;
-   widget_class->map = gtk_file_selection_map;
-+  widget_class->style_set = gtk_file_selection_style_set;
-+
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_boolean ("show_fileops_default",
-+								 _("Show fileop buttons by default"),
-+								 _("Whether file operation buttons are shown by default"),
-+								 TRUE,
-+								 G_PARAM_READABLE));
-+
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("border_width",
-+                                                             _("Border width"),
-+                                                             _("Width of border around the main dialog area"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             10,
-+                                                             G_PARAM_READABLE));
- }
- 
- static void gtk_file_selection_set_property (GObject         *object,
-@@ -649,7 +676,29 @@
-   gtk_widget_grab_default (widget);
-   return FALSE;
- }
--     
-+
-+static void
-+gtk_file_selection_style_set (GtkWidget *filesel,
-+			      GtkStyle  *prev_style)
-+{     
-+  gboolean show_fileops;
-+  gint border_width;
-+
-+  gtk_widget_style_get (filesel,
-+                        "show_fileops_default",
-+                        &show_fileops,
-+			"border_width",
-+			&border_width,
-+			NULL);
-+
-+  gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
-+
-+  if (show_fileops)
-+    gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+  else
-+    gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+}
-+
- static void
- gtk_file_selection_init (GtkFileSelection *filesel)
- {
-@@ -674,17 +723,15 @@
- 
-   /* The dialog-sized vertical box  */
-   filesel->main_vbox = dialog->vbox;
--  gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
- 
-   /* The horizontal box containing create, rename etc. buttons */
-   filesel->button_area = gtk_hbutton_box_new ();
-   gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
--  gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
-   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, 
- 		      FALSE, FALSE, 0);
-   gtk_widget_show (filesel->button_area);
-   
--  gtk_file_selection_show_fileop_buttons (filesel);
-+  gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
- 
-   /* hbox for pulldown menu */
-   pulldown_hbox = gtk_hbox_new (TRUE, 5);
-@@ -723,25 +770,32 @@
-   
-   /* The directories list */
- 
--  model = gtk_list_store_new (1, G_TYPE_STRING);
-+  model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
-   filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-   g_object_unref (model);
- 
--  column = gtk_tree_view_column_new_with_attributes (_("Folders"),
-+  column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
- 						     gtk_cell_renderer_text_new (),
- 						     "text", DIR_COLUMN,
- 						     NULL);
-   label = gtk_label_new_with_mnemonic (_("Fol_ders"));
-   gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
-   gtk_widget_show (label);
--  gtk_tree_view_column_set_widget (column, label);
-+
-+  /* gtk_tree_view_column_set_widget (column, label); */
-+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
-+
-   gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-   gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
- 
-   gtk_widget_set_size_request (filesel->dir_list,
- 			       DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
-   g_signal_connect (filesel->dir_list, "row_activated",
--		    G_CALLBACK (gtk_file_selection_dir_activate), filesel);
-+		    G_CALLBACK (gtk_file_selection_activate), filesel);
-+
-+  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
-+		    G_CALLBACK (gtk_file_selection_file_changed), filesel);
-+
- 
-   /*  gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
- 
-@@ -758,41 +812,6 @@
-   gtk_widget_show (filesel->dir_list);
-   gtk_widget_show (scrolled_win);
- 
--  /* The files list */
--  model = gtk_list_store_new (1, G_TYPE_STRING);
--  filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
--  g_object_unref (model);
--
--  column = gtk_tree_view_column_new_with_attributes (_("Files"),
--						     gtk_cell_renderer_text_new (),
--						     "text", FILE_COLUMN,
--						     NULL);
--  label = gtk_label_new_with_mnemonic (_("_Files"));
--  gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
--  gtk_widget_show (label);
--  gtk_tree_view_column_set_widget (column, label);
--  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
--  gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
--
--  gtk_widget_set_size_request (filesel->file_list,
--			       FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
--  g_signal_connect (filesel->file_list, "row_activated",
--		    G_CALLBACK (gtk_file_selection_file_activate), filesel);
--  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
--		    G_CALLBACK (gtk_file_selection_file_changed), filesel);
--
--  /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
--
--  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
--  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
--  gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
--  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
--				  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
--  gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
--  gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
--  gtk_widget_show (filesel->file_list);
--  gtk_widget_show (scrolled_win);
--
-   /* 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, 
-@@ -2008,6 +2027,23 @@
- }
- 
- static void
-+gtk_file_selection_activate (GtkTreeView       *tree_view,
-+			     GtkTreePath       *path,
-+			     GtkTreeViewColumn *column,
-+			     gpointer           user_data)
-+{
-+  GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
-+  GtkTreeIter iter;  
-+  gboolean is_file;
-+
-+  gtk_tree_model_get_iter (model, &iter, path);
-+  gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
-+
-+  if (! is_file)
-+    gtk_file_selection_dir_activate (tree_view, path, column, user_data);
-+}
-+
-+static void
- gtk_file_selection_file_activate (GtkTreeView       *tree_view,
- 				  GtkTreePath       *path,
- 				  GtkTreeViewColumn *column,
-@@ -2103,7 +2139,6 @@
-   PossibleCompletion* poss;
-   GtkTreeIter iter;
-   GtkListStore *dir_model;
--  GtkListStore *file_model;
-   gchar* filename;
-   gchar* rem_path = rel_path;
-   gchar* sel_text;
-@@ -2125,10 +2160,8 @@
-   g_assert (cmpl_state->reference_dir);
- 
-   dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
--  file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
- 
-   gtk_list_store_clear (dir_model);
--  gtk_list_store_clear (file_model);
- 
-   /* Set the dir list to include ./ and ../ */
-   gtk_list_store_append (dir_model, &iter);
-@@ -2150,13 +2183,17 @@
-                   strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
- 		{
- 		  gtk_list_store_append (dir_model, &iter);
--		  gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
-+		  gtk_list_store_set (dir_model, &iter, 
-+				      DIR_COLUMN, filename, 
-+				      ISFILE_COLUMN, FALSE, -1);
- 		}
- 	    }
-           else
- 	    {
--	      gtk_list_store_append (file_model, &iter);
--	      gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
-+	      gtk_list_store_append (dir_model, &iter);
-+	      gtk_list_store_set (dir_model, &iter, 
-+				  DIR_COLUMN, filename, 
-+				  ISFILE_COLUMN, TRUE, -1);
-             }
- 	}
- 
diff --git a/packages/gtk+/gtk+-2.10.0/spinbutton.patch b/packages/gtk+/gtk+-2.10.0/spinbutton.patch
deleted file mode 100644
index 8ad7507af0..0000000000
--- a/packages/gtk+/gtk+-2.10.0/spinbutton.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- gtk+-2.4.3/gtk/gtkspinbutton.c.old	2004-04-22 14:49:27.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtkspinbutton.c	2004-06-30 21:48:18.000000000 +0100
-@@ -733,7 +733,7 @@
- 
-   spin = GTK_SPIN_BUTTON (widget);
-   arrow_size = spin_button_get_arrow_size (spin);
--  panel_width = arrow_size + 2 * widget->style->xthickness;
-+  panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
-   
-   widget->allocation = *allocation;
-   
-@@ -866,19 +866,16 @@
-     {
-       width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
- 
-+      y = widget->style->ythickness;
-+      height = widget->requisition.height - (2 * y);
-+
-       if (arrow_type == GTK_ARROW_UP)
- 	{
- 	  x = 0;
--	  y = 0;
--
--	  height = widget->requisition.height / 2;
- 	}
-       else
- 	{
--	  x = 0;
--	  y = widget->requisition.height / 2;
--
--	  height = (widget->requisition.height + 1) / 2;
-+	  x = width;
- 	}
- 
-       if (spin_button_at_limit (spin_button, arrow_type))
-@@ -908,32 +905,17 @@
- 	      shadow_type = GTK_SHADOW_OUT;
- 	    }
- 	}
--      
-+
-       gtk_paint_box (widget->style, spin_button->panel,
- 		     state_type, shadow_type,
- 		     NULL, widget,
--		     (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
-+		     NULL,
- 		     x, y, width, height);
- 
-       height = widget->requisition.height;
- 
--      if (arrow_type == GTK_ARROW_DOWN)
--	{
--	  y = height / 2;
--	  height = height - y - 2;
--	}
--      else
--	{
--	  y = 2;
--	  height = height / 2 - 2;
--	}
--
-       width -= 3;
--
--      if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
--	x = 2;
--      else
--	x = 1;
-+      height -= 3;
- 
-       w = width / 2;
-       w -= w % 2 - 1; /* force odd */
-@@ -1108,7 +1090,7 @@
- 	  if (GTK_ENTRY (widget)->editable)
- 	    gtk_spin_button_update (spin);
- 	  
--	  if (event->y <= widget->requisition.height / 2)
-+	  if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
- 	    {
- 	      if (event->button == 1)
- 		start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
-@@ -1143,44 +1125,11 @@
- 
-   arrow_size = spin_button_get_arrow_size (spin);
- 
--  if (event->button == spin->button)
--    {
--      int click_child = spin->click_child;
-+  gtk_spin_button_stop_spinning (spin);
- 
--      gtk_spin_button_stop_spinning (spin);
--
--      if (event->button == 3)
--	{
--	  if (event->y >= 0 && event->x >= 0 && 
--	      event->y <= widget->requisition.height &&
--	      event->x <= arrow_size + 2 * widget->style->xthickness)
--	    {
--	      if (click_child == GTK_ARROW_UP &&
--		  event->y <= widget->requisition.height / 2)
--		{
--		  gdouble diff;
--
--		  diff = spin->adjustment->upper - spin->adjustment->value;
--		  if (diff > EPSILON)
--		    gtk_spin_button_real_spin (spin, diff);
--		}
--	      else if (click_child == GTK_ARROW_DOWN &&
--		       event->y > widget->requisition.height / 2)
--		{
--		  gdouble diff;
--
--		  diff = spin->adjustment->value - spin->adjustment->lower;
--		  if (diff > EPSILON)
--		    gtk_spin_button_real_spin (spin, -diff);
--		}
--	    }
--	}		  
--      spin_button_redraw (spin);
-+  spin_button_redraw (spin);
- 
--      return TRUE;
--    }
--  else
--    return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
-+  return TRUE;
- }
- 
- static gint
diff --git a/packages/gtk+/gtk+-2.10.0/xsettings.patch b/packages/gtk+/gtk+-2.10.0/xsettings.patch
deleted file mode 100644
index b63e262d34..0000000000
--- a/packages/gtk+/gtk+-2.10.0/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old	Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c	Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void 
diff --git a/packages/gtk+/gtk+-2.10.1/automake-lossage.patch b/packages/gtk+/gtk+-2.10.1/automake-lossage.patch
deleted file mode 100644
index 0d423ddbb9..0000000000
--- a/packages/gtk+/gtk+-2.10.1/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk+-2.4.1/docs/tutorial/Makefile.am~	2003-05-06 22:54:20.000000000 +0100
-+++ gtk+-2.4.1/docs/tutorial/Makefile.am	2004-05-08 12:31:41.000000000 +0100
-@@ -52,21 +52,5 @@
- 
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
--else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--dist-hook:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "*** DISTRIBUTION IS INCOMPLETE"
--	echo "***"
- endif
- 
diff --git a/packages/gtk+/gtk+-2.10.1/disable-print.patch b/packages/gtk+/gtk+-2.10.1/disable-print.patch
deleted file mode 100644
index 1067773f12..0000000000
--- a/packages/gtk+/gtk+-2.10.1/disable-print.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtk+-2.10.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
-+++ gtk+-2.10.0/configure.in	2006-07-05 18:11:44.000000000 +0200
-@@ -1539,26 +1539,27 @@
- # Printing system checks
- ################################################################
- 
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
--if test "x$CUPS_CONFIG" != "xno"; then
--  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
--  CUPS_LIBS=`cups-config --libs`
--
--  CUPS_API_VERSION=`cups-config --api-version`
--  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
--  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
--
--  if test $CUPS_API_MAJOR -gt 1 -o \
--          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
--    AC_DEFINE(HAVE_CUPS_API_1_2)
--  fi
--
--  AC_SUBST(CUPS_API_MAJOR)
--  AC_SUBST(CUPS_API_MINOR)
--  AC_SUBST(CUPS_CFLAGS)
--  AC_SUBST(CUPS_LIBS)
--fi
--AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-+#if test "x$CUPS_CONFIG" != "xno"; then
-+#  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-+#  CUPS_LIBS=`cups-config --libs`
-+#
-+#  CUPS_API_VERSION=`cups-config --api-version`
-+#  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-+#  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
-+#
-+#  if test $CUPS_API_MAJOR -gt 1 -o \
-+#          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-+#   AC_DEFINE(HAVE_CUPS_API_1_2)
-+# fi
-+#
-+#  AC_SUBST(CUPS_API_MAJOR)
-+#  AC_SUBST(CUPS_API_MINOR)
-+#  AC_SUBST(CUPS_CFLAGS)
-+#  AC_SUBST(CUPS_LIBS)
-+#fi
-+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+AM_CONDITIONAL(HAVE_CUPS,false)
- 
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
diff --git a/packages/gtk+/gtk+-2.10.1/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.1/disable-tooltips.patch
deleted file mode 100644
index d71d839c3c..0000000000
--- a/packages/gtk+/gtk+-2.10.1/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.4.3/gtk/gtktooltips.c.old	2004-07-04 18:52:04.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtktooltips.c	2004-07-04 18:52:08.000000000 +0100
-@@ -118,7 +118,7 @@
-   tooltips->tips_data_list = NULL;
-   
-   tooltips->delay = DEFAULT_DELAY;
--  tooltips->enabled = TRUE;
-+  tooltips->enabled = FALSE;
-   tooltips->timer_tag = 0;
-   tooltips->use_sticky_delay = FALSE;
-   tooltips->last_popdown.tv_sec = -1;
diff --git a/packages/gtk+/gtk+-2.10.1/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.1/gtk+-handhelds.patch
deleted file mode 100644
index 20481f059b..0000000000
--- a/packages/gtk+/gtk+-2.10.1/gtk+-handhelds.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- gtk+-2.4.1/gtk/gtkarrow.c	2004-03-13 09:51:13.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkarrow.c	2004-05-26 14:52:17.000000000 +1000
-@@ -29,7 +29,7 @@
- #include "gtkarrow.h"
- #include "gtkintl.h"
- 
--#define MIN_ARROW_SIZE  15
-+#define MIN_ARROW_SIZE  7
- 
- enum {
-   PROP_0,
-@@ -53,6 +53,8 @@
- 				    guint            prop_id,
- 				    GValue          *value,
- 				    GParamSpec      *pspec);
-+static void gtk_arrow_size_request (GtkWidget *arrow, 
-+				    GtkRequisition *requisition);
- 
- GType
- gtk_arrow_get_type (void)
-@@ -111,6 +113,7 @@
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-   widget_class->expose_event = gtk_arrow_expose;
-+  widget_class->size_request = gtk_arrow_size_request;
- }
- 
- static void
-@@ -166,13 +169,18 @@
- }
- 
- static void
-+gtk_arrow_size_request (GtkWidget *arrow, 
-+			GtkRequisition *requisition)
-+{
-+  requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
-+  requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
-+}
-+
-+static void
- gtk_arrow_init (GtkArrow *arrow)
- {
-   GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
- 
--  GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
--  GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
--
-   arrow->arrow_type = GTK_ARROW_RIGHT;
-   arrow->shadow_type = GTK_SHADOW_OUT;
- }
---- gtk+-2.4.1/gtk/gtkcalendar.c	2004-03-06 14:37:26.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkcalendar.c	2004-05-26 14:58:57.000000000 +1000
-@@ -340,6 +340,9 @@
- static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
- 					       guint        day);
- 
-+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
-+					guint	      day);
-+
- static void gtk_calendar_paint_arrow	(GtkWidget    *widget,
- 					 guint	       arrow);
- static void gtk_calendar_paint_day_num	(GtkWidget    *widget,
-@@ -861,13 +864,13 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
-     {
-       if (calendar->selected_day < 0)
- 	calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
--      gtk_calendar_select_day (calendar, calendar->selected_day);
-+      gtk_calendar_do_select_day (calendar, calendar->selected_day);
-     }
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-@@ -908,10 +911,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -939,10 +942,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -974,10 +977,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -2480,9 +2483,9 @@
-   return TRUE;
- }
- 
--void
--gtk_calendar_select_day (GtkCalendar *calendar,
--			 guint	      day)
-+static void
-+gtk_calendar_do_select_day (GtkCalendar *calendar,
-+			    guint	      day)
- {
-   g_return_if_fail (GTK_IS_CALENDAR (calendar));
-   g_return_if_fail (day <= 31);
-@@ -2499,6 +2502,13 @@
-       if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
- 	gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
-     }
-+}
-+
-+void
-+gtk_calendar_select_day (GtkCalendar *calendar,
-+			 guint	      day)
-+{
-+  gtk_calendar_do_select_day (calendar, day);
-   
-   calendar->selected_day = day;
-   
---- gtk+-2.4.1/gtk/gtkentry.c	2004-04-22 08:08:08.000000000 +1000
-+++ gtk+-2.4.1/gtk/gtkentry.c	2004-05-26 14:52:17.000000000 +1000
-@@ -557,6 +557,15 @@
- 						       0.0,
- 						       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("min_width",
-+                                                             _("Minimum width"),
-+                                                             _("Minimum width of the entry field"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             MIN_ENTRY_WIDTH,
-+                                                             G_PARAM_READABLE));
-+
-   signals[POPULATE_POPUP] =
-     g_signal_new ("populate_popup",
- 		  G_OBJECT_CLASS_TYPE (gobject_class),
-@@ -1124,7 +1133,7 @@
- {
-   GtkEntry *entry = GTK_ENTRY (widget);
-   PangoFontMetrics *metrics;
--  gint xborder, yborder;
-+  gint xborder, yborder, min_width;
-   PangoContext *context;
-   
-   gtk_widget_ensure_style (widget);
-@@ -1140,9 +1149,11 @@
-   
-   xborder += INNER_BORDER;
-   yborder += INNER_BORDER;
--  
-+
-+  gtk_widget_style_get (widget, "min_width", &min_width, NULL);
-+
-   if (entry->width_chars < 0)
--    requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
-+    requisition->width = min_width + xborder * 2;
-   else
-     {
-       gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
---- gtk+-2.4.1/gtk/gtkrange.c	2004-03-06 14:38:08.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkrange.c	2004-05-26 14:52:17.000000000 +1000
-@@ -180,6 +180,7 @@
- static GtkWidgetClass *parent_class = NULL;
- static guint signals[LAST_SIGNAL];
- 
-+static GdkAtom recognize_protocols_atom, atom_atom;
- 
- GType
- gtk_range_get_type (void)
-@@ -220,6 +221,9 @@
-   object_class = (GtkObjectClass*) class;
-   widget_class = (GtkWidgetClass*) class;
- 
-+  recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
-+  atom_atom = gdk_atom_intern ("ATOM", FALSE);
-+
-   parent_class = g_type_class_peek_parent (class);
- 
-   gobject_class->set_property = gtk_range_set_property;
-@@ -815,6 +819,12 @@
- 					&attributes, attributes_mask);
-   gdk_window_set_user_data (range->event_window, range);
- 
-+  gdk_property_change (range->event_window,
-+		       recognize_protocols_atom,
-+		       atom_atom,
-+		       32, GDK_PROP_MODE_REPLACE,
-+		       NULL, 0);
-+
-   widget->style = gtk_style_attach (widget->style, widget->window);
- }
- 
-@@ -1186,7 +1196,7 @@
- 
-   /* ignore presses when we're already doing something else. */
-   if (range->layout->grab_location != MOUSE_OUTSIDE)
--    return FALSE;
-+    return TRUE;
- 
-   range->layout->mouse_x = event->x;
-   range->layout->mouse_y = event->y;
-@@ -1364,7 +1374,7 @@
-       return TRUE;
-     }
- 
--  return FALSE;
-+  return TRUE;
- }
- 
- /**
diff --git a/packages/gtk+/gtk+-2.10.1/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.1/gtklabel-resize-patch
deleted file mode 100644
index df29656343..0000000000
--- a/packages/gtk+/gtk+-2.10.1/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~	2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c	2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 
diff --git a/packages/gtk+/gtk+-2.10.1/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.1/hardcoded_libtool.patch
deleted file mode 100644
index bdbdb32f97..0000000000
--- a/packages/gtk+/gtk+-2.10.1/hardcoded_libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gtk+-2.10.0/configure.in.orig	2006-07-07 09:31:34.000000000 +0100
-+++ gtk+-2.10.0/configure.in	2006-07-07 09:32:49.000000000 +0100
-@@ -370,7 +370,7 @@
- AC_MSG_CHECKING([Whether to write dependencies into .pc files])
- case $enable_explicit_deps in
-   auto)
--    deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh`
-+    deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh`
-     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -768,7 +768,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1600,7 +1600,7 @@
- #
- # We are using gmodule-no-export now, but I'm leaving the stripping
- # code in place for now, since pango and atk still require gmodule.
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- if test -n "$export_dynamic"; then
-   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
-   GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/packages/gtk+/gtk+-2.10.1/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.1/menu-deactivate.patch
deleted file mode 100644
index cfb8849e9f..0000000000
--- a/packages/gtk+/gtk+-2.10.1/menu-deactivate.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- gtk+-2.10.0/gtk/gtkmenushell.c.orig	2006-07-05 17:17:34.000000000 +0200
-+++ gtk+-2.10.0/gtk/gtkmenushell.c	2006-07-05 17:19:01.000000000 +0200
-@@ -42,7 +42,7 @@
- #include "gtkintl.h"
- #include "gtkalias.h"
- 
--#define MENU_SHELL_TIMEOUT   500
-+#define MENU_SHELL_TIMEOUT   2000
- 
- #define PACK_DIRECTION(m)                                 \
-    (GTK_IS_MENU_BAR (m)                                   \
-@@ -203,6 +203,8 @@
- 
- G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER)
- 
-+static int last_crossing_time;
-+
- static void
- gtk_menu_shell_class_init (GtkMenuShellClass *klass)
- {
-@@ -517,6 +519,7 @@
-       gtk_grab_add (GTK_WIDGET (menu_shell));
-       menu_shell->have_grab = TRUE;
-       menu_shell->active = TRUE;
-+      last_crossing_time = 0;
-     }
- }
- 
-@@ -669,6 +672,13 @@
- 	  menu_shell->activate_time = 0;
- 	  deactivate = FALSE;
- 	}
-+
-+      if (last_crossing_time != 0
-+	  && ((event->time - last_crossing_time) < 500))
-+	{
-+	  last_crossing_time = 0;
-+	  deactivate = FALSE;
-+	}
-       
-       if (deactivate)
- 	{
-@@ -716,6 +726,8 @@
-     {
-       menu_item = gtk_get_event_widget ((GdkEvent*) event);
- 
-+      last_crossing_time = event->time;
-+
-       if (!menu_item ||
- 	  (GTK_IS_MENU_ITEM (menu_item) && 
- 	   !_gtk_menu_item_is_selectable (menu_item)))
diff --git a/packages/gtk+/gtk+-2.10.1/migration.patch b/packages/gtk+/gtk+-2.10.1/migration.patch
deleted file mode 100644
index 4850f85e4f..0000000000
--- a/packages/gtk+/gtk+-2.10.1/migration.patch
+++ /dev/null
@@ -1,615 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gtk+/configure.in,v
-retrieving revision 1.419.2.4
-diff -u -r1.419.2.4 configure.in
---- configure.in	8 Feb 2005 21:39:42 -0000	1.419.2.4
-+++ configure.in	27 Feb 2005 13:10:16 -0000
-@@ -1495,6 +1495,16 @@
- GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
- GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
- 
-+AC_ARG_ENABLE(display-migration,
-+	[AC_HELP_STRING([--enable-display-migration],
-+			[include support for GPE_CHANGE_DISPLAY protocol])],
-+	enable_migration=yes, enable_migration=no)
-+if test "$enable_migration" = "yes"; then
-+	AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled])
-+	GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt"
-+fi
-+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes")
-+
- AC_SUBST(GTK_PACKAGES)
- AC_SUBST(GTK_EXTRA_LIBS)
- AC_SUBST(GTK_EXTRA_CFLAGS)
-Index: gtk/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
-retrieving revision 1.266.2.1
-diff -u -r1.266.2.1 Makefile.am
---- gtk/Makefile.am	13 Jan 2005 15:18:21 -0000	1.266.2.1
-+++ gtk/Makefile.am	27 Feb 2005 13:10:17 -0000
-@@ -520,6 +520,10 @@
- 	gtkwindow.c		\
- 	xembed.h
- 
-+if ENABLE_MIGRATION
-+gtk_c_sources += gtkmigration.c
-+endif
-+
- if OS_UNIX
- gtk_private_h_sources += gtkfilesystemunix.h
- gtk_c_sources +=         gtkfilesystemunix.c
-Index: gtk/gtkmain.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v
-retrieving revision 1.255
-diff -u -r1.255 gtkmain.c
---- gtk/gtkmain.c	27 Dec 2004 05:25:15 -0000	1.255
-+++ gtk/gtkmain.c	27 Feb 2005 13:10:19 -0000
-@@ -491,6 +491,10 @@
-   _gtk_accel_map_init ();  
-   _gtk_rc_init ();
- 
-+#ifdef ENABLE_MIGRATION
-+  gtk_migration_init ();
-+#endif
-+
-   /* Set the 'initialized' flag.
-    */
-   gtk_initialized = TRUE;
---- /dev/null	2005-02-20 01:07:50.714416160 +0000
-+++ gtk/gtkmigration.c	2005-02-27 15:05:04.052757352 +0000
-@@ -0,0 +1,529 @@
-+/*
-+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#include <stdlib.h>
-+#include <ctype.h>
-+#include <libintl.h>
-+#include <string.h>
-+#include <assert.h>
-+
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+
-+#include <gcrypt.h>
-+
-+#include "gtk.h"
-+#include "gdk.h"
-+#include "x11/gdkx.h"
-+
-+#define _(x) gettext(x)
-+
-+static GdkAtom string_gdkatom, display_change_gdkatom;
-+static GdkAtom rsa_challenge_gdkatom;
-+
-+#define DISPLAY_CHANGE_SUCCESS			0
-+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT	1
-+#define DISPLAY_CHANGE_NO_SUCH_SCREEN		2
-+#define DISPLAY_CHANGE_AUTHENTICATION_BAD	3
-+#define DISPLAY_CHANGE_INDETERMINATE_ERROR	4
-+
-+static gboolean no_auth;
-+
-+static GSList *all_widgets;
-+
-+static gboolean gtk_migration_initialised;
-+
-+#define CHALLENGE_LEN 64
-+
-+gchar *gtk_migration_auth_challenge_string;
-+
-+static unsigned char challenge_bytes[CHALLENGE_LEN];
-+static unsigned long challenge_seq;
-+
-+#define hexbyte(x)  ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0')
-+
-+struct rsa_key
-+{
-+  gcry_mpi_t n, e, d, p, q, u;
-+};
-+
-+static gcry_mpi_t
-+mpi_from_sexp (gcry_sexp_t r, char *tag)
-+{
-+  gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0);
-+  return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG);
-+}
-+
-+static char *
-+hex_from_mpi (gcry_mpi_t m)
-+{
-+  char *buf;
-+  gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m);
-+  return buf;
-+}
-+
-+static void
-+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result)
-+{
-+  size_t dlen = strlen (display);
-+  gchar *buf = g_malloc (dlen + 1 + len);
-+  strcpy (buf, display);
-+  memcpy (buf + dlen + 1, challenge, len);
-+  gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1);
-+  g_free (buf);
-+}
-+
-+static int
-+do_encode_md (const unsigned char *digest, size_t digestlen, int algo,
-+              unsigned int nbits, gcry_mpi_t *r_val)
-+{
-+  int nframe = (nbits+7) / 8;
-+  unsigned char *frame;
-+  int i, n;
-+  unsigned char asn[100];
-+  size_t asnlen;
-+
-+  asnlen = sizeof(asn);
-+  if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen))
-+    return -1;
-+
-+  if (digestlen + asnlen + 4  > nframe )
-+    return -1;
-+  
-+  /* We encode the MD in this way:
-+   *
-+   *	   0  1 PAD(n bytes)   0  ASN(asnlen bytes)  MD(len bytes)
-+   *
-+   * PAD consists of FF bytes.
-+   */
-+  frame = g_malloc (nframe);
-+  n = 0;
-+  frame[n++] = 0;
-+  frame[n++] = 1; /* block type */
-+  i = nframe - digestlen - asnlen -3 ;
-+  assert ( i > 1 );
-+  memset ( frame+n, 0xff, i ); n += i;
-+  frame[n++] = 0;
-+  memcpy ( frame+n, asn, asnlen ); n += asnlen;
-+  memcpy ( frame+n, digest, digestlen ); n += digestlen;
-+  assert ( n == nframe );
-+      
-+  gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe);
-+  g_free (frame);
-+  return 0;
-+}
-+
-+static gboolean
-+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf)
-+{
-+  gcry_mpi_t mpi, mpi2;
-+  gcry_sexp_t data, sig, key;
-+  int rc;
-+
-+  do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi);
-+
-+  gcry_sexp_build (&data, NULL, "(data (value %m))", mpi);
-+  
-+  gcry_mpi_release (mpi);
-+
-+  gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e);
-+
-+  if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL))
-+    {
-+      gcry_sexp_release (data);
-+      return FALSE;
-+    }
-+
-+  gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2);
-+
-+  rc = gcry_pk_verify (sig, data, key);
-+
-+  gcry_sexp_release (data);
-+  gcry_sexp_release (key);
-+  gcry_sexp_release (sig);
-+  gcry_mpi_release (mpi2);
-+
-+  if (rc)
-+    return FALSE;
-+
-+  return TRUE;
-+}
-+
-+static void 
-+gtk_migration_auth_update_challenge (void)
-+{
-+  int i;
-+  unsigned char *p;
-+
-+  if (gtk_migration_auth_challenge_string == NULL)
-+    gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9);
-+
-+  p = gtk_migration_auth_challenge_string;
-+
-+  for (i = 0; i < CHALLENGE_LEN; i++)
-+    {
-+      *p++ = hexbyte (challenge_bytes[i] >> 4);
-+      *p++ = hexbyte (challenge_bytes[i] & 15);
-+    }
-+  
-+  sprintf (p, "%08lx", challenge_seq++);
-+}
-+
-+static void
-+gtk_migration_auth_generate_challenge (void)
-+{
-+  gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM);
-+  gtk_migration_auth_update_challenge ();
-+}
-+
-+static struct rsa_key *
-+parse_pubkey (char *s)
-+{
-+  struct rsa_key *r;
-+  gcry_mpi_t n, e;
-+  gchar *sp;
-+
-+  sp = strtok (s, " \n");
-+  gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL);
-+  sp = strtok (NULL, " \n");
-+  gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL);
-+
-+  r = g_malloc0 (sizeof (struct rsa_key));
-+  r->e = e;
-+  r->n = n;
-+  return r;
-+}
-+
-+static struct rsa_key *
-+lookup_pubkey (u_int32_t id)
-+{
-+  const gchar *home_dir = g_get_home_dir ();
-+  gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir);
-+  FILE *fp = fopen (filename, "r");
-+  struct rsa_key *r = NULL;
-+
-+  if (fp)
-+    {
-+      while (!feof (fp))
-+	{
-+	  char buffer[4096];
-+	  if (fgets (buffer, 4096, fp))
-+	    {
-+	      char *p;
-+	      u_int32_t this_id = strtoul (buffer, &p, 16);
-+	      if (p != buffer && *p == ' ')
-+		{
-+#ifdef DEBUG
-+		  fprintf (stderr, "found id %x\n", this_id);
-+#endif
-+		  if (this_id == id)
-+		    {
-+		      r = parse_pubkey (++p);
-+		      break;
-+		    }
-+		}
-+	    }
-+	}
-+      fclose (fp);
-+    }
-+
-+  g_free (filename);
-+  return r;
-+}
-+
-+static void
-+free_pubkey (struct rsa_key *k)
-+{
-+  gcry_mpi_release (k->n);
-+  gcry_mpi_release (k->e);
-+
-+  g_free (k);
-+}
-+
-+static gboolean
-+gtk_migration_auth_validate_request (char *display, char *data)
-+{
-+  u_int32_t key_id;
-+  char *ep;
-+  char *p;
-+  struct rsa_key *k;
-+  char hash[20];
-+  gboolean rc;
-+
-+  p = strchr (data, ' ');
-+  if (p == NULL)
-+    return FALSE;
-+  *p++ = 0;
-+
-+  key_id = strtoul (data, &ep, 16);
-+  if (*ep)
-+    return FALSE;
-+
-+  k = lookup_pubkey (key_id);
-+  if (k == NULL)
-+    return FALSE;
-+
-+  gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, 
-+			   strlen (gtk_migration_auth_challenge_string), hash);
-+
-+  rc = gtk_migration_crypt_check_signature (k, hash, p);
-+
-+  free_pubkey (k);
-+
-+  return rc;
-+}
-+
-+static int
-+do_change_display (GtkWidget *w, char *display_name)
-+{
-+  GdkDisplay *newdisplay;
-+  guint screen_nr = 1;
-+  guint i;
-+
-+  if (display_name[0] == 0)
-+    return DISPLAY_CHANGE_INDETERMINATE_ERROR;
-+
-+  i = strlen (display_name) - 1;
-+  while (i > 0 && isdigit (display_name[i]))
-+    i--;
-+
-+  if (display_name[i] == '.')
-+    {
-+      screen_nr = atoi (display_name + i + 1);
-+      display_name[i] = 0;
-+    }
-+
-+  newdisplay = gdk_display_open (display_name);
-+  if (newdisplay)
-+    {
-+      GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr);
-+      if (screen)
-+	{
-+	  gtk_window_set_screen (GTK_WINDOW (w), screen);
-+	  gdk_display_manager_set_default_display (gdk_display_manager_get (),
-+						   newdisplay);
-+	  return DISPLAY_CHANGE_SUCCESS;
-+	}
-+      else
-+	return DISPLAY_CHANGE_NO_SUCH_SCREEN;
-+    }
-+
-+  return DISPLAY_CHANGE_UNABLE_TO_CONNECT;
-+}
-+
-+static void
-+set_challenge_on_window (GdkWindow *window)
-+{
-+  gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom,
-+		       8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, 
-+		       strlen (gtk_migration_auth_challenge_string));
-+}
-+
-+static void
-+update_challenge_on_windows (void)
-+{
-+  GSList *i;
-+
-+  gtk_migration_auth_update_challenge ();
-+
-+  for (i = all_widgets; i; i = i->next)
-+    {
-+      GtkWidget *w = GTK_WIDGET (i->data);
-+      if (w->window)
-+	set_challenge_on_window (w->window);
-+    }
-+}
-+
-+static void
-+reset_state (GdkWindow *window)
-+{
-+  gdk_property_change (window, display_change_gdkatom, string_gdkatom,
-+		       8, GDK_PROP_MODE_REPLACE, NULL, 0);
-+}
-+
-+static void
-+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code)
-+{
-+  XClientMessageEvent ev;
-+  Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, 
-+						 display_change_gdkatom);
-+  
-+  memset (&ev, 0, sizeof (ev));
-+  
-+  ev.type = ClientMessage;
-+  ev.window = window;
-+  ev.message_type = atom;
-+  ev.format = 32;
-+  
-+  ev.data.l[0] = window;
-+  ev.data.l[1] = code;
-+  
-+  XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev);
-+}
-+
-+static int
-+handle_request (GdkWindow *gwindow, char *prop)
-+{
-+  GtkWidget *widget;
-+  char *target, *auth_method, *auth_data;
-+  char *p;
-+
-+  target = prop;
-+  auth_method = "NULL";
-+  auth_data = NULL;
-+
-+  p = strchr (prop, ' ');
-+  if (p)
-+    {
-+      *p = 0;
-+      auth_method = ++p;
-+      
-+      p = strchr (p, ' ');
-+      if (p)
-+	{
-+	  *p = 0;
-+	  auth_data = ++p;
-+	}
-+    }
-+
-+  if (no_auth == FALSE)
-+    {
-+      if (!strcasecmp (auth_method, "null"))
-+	return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+      else if (!strcasecmp (auth_method, "rsa-sig"))
-+	{
-+	  if (gtk_migration_auth_validate_request (target, auth_data) == FALSE)
-+	    return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+	}
-+      else
-+	return DISPLAY_CHANGE_AUTHENTICATION_BAD;
-+    }
-+
-+  gdk_window_get_user_data (gwindow, (gpointer*) &widget);
-+
-+  if (widget)
-+    return do_change_display (widget, target);
-+
-+  return DISPLAY_CHANGE_INDETERMINATE_ERROR;
-+}
-+
-+static GdkFilterReturn 
-+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p)
-+{
-+  XPropertyEvent *xev = (XPropertyEvent *)xevp;
-+
-+  if (xev->type == PropertyNotify)
-+    {
-+      GdkDisplay *gdisplay;
-+      Atom atom;
-+
-+      gdisplay = gdk_x11_lookup_xdisplay (xev->display);
-+      if (gdisplay)
-+	{
-+	  atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom);
-+
-+	  if (xev->atom == atom)
-+	    {
-+	      GdkWindow *gwindow;
-+	      
-+	      gwindow = gdk_window_lookup_for_display (gdisplay, xev->window);
-+	      
-+	      if (gwindow)
-+		{
-+		  GdkAtom actual_type;
-+		  gint actual_format;
-+		  gint actual_length;
-+		  unsigned char *prop = NULL;
-+		  
-+		  if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom,
-+					0, G_MAXLONG, FALSE, &actual_type, &actual_format,
-+					&actual_length, &prop))
-+		    {
-+		      if (actual_length != 0)
-+			{
-+			  if (actual_type == string_gdkatom && actual_length > 8)
-+			    {
-+			      gchar *buf = g_malloc (actual_length + 1);
-+			      int rc;
-+			      
-+			      memcpy (buf, prop, actual_length);
-+			      buf[actual_length] = 0;
-+			      
-+			      rc = handle_request (gwindow, buf);
-+			      
-+			      g_free (buf);
-+			      generate_response (gdisplay, xev->display, xev->window, rc);
-+			      
-+			      if (rc == DISPLAY_CHANGE_SUCCESS)
-+				update_challenge_on_windows ();
-+			    }
-+			  
-+			  reset_state (gwindow);
-+			}
-+		    }
-+		  
-+		  if (prop)
-+		    g_free (prop);
-+		}
-+	    }
-+	  
-+	  return GDK_FILTER_REMOVE;
-+	}
-+    }
-+
-+  return GDK_FILTER_CONTINUE;
-+}
-+
-+static void
-+unrealize_window (GtkWidget *w)
-+{
-+  all_widgets = g_slist_remove (all_widgets, w);
-+}
-+
-+void
-+gtk_migration_mark_window (GtkWidget *w)
-+{
-+  if (! gtk_migration_initialised)
-+    {
-+      g_warning ("gtk_migration not initialised yet");
-+      return;
-+    }
-+
-+  if (GTK_WIDGET_REALIZED (w))
-+    {
-+      GdkWindow *window = w->window;
-+      
-+      gdk_window_add_filter (window, filter_func, NULL);
-+
-+      reset_state (window);
-+      set_challenge_on_window (window);
-+
-+      all_widgets = g_slist_append (all_widgets, w);
-+
-+      g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL);
-+    }
-+  else
-+    g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL);
-+}
-+
-+void
-+gtk_migration_init (void)
-+{
-+  if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL)
-+    no_auth = TRUE;
-+
-+  string_gdkatom = gdk_atom_intern ("STRING", FALSE);
-+  display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE);
-+  rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE);
-+
-+  gtk_migration_auth_generate_challenge ();
-+
-+  gtk_migration_initialised = TRUE;
-+}
---- gtk/gtkwindow.c~	2006-07-05 13:07:08.000000000 +0200
-+++ gtk/gtkwindow.c	2006-07-05 13:07:08.000000000 +0200
-@@ -50,6 +50,9 @@
- #include "x11/gdkx.h"
- #endif
- 
-+extern void gtk_migration_mark_window (GtkWidget *w);
-+                                                               
-+
- enum {
-   SET_FOCUS,
-   FRAME_EVENT,
-@@ -823,6 +826,10 @@
- 
-   g_signal_connect (window->screen, "composited_changed",
- 		    G_CALLBACK (gtk_window_on_composited_changed), window);
-+		    
-+#ifdef ENABLE_MIGRATION
-+  gtk_migration_mark_window (window);
-+#endif
- }
- 
- static void
diff --git a/packages/gtk+/gtk+-2.10.1/no-demos.patch b/packages/gtk+/gtk+-2.10.1/no-demos.patch
deleted file mode 100644
index 0fc4c48d1a..0000000000
--- a/packages/gtk+/gtk+-2.10.1/no-demos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
-+++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Makefile.am for GTK+
- 
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
- 
- # require automake 1.4
diff --git a/packages/gtk+/gtk+-2.10.1/no-xwc.patch b/packages/gtk+/gtk+-2.10.1/no-xwc.patch
deleted file mode 100644
index affb4a303e..0000000000
--- a/packages/gtk+/gtk+-2.10.1/no-xwc.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c	2004-11-30 14:57:14 +00:00
-+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c	2005-01-02 15:38:06 +00:00
-@@ -576,12 +576,14 @@
- 			 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
- 	}
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
-       XmbDrawString (xdisplay, impl->xid,
- 		     fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-@@ -613,6 +615,7 @@
-                    GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
-       g_free (text_8bit);
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
-@@ -633,6 +636,7 @@
- 	  g_free (text_wchar);
- 	}
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c	2004-08-26 01:23:46 +01:00
-+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c	2005-01-02 15:45:39 +00:00
-@@ -525,10 +525,12 @@
- 	  width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
- 	}
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       width = XmbTextEscapement (fontset, text, text_length);
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -578,6 +580,7 @@
-           width = 0;
-         }
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
- 	{
-@@ -595,6 +598,7 @@
- 	  g_free (text_wchar);
- 	}
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -667,6 +671,7 @@
-       if (descent)
- 	*descent = overall.descent;
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       XmbTextExtents (fontset, text, text_length, &ink, &logical);
-@@ -681,6 +686,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
-@@ -753,6 +759,7 @@
- 	  *descent = overall.descent;
- 	break;
-       }
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
- 
-@@ -780,6 +787,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
-diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c	2004-11-17 00:55:10 +00:00
-+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c	2005-01-02 15:42:04 +00:00
-@@ -48,6 +48,7 @@
- void
- _gdk_x11_initialize_locale (void)
- {
-+#ifdef HAVE_XWC
-   wchar_t result;
-   gchar *current_locale;
-   static char *last_locale = NULL;
-@@ -93,7 +94,8 @@
-   GDK_NOTE (XIM,
- 	    g_message ("%s multi-byte string functions.", 
- 		       gdk_use_mb ? "Using" : "Not using"));
--  
-+#endif
-+    
-   return;
- }
- 
-@@ -136,6 +138,7 @@
- {
-   gchar *mbstr;
- 
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -178,6 +181,7 @@
-       XFree (tpr.value);
-     }
-   else
-+#endif
-     {
-       gint length = 0;
-       gint i;
-@@ -210,6 +214,7 @@
- gint
- gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
- {
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -242,6 +247,7 @@
-       return len_cpy;
-     }
-   else
-+#endif
-     {
-       gint i;
- 
diff --git a/packages/gtk+/gtk+-2.10.1/run-iconcache.patch b/packages/gtk+/gtk+-2.10.1/run-iconcache.patch
deleted file mode 100644
index f0bb6ba842..0000000000
--- a/packages/gtk+/gtk+-2.10.1/run-iconcache.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gtk+-2.10.0/gtk/Makefile.am~	2006-07-05 16:49:16.000000000 +0200
-+++ gtk+-2.10.0/gtk/Makefile.am	2006-07-05 16:49:16.000000000 +0200
-@@ -1088,11 +1088,11 @@
- 	done									\
- 	&& touch stamp-icons
- 
--gtkbuiltincache.h: @REBUILD@ stamp-icons
--	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
--	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
--	   ./gtk-update-icon-cache --force --ignore-theme-index 		\
--	   --source builtin_icons stock-icons > gtkbuiltincache.h
-+#gtkbuiltincache.h: @REBUILD@ stamp-icons
-+#	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
-+#	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
-+#	   ./gtk-update-icon-cache --force --ignore-theme-index 		\
-+#	   --source builtin_icons stock-icons > gtkbuiltincache.h
- 
- EXTRA_DIST +=                   \
- 	$(STOCK_ICONS)		\
diff --git a/packages/gtk+/gtk+-2.10.1/scroll-timings.patch b/packages/gtk+/gtk+-2.10.1/scroll-timings.patch
deleted file mode 100644
index 3f823a7880..0000000000
--- a/packages/gtk+/gtk+-2.10.1/scroll-timings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.10.0/gtk/gtkrange.c.orig	2006-07-05 12:41:39.000000000 +0200
-+++ gtk+-2.10.0/gtk/gtkrange.c	2006-07-05 12:41:58.000000000 +0200
-@@ -39,7 +39,7 @@
- #include "gtkalias.h"
- 
- #define SCROLL_DELAY_FACTOR 5    /* Scroll repeat multiplier */
--#define UPDATE_DELAY        300  /* Delay for queued update */
-+#define UPDATE_DELAY        1000  /* Delay for queued update */
- 
- enum {
-   PROP_0,
diff --git a/packages/gtk+/gtk+-2.10.1/single-click.patch b/packages/gtk+/gtk+-2.10.1/single-click.patch
deleted file mode 100644
index 3bb208d4d6..0000000000
--- a/packages/gtk+/gtk+-2.10.1/single-click.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c
---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c	2005-04-06 16:57:04 +01:00
-+++ gtk+-2.6.3/gtk/gtkcalendar.c	2005-04-06 20:05:18 +01:00
-@@ -1023,9 +1023,11 @@
- 	}
- 
-       gtk_calendar_select_and_focus_day (calendar, day);
--    }
-+      
-+      // This change causes the calendar to disappear after choosing a day
-+/*    }
-   else if (event->type == GDK_2BUTTON_PRESS)
--    {
-+    {*/
-       private_data->in_drag = 0;
-       if (day_month == MONTH_CURRENT)
- 	g_signal_emit (calendar,
-diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c
---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c	2005-04-06 16:57:07 +01:00
-+++ gtk+-2.6.3/gtk/gtkfilesel.c	2005-04-07 13:40:32 +01:00
-@@ -2468,6 +2468,33 @@
-       if (fs->last_selected != NULL)
- 	g_free (fs->last_selected);
- 
-+      // Single-click directory entry	
-+  	  if (new_names->len == 1)
-+  	    {
-+  	      GtkTreeView *tree_view;
-+  	      GtkTreeModel *model;
-+  	      GtkTreePath *path;
-+          GtkTreeIter iter;  
-+          gboolean is_file;
-+
-+          tree_view = gtk_tree_selection_get_tree_view (selection);
-+          
-+          if (gtk_tree_selection_get_selected (selection, &model, &iter))
-+            {
-+              path = gtk_tree_model_get_path (model, &iter);              
-+              gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
-+
-+              if (!is_file)
-+                {
-+                  gtk_file_selection_dir_activate (tree_view, path, 
-+                          gtk_tree_view_get_column (tree_view, DIR_COLUMN),
-+                          user_data);
-+                }
-+                
-+              gtk_tree_path_free (path);
-+            }
-+        }
-+        
-       fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
-       filename = get_real_filename (fs->last_selected, FALSE);
- 
diff --git a/packages/gtk+/gtk+-2.10.1/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.1/small-gtkfilesel.patch
deleted file mode 100644
index 20bf4cf366..0000000000
--- a/packages/gtk+/gtk+-2.10.1/small-gtkfilesel.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c	2004-07-10 05:02:10.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkfilesel.c	2004-09-13 13:40:09.000000000 +0100
-@@ -68,6 +68,7 @@
- #include "gtkprivate.h"
- #include "gtkscrolledwindow.h"
- #include "gtkstock.h"
-+#include "gtksignal.h"
- #include "gtktreeselection.h"
- #include "gtktreeview.h"
- #include "gtkvbox.h"
-@@ -77,6 +78,7 @@
- #include "gtkmessagedialog.h"
- #include "gtkdnd.h"
- #include "gtkeventbox.h"
-+#include "gtkimage.h"
- 
- #undef GTK_DISABLE_DEPRECATED
- #include "gtkoptionmenu.h"
-@@ -245,7 +247,8 @@
- };
- 
- enum {
--  DIR_COLUMN
-+  DIR_COLUMN,
-+  ISFILE_COLUMN
- };
- 
- enum {
-@@ -400,6 +403,12 @@
- 					      GtkTreePath       *path,
- 					      GtkTreeViewColumn *column,
- 					      gpointer           user_data);
-+
-+static void gtk_file_selection_activate (GtkTreeView       *tree_view,
-+					 GtkTreePath       *path,
-+					 GtkTreeViewColumn *column,
-+					 gpointer           user_data);
-+
- static void gtk_file_selection_file_changed  (GtkTreeSelection  *selection,
- 					      gpointer           user_data);
- static void gtk_file_selection_dir_activate  (GtkTreeView       *tree_view,
-@@ -419,6 +428,7 @@
- static void gtk_file_selection_create_dir  (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
-+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle  *prev_style);
- 
- static void free_selected_names (GPtrArray *names);
- 
-@@ -578,6 +588,23 @@
- 							 G_PARAM_WRITABLE));
-   object_class->destroy = gtk_file_selection_destroy;
-   widget_class->map = gtk_file_selection_map;
-+  widget_class->style_set = gtk_file_selection_style_set;
-+
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_boolean ("show_fileops_default",
-+								 _("Show fileop buttons by default"),
-+								 _("Whether file operation buttons are shown by default"),
-+								 TRUE,
-+								 G_PARAM_READABLE));
-+
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("border_width",
-+                                                             _("Border width"),
-+                                                             _("Width of border around the main dialog area"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             10,
-+                                                             G_PARAM_READABLE));
- }
- 
- static void gtk_file_selection_set_property (GObject         *object,
-@@ -649,7 +676,29 @@
-   gtk_widget_grab_default (widget);
-   return FALSE;
- }
--     
-+
-+static void
-+gtk_file_selection_style_set (GtkWidget *filesel,
-+			      GtkStyle  *prev_style)
-+{     
-+  gboolean show_fileops;
-+  gint border_width;
-+
-+  gtk_widget_style_get (filesel,
-+                        "show_fileops_default",
-+                        &show_fileops,
-+			"border_width",
-+			&border_width,
-+			NULL);
-+
-+  gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
-+
-+  if (show_fileops)
-+    gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+  else
-+    gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+}
-+
- static void
- gtk_file_selection_init (GtkFileSelection *filesel)
- {
-@@ -674,17 +723,15 @@
- 
-   /* The dialog-sized vertical box  */
-   filesel->main_vbox = dialog->vbox;
--  gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
- 
-   /* The horizontal box containing create, rename etc. buttons */
-   filesel->button_area = gtk_hbutton_box_new ();
-   gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
--  gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
-   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, 
- 		      FALSE, FALSE, 0);
-   gtk_widget_show (filesel->button_area);
-   
--  gtk_file_selection_show_fileop_buttons (filesel);
-+  gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
- 
-   /* hbox for pulldown menu */
-   pulldown_hbox = gtk_hbox_new (TRUE, 5);
-@@ -723,25 +770,32 @@
-   
-   /* The directories list */
- 
--  model = gtk_list_store_new (1, G_TYPE_STRING);
-+  model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
-   filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-   g_object_unref (model);
- 
--  column = gtk_tree_view_column_new_with_attributes (_("Folders"),
-+  column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
- 						     gtk_cell_renderer_text_new (),
- 						     "text", DIR_COLUMN,
- 						     NULL);
-   label = gtk_label_new_with_mnemonic (_("Fol_ders"));
-   gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
-   gtk_widget_show (label);
--  gtk_tree_view_column_set_widget (column, label);
-+
-+  /* gtk_tree_view_column_set_widget (column, label); */
-+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
-+
-   gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-   gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
- 
-   gtk_widget_set_size_request (filesel->dir_list,
- 			       DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
-   g_signal_connect (filesel->dir_list, "row_activated",
--		    G_CALLBACK (gtk_file_selection_dir_activate), filesel);
-+		    G_CALLBACK (gtk_file_selection_activate), filesel);
-+
-+  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
-+		    G_CALLBACK (gtk_file_selection_file_changed), filesel);
-+
- 
-   /*  gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
- 
-@@ -758,41 +812,6 @@
-   gtk_widget_show (filesel->dir_list);
-   gtk_widget_show (scrolled_win);
- 
--  /* The files list */
--  model = gtk_list_store_new (1, G_TYPE_STRING);
--  filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
--  g_object_unref (model);
--
--  column = gtk_tree_view_column_new_with_attributes (_("Files"),
--						     gtk_cell_renderer_text_new (),
--						     "text", FILE_COLUMN,
--						     NULL);
--  label = gtk_label_new_with_mnemonic (_("_Files"));
--  gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
--  gtk_widget_show (label);
--  gtk_tree_view_column_set_widget (column, label);
--  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
--  gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
--
--  gtk_widget_set_size_request (filesel->file_list,
--			       FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
--  g_signal_connect (filesel->file_list, "row_activated",
--		    G_CALLBACK (gtk_file_selection_file_activate), filesel);
--  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
--		    G_CALLBACK (gtk_file_selection_file_changed), filesel);
--
--  /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
--
--  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
--  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
--  gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
--  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
--				  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
--  gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
--  gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
--  gtk_widget_show (filesel->file_list);
--  gtk_widget_show (scrolled_win);
--
-   /* 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, 
-@@ -2008,6 +2027,23 @@
- }
- 
- static void
-+gtk_file_selection_activate (GtkTreeView       *tree_view,
-+			     GtkTreePath       *path,
-+			     GtkTreeViewColumn *column,
-+			     gpointer           user_data)
-+{
-+  GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
-+  GtkTreeIter iter;  
-+  gboolean is_file;
-+
-+  gtk_tree_model_get_iter (model, &iter, path);
-+  gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
-+
-+  if (! is_file)
-+    gtk_file_selection_dir_activate (tree_view, path, column, user_data);
-+}
-+
-+static void
- gtk_file_selection_file_activate (GtkTreeView       *tree_view,
- 				  GtkTreePath       *path,
- 				  GtkTreeViewColumn *column,
-@@ -2103,7 +2139,6 @@
-   PossibleCompletion* poss;
-   GtkTreeIter iter;
-   GtkListStore *dir_model;
--  GtkListStore *file_model;
-   gchar* filename;
-   gchar* rem_path = rel_path;
-   gchar* sel_text;
-@@ -2125,10 +2160,8 @@
-   g_assert (cmpl_state->reference_dir);
- 
-   dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
--  file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
- 
-   gtk_list_store_clear (dir_model);
--  gtk_list_store_clear (file_model);
- 
-   /* Set the dir list to include ./ and ../ */
-   gtk_list_store_append (dir_model, &iter);
-@@ -2150,13 +2183,17 @@
-                   strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
- 		{
- 		  gtk_list_store_append (dir_model, &iter);
--		  gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
-+		  gtk_list_store_set (dir_model, &iter, 
-+				      DIR_COLUMN, filename, 
-+				      ISFILE_COLUMN, FALSE, -1);
- 		}
- 	    }
-           else
- 	    {
--	      gtk_list_store_append (file_model, &iter);
--	      gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
-+	      gtk_list_store_append (dir_model, &iter);
-+	      gtk_list_store_set (dir_model, &iter, 
-+				  DIR_COLUMN, filename, 
-+				  ISFILE_COLUMN, TRUE, -1);
-             }
- 	}
- 
diff --git a/packages/gtk+/gtk+-2.10.1/spinbutton.patch b/packages/gtk+/gtk+-2.10.1/spinbutton.patch
deleted file mode 100644
index 8ad7507af0..0000000000
--- a/packages/gtk+/gtk+-2.10.1/spinbutton.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- gtk+-2.4.3/gtk/gtkspinbutton.c.old	2004-04-22 14:49:27.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtkspinbutton.c	2004-06-30 21:48:18.000000000 +0100
-@@ -733,7 +733,7 @@
- 
-   spin = GTK_SPIN_BUTTON (widget);
-   arrow_size = spin_button_get_arrow_size (spin);
--  panel_width = arrow_size + 2 * widget->style->xthickness;
-+  panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
-   
-   widget->allocation = *allocation;
-   
-@@ -866,19 +866,16 @@
-     {
-       width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
- 
-+      y = widget->style->ythickness;
-+      height = widget->requisition.height - (2 * y);
-+
-       if (arrow_type == GTK_ARROW_UP)
- 	{
- 	  x = 0;
--	  y = 0;
--
--	  height = widget->requisition.height / 2;
- 	}
-       else
- 	{
--	  x = 0;
--	  y = widget->requisition.height / 2;
--
--	  height = (widget->requisition.height + 1) / 2;
-+	  x = width;
- 	}
- 
-       if (spin_button_at_limit (spin_button, arrow_type))
-@@ -908,32 +905,17 @@
- 	      shadow_type = GTK_SHADOW_OUT;
- 	    }
- 	}
--      
-+
-       gtk_paint_box (widget->style, spin_button->panel,
- 		     state_type, shadow_type,
- 		     NULL, widget,
--		     (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
-+		     NULL,
- 		     x, y, width, height);
- 
-       height = widget->requisition.height;
- 
--      if (arrow_type == GTK_ARROW_DOWN)
--	{
--	  y = height / 2;
--	  height = height - y - 2;
--	}
--      else
--	{
--	  y = 2;
--	  height = height / 2 - 2;
--	}
--
-       width -= 3;
--
--      if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
--	x = 2;
--      else
--	x = 1;
-+      height -= 3;
- 
-       w = width / 2;
-       w -= w % 2 - 1; /* force odd */
-@@ -1108,7 +1090,7 @@
- 	  if (GTK_ENTRY (widget)->editable)
- 	    gtk_spin_button_update (spin);
- 	  
--	  if (event->y <= widget->requisition.height / 2)
-+	  if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
- 	    {
- 	      if (event->button == 1)
- 		start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
-@@ -1143,44 +1125,11 @@
- 
-   arrow_size = spin_button_get_arrow_size (spin);
- 
--  if (event->button == spin->button)
--    {
--      int click_child = spin->click_child;
-+  gtk_spin_button_stop_spinning (spin);
- 
--      gtk_spin_button_stop_spinning (spin);
--
--      if (event->button == 3)
--	{
--	  if (event->y >= 0 && event->x >= 0 && 
--	      event->y <= widget->requisition.height &&
--	      event->x <= arrow_size + 2 * widget->style->xthickness)
--	    {
--	      if (click_child == GTK_ARROW_UP &&
--		  event->y <= widget->requisition.height / 2)
--		{
--		  gdouble diff;
--
--		  diff = spin->adjustment->upper - spin->adjustment->value;
--		  if (diff > EPSILON)
--		    gtk_spin_button_real_spin (spin, diff);
--		}
--	      else if (click_child == GTK_ARROW_DOWN &&
--		       event->y > widget->requisition.height / 2)
--		{
--		  gdouble diff;
--
--		  diff = spin->adjustment->value - spin->adjustment->lower;
--		  if (diff > EPSILON)
--		    gtk_spin_button_real_spin (spin, -diff);
--		}
--	    }
--	}		  
--      spin_button_redraw (spin);
-+  spin_button_redraw (spin);
- 
--      return TRUE;
--    }
--  else
--    return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
-+  return TRUE;
- }
- 
- static gint
diff --git a/packages/gtk+/gtk+-2.10.1/xsettings.patch b/packages/gtk+/gtk+-2.10.1/xsettings.patch
deleted file mode 100644
index b63e262d34..0000000000
--- a/packages/gtk+/gtk+-2.10.1/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old	Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c	Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void 
diff --git a/packages/gtk+/gtk+_2.10.0.bb b/packages/gtk+/gtk+_2.10.0.bb
deleted file mode 100644
index 1f8087cd64..0000000000
--- a/packages/gtk+/gtk+_2.10.0.bb
+++ /dev/null
@@ -1,91 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
-set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
-HOMEPAGE = "http://www.gtk.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r4"
-
-# disable per default - untested and not all patches included.
-DEFAULT_PREFERENCE = "-1" 
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-	   file://disable-tooltips.patch;patch=1 \
-	   file://gtklabel-resize-patch;patch=1 \
-	   file://menu-deactivate.patch;patch=1 \
-	   file://xsettings.patch;patch=1 \
-	   file://scroll-timings.patch;patch=1 \
-	   file://small-gtkfilesel.patch;patch=1 \
-	   file://migration.patch;patch=1;pnum=0 \
-           file://run-iconcache.patch;patch=1 \
-           file://disable-print.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1"
-#           file://no-demos.patch;patch=1
-#           file://gtk+-handhelds.patch;patch=1
-#	   file://single-click.patch;patch=1
-#	   file://spinbutton.patch;patch=1 \
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
-	${bindir}/gtk-query-immodules-2.0 \
-	${libdir}/lib*.so.* \
-	${datadir}/themes ${sysconfdir} \
-	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
-
-RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
-RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
-RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
-
-EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
-
-LIBV = "2.10.0"
-
-do_stage () {
-	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
-	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
-	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/gtk-2.0
-}
-
-postinst_prologue() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-}
-
-PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
-
-python populate_packages_prepend () {
-	import os.path
-
-	prologue = bb.data.getVar("postinst_prologue", d, 1)
-
-	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
-	loaders_root = os.path.join(gtk_libdir, 'loaders')
-	immodules_root = os.path.join(gtk_libdir, 'immodules')
-	printmodules_root = os.path.join(gtk_libdir, 'printbackends');
-
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
-	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
-
-        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
-}
diff --git a/packages/gtk+/gtk+_2.10.1.bb b/packages/gtk+/gtk+_2.10.1.bb
deleted file mode 100644
index 462c0d725e..0000000000
--- a/packages/gtk+/gtk+_2.10.1.bb
+++ /dev/null
@@ -1,91 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
-set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
-HOMEPAGE = "http://www.gtk.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r1"
-
-# disable per default - untested and not all patches included.
-DEFAULT_PREFERENCE = "-1" 
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-	   file://disable-tooltips.patch;patch=1 \
-	   file://gtklabel-resize-patch;patch=1 \
-	   file://menu-deactivate.patch;patch=1 \
-	   file://xsettings.patch;patch=1 \
-	   file://scroll-timings.patch;patch=1 \
-	   file://small-gtkfilesel.patch;patch=1 \
-	   file://migration.patch;patch=1;pnum=0 \
-           file://run-iconcache.patch;patch=1 \
-           file://disable-print.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1"
-#           file://gtk+-handhelds.patch;patch=1
-#	   file://single-click.patch;patch=1
-#	   file://spinbutton.patch;patch=1 \
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
-	${bindir}/gtk-query-immodules-2.0 \
-	${libdir}/lib*.so.* \
-	${datadir}/themes ${sysconfdir} \
-	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
-
-RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
-RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
-RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
-
-EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
-
-LIBV = "2.10.0"
-
-do_stage () {
-	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
-	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
-	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/gtk-2.0
-}
-
-postinst_prologue() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-}
-
-PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
-
-python populate_packages_prepend () {
-	import os.path
-
-	prologue = bb.data.getVar("postinst_prologue", d, 1)
-
-	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
-	loaders_root = os.path.join(gtk_libdir, 'loaders')
-	immodules_root = os.path.join(gtk_libdir, 'immodules')
-	printmodules_root = os.path.join(gtk_libdir, 'printbackends');
-
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
-	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
-
-        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
-}
diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb
index 462c0d725e..700d051ce9 100644
--- a/packages/gtk+/gtk+_2.10.3.bb
+++ b/packages/gtk+/gtk+_2.10.3.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r1"
+PR = "r2"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
@@ -31,11 +31,23 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
 inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+	${bindir}/gtk-update-icon-cache \
 	${bindir}/gtk-query-immodules-2.0 \
 	${libdir}/lib*.so.* \
 	${datadir}/themes ${sysconfdir} \
 	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dev += " \
+        ${datadir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+        ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dbg += " \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
+
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
 RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb
index 583dd6466e..c2fe05f24d 100644
--- a/packages/gtk+/gtk+_2.6.10.bb
+++ b/packages/gtk+/gtk+_2.6.10.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://help.patch;patch=1 \
@@ -27,11 +27,23 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
 inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+	${bindir}/gtk-update-icon-cache \
 	${bindir}/gtk-query-immodules-2.0 \
 	${libdir}/lib*.so.* \
 	${datadir}/themes ${sysconfdir} \
 	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dev += " \
+        ${datadir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+        ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dbg += " \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
+
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
 
diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb
index 5c21b8f587..aba00cd90d 100644
--- a/packages/gtk+/gtk+_2.8.16.bb
+++ b/packages/gtk+/gtk+_2.8.16.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -36,7 +36,17 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${libdir}/lib*.so.* \
 	${datadir}/themes ${sysconfdir} \
 	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dev += " \
+        ${datadir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+        ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dbg += " \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
 
diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb
index f1e9208e40..19b295c9a8 100644
--- a/packages/gtk+/gtk+_2.8.9.bb
+++ b/packages/gtk+/gtk+_2.8.9.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
@@ -31,8 +31,18 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${datadir}/themes ${sysconfdir} \
 	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so \
 	${bindir}/gtk-update-icon-cache"
+FILES_${PN}-dev += " \
+        ${datadir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/include \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
+        ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+        ${bindir}/gdk-pixbuf-csource"
+FILES_${PN}-dbg += " \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
+        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
 
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
 RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
author	Koen Kooi <koen@openembedded.org>	2006-10-22 13:13:55 +0000
committer	Koen Kooi <koen@openembedded.org>	2006-10-22 13:13:55 +0000
commit	9e145f35844fafa4ac278050d0ceedb4a064fcc9 (patch)
tree	2d45eeedff7398ce6a62862a1bdc2c08df6bb518 /packages/gtk+
parent	1aa0895dbfcc33e9d5b8c6c3f5d866545a81aaf4 (diff)