merge of 'ac0a9c999fff927332161754b955e88ec59fae08'

     and 'f3a8dc0cd974c16c68c93c22d8630c7fa3f535e6'

21 files changed, 2184 insertions, 0 deletions

diff --git a/packages/dates/dates_0.3.bb b/packages/dates/dates_0.3.1.bb
index 0870313df1..0870313df1 100644
--- a/packages/dates/dates_0.3.bb
+++ b/packages/dates/dates_0.3.1.bb
diff --git a/packages/gtk+/gtk+-2.10.9/.mtn2git_empty b/packages/gtk+/gtk+-2.10.9/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/.mtn2git_empty
diff --git a/packages/gtk+/gtk+-2.10.9/automake-lossage.patch b/packages/gtk+/gtk+-2.10.9/automake-lossage.patch
new file mode 100644
index 0000000000..0d423ddbb9
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/automake-lossage.patch
@@ -0,0 +1,24 @@
+--- 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.9/disable-print.patch b/packages/gtk+/gtk+-2.10.9/disable-print.patch
new file mode 100644
index 0000000000..1067773f12
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/disable-print.patch
@@ -0,0 +1,50 @@
+--- 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.9/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch
new file mode 100644
index 0000000000..d71d839c3c
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch
@@ -0,0 +1,11 @@
+--- 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.9/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.9/gnome-bug-341177.patch
new file mode 100644
index 0000000000..c31868462a
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/gnome-bug-341177.patch
@@ -0,0 +1,217 @@
+diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c
+--- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c	Tue Jul 12 18:58:57 2005
++++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c	Tue May  9 17:30:53 2006
+@@ -71,35 +71,24 @@ get_check_shift (int check_size)
+   return check_shift;
+ }
+ 
+-static void
+-pixops_scale_nearest (guchar        *dest_buf,
+-		      int            render_x0,
+-		      int            render_y0,
+-		      int            render_x1,
+-		      int            render_y1,
+-		      int            dest_rowstride,
+-		      int            dest_channels,
+-		      gboolean       dest_has_alpha,
+-		      const guchar  *src_buf,
+-		      int            src_width,
+-		      int            src_height,
+-		      int            src_rowstride,
+-		      int            src_channels,
+-		      gboolean       src_has_alpha,
+-		      double         scale_x,
+-		      double         scale_y)
+-{
+-  int i;
+-  int x;
+-  int x_step = (1 << SCALE_SHIFT) / scale_x;
+-  int y_step = (1 << SCALE_SHIFT) / scale_y;
+-  int xmax, xstart, xstop, x_pos, y_pos;
+-  const guchar *p;
++typedef struct { guchar a,b,c; } b3;
++extern void BUG_bad_size_of_struct_b3(void);
+ 
+-#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)     \
++#define INNER_LOOP_PREP()                                       \
++    do {                                                        \
++      x = render_x0 * x_step + x_step / 2;                      \
+       xmax = x + (render_x1 - render_x0) * x_step;              \
+       xstart = MIN (0, xmax);                                   \
+       xstop = MIN (src_width << SCALE_SHIFT, xmax);             \
++    } while(0)
++
++#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\
++    do {                                                        \
++      y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \
++      y_pos = CLAMP (y_pos, 0, src_height - 1);                 \
++      src  = src_buf + y_pos * src_rowstride;                   \
++      dest = dest_buf + i * dest_rowstride;                     \
++      x = render_x0 * x_step + x_step / 2;                      \
+       p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \
+       while (x < xstart)                                        \
+         {                                                       \
+@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar        *des
+           ASSIGN_PIXEL;                                         \
+           dest += DEST_CHANNELS;                                \
+           x += x_step;                                          \
+-        }
++        }                                                       \
++    } while(0)
+ 
+-  for (i = 0; i < (render_y1 - render_y0); i++)
+-    {
+-      const guchar *src;
+-      guchar       *dest;
+-      y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
+-      y_pos = CLAMP (y_pos, 0, src_height - 1);
+-      src  = src_buf + y_pos * src_rowstride;
+-      dest = dest_buf + i * dest_rowstride;
++static void
++pixops_scale_nearest (guchar        *dest_buf,
++		      int            render_x0,
++		      int            render_y0,
++		      int            render_x1,
++		      int            render_y1,
++		      int            dest_rowstride,
++		      int            dest_channels,
++		      gboolean       dest_has_alpha,
++		      const guchar  *src_buf,
++		      int            src_width,
++		      int            src_height,
++		      int            src_rowstride,
++		      int            src_channels,
++		      gboolean       src_has_alpha,
++		      double         scale_x,
++		      double         scale_y)
++{
++  int i;
++  int x;
++  int x_step = (1 << SCALE_SHIFT) / scale_x;
++  int y_step = (1 << SCALE_SHIFT) / scale_y;
++  int xmax, xstart, xstop, x_pos, y_pos;
++  const guchar *p;
+ 
+-      x = render_x0 * x_step + x_step / 2;
++  const guchar *src;
++  guchar       *dest;
+ 
+-      if (src_channels == 3)
+-	{
+-	  if (dest_channels == 3)
+-	    {
+-	      INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]);
+-	    }
+-	  else
+-	    {
+-	      INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff);
+-	    }
+-	}
+-      else if (src_channels == 4)
+-	{
+-	  if (dest_channels == 3)
+-	    {
+-	      INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]);
+-	    }
+-	  else
+-	    {
+-	      guint32 *p32;
+-	      INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p));
+-	    }
+-	}
++  if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3();
++
++  INNER_LOOP_PREP();
++
++  if (src_channels == 3)
++    {
++      if (dest_channels == 3)
++	for (i = 0; i < (render_y1 - render_y0); i++)
++	  INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p);
++      else
++	for (i = 0; i < (render_y1 - render_y0); i++)
++	  INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) );
++    }
++  else if (src_channels == 4)
++    {
++      if (dest_channels == 3)
++	for (i = 0; i < (render_y1 - render_y0); i++)
++	  INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p);
++      else
++	for (i = 0; i < (render_y1 - render_y0); i++)
++	  INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p));
+     }
+ }
+ 
+@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar        
+   const guchar *p;
+   unsigned int  a0;
+ 
++  INNER_LOOP_PREP();
++
+   for (i = 0; i < (render_y1 - render_y0); i++)
+     {
+       const guchar *src;
+       guchar       *dest;
+-      y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
+-      y_pos = CLAMP (y_pos, 0, src_height - 1);
+-      src  = src_buf + y_pos * src_rowstride;
+-      dest = dest_buf + i * dest_rowstride;
+-
+-      x = render_x0 * x_step + x_step / 2;
+       
+-      INNER_LOOP(src_channels, dest_channels,
++      INNER_LOOP_BODY(src_channels, dest_channels,
+ 	  if (src_has_alpha)
+ 	    a0 = (p[3] * overall_alpha) / 0xff;
+ 	  else
+@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar        
+             case 0:
+               break;
+             case 255:
+-              dest[0] = p[0];
+-              dest[1] = p[1];
+-              dest[2] = p[2];
++              *(b3*)dest = *(b3*)p;
+               if (dest_has_alpha)
+                 dest[3] = 0xff;
+               break;
+@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar  
+   const guchar *p;
+   unsigned int  a0;
+ 
++  INNER_LOOP_PREP();
++
+   for (i = 0; i < (render_y1 - render_y0); i++)
+     {
+       const guchar *src;
+       guchar       *dest;
+-      y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
+-      y_pos = CLAMP (y_pos, 0, src_height - 1);
+-      src  = src_buf + y_pos * src_rowstride;
+-      dest = dest_buf + i * dest_rowstride;
+-
+-      x = render_x0 * x_step + x_step / 2;
+-      
+       
+       if (((i + check_y) >> check_shift) & 1)
+ 	{
+@@ -313,7 +307,7 @@ pixops_composite_color_nearest (guchar  
+ 	}
+ 
+       j = 0;
+-      INNER_LOOP(src_channels, dest_channels,
++      INNER_LOOP_BODY(src_channels, dest_channels,
+ 	  if (src_has_alpha)
+ 	    a0 = (p[3] * overall_alpha + 0xff) >> 8;
+ 	  else
+@@ -372,7 +366,8 @@ pixops_composite_color_nearest (guchar  
+ 	);
+     }
+ }
+-#undef INNER_LOOP
++#undef INNER_LOOP_BODY
++#undef INNER_LOOP_PREP
+ 
+ static void
+ composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
diff --git a/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch
new file mode 100644
index 0000000000..1ea86ce6b2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch
@@ -0,0 +1,149 @@
+Index: gtk+-2.10.6/gtk/gtkarrow.c
+===================================================================
+--- gtk+-2.10.6.orig/gtk/gtkarrow.c	2006-05-14 05:25:28.000000000 +0100
++++ gtk+-2.10.6/gtk/gtkarrow.c	2006-11-14 12:03:45.000000000 +0000
+@@ -31,7 +31,7 @@
+ #include "gtkintl.h"
+ #include "gtkalias.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);
+ 
+ 
+ G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
+@@ -88,6 +90,7 @@
+                                                       GTK_PARAM_READWRITE));
+   
+   widget_class->expose_event = gtk_arrow_expose;
++  widget_class->size_request = gtk_arrow_size_request;
+ }
+ 
+ static void
+@@ -143,13 +146,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;
+ }
+Index: gtk+-2.10.6/gtk/gtkentry.c
+===================================================================
+--- gtk+-2.10.6.orig/gtk/gtkentry.c	2006-11-14 12:03:45.000000000 +0000
++++ gtk+-2.10.6/gtk/gtkentry.c	2006-11-14 12:07:02.000000000 +0000
+@@ -577,6 +577,18 @@
+ 						       0.0,
+ 						       GTK_PARAM_READWRITE));
+ 
++  // Added by gtk+-handhelds.patch
++  gtk_widget_class_install_style_property (widget_class,
++                                         g_param_spec_int ("min_width",
++                                         P_("Minimum width"),
++                                         P_("Minimum width of the entry field"),
++                                         0,
++                                         G_MAXINT,
++                                         MIN_ENTRY_WIDTH,
++                                         G_PARAM_READABLE));
++
++
++
+   /**
+    * GtkEntry:truncate-multiline:
+    *
+@@ -1286,7 +1298,7 @@
+ {
+   GtkEntry *entry = GTK_ENTRY (widget);
+   PangoFontMetrics *metrics;
+-  gint xborder, yborder;
++  gint xborder, yborder, min_width;
+   GtkBorder inner_border;
+   PangoContext *context;
+   
+@@ -1302,8 +1314,10 @@
+   _gtk_entry_get_borders (entry, &xborder, &yborder);
+   _gtk_entry_effective_inner_border (entry, &inner_border);
+ 
++  gtk_widget_style_get (widget, "min_width", &min_width, NULL);
++
+   if (entry->width_chars < 0)
+-    requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right;
++    requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right;
+   else
+     {
+       gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
+Index: gtk+-2.10.6/gtk/gtkrange.c
+===================================================================
+--- gtk+-2.10.6.orig/gtk/gtkrange.c	2006-11-14 12:03:44.000000000 +0000
++++ gtk+-2.10.6/gtk/gtkrange.c	2006-11-14 12:07:40.000000000 +0000
+@@ -197,6 +197,7 @@
+ static gboolean      gtk_range_key_press                (GtkWidget     *range,
+ 							 GdkEventKey   *event);
+ 
++static GdkAtom recognize_protocols_atom, atom_atom;
+ 
+ static guint signals[LAST_SIGNAL];
+ 
+@@ -213,6 +214,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);
++
+   gobject_class->set_property = gtk_range_set_property;
+   gobject_class->get_property = gtk_range_get_property;
+   gobject_class->finalize = gtk_range_finalize;
+@@ -1020,6 +1024,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);
+ }
+ 
+@@ -1569,7 +1579,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;
+@@ -1778,7 +1788,7 @@
+       return TRUE;
+     }
+ 
+-  return FALSE;
++  return TRUE;
+ }
+ 
+ /**
diff --git a/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch
new file mode 100644
index 0000000000..df29656343
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch
@@ -0,0 +1,10 @@
+--- 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.9/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch
new file mode 100644
index 0000000000..6adb0cfef6
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch
@@ -0,0 +1,29 @@
+--- /tmp/configure.in	2007-01-08 17:50:49.000000000 +0100
++++ gtk+-2.10.7/configure.in	2007-01-08 17:52:33.495251000 +0100
+@@ -371,7 +371,7 @@
+ case $enable_explicit_deps in
+   auto)
+     export SED
+-    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
+@@ -773,7 +773,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/'`
+@@ -1611,7 +1611,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 SED
+-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.9/integer-pixops.patch b/packages/gtk+/gtk+-2.10.9/integer-pixops.patch
new file mode 100644
index 0000000000..490a60dd8a
--- /dev/null
+++ b/packages/gtk+/gtk+-2.10.9/integer-pixops.patch
@@ -0,0 +1,348 @@
+--- /tmp/config.h.in	2006-12-23 00:00:38.000000000 +0100
++++ gtk+-2.10.6/config.h.in	2006-12-23 00:01:05.632227000 +0100
+@@ -253,3 +253,7 @@
+ 
+ /* Define to `int' if <sys/types.h> doesn't define. */
+ #undef uid_t
++
++/* Define to use integer math rather than floating point where possible.  */
++#undef ENABLE_INTEGER_PIXOPS
++
+--- /tmp/configure.in	2006-12-23 00:02:16.000000000 +0100
++++ gtk+-2.10.6/configure.in	2006-12-23 00:05:11.172227000 +0100
+@@ -203,6 +203,15 @@
+               [AC_HELP_STRING([--disable-rebuilds],
+                               [disable all source autogeneration rules])],,
+               [enable_rebuilds=yes])
++AC_ARG_ENABLE(integer-pixops, 
++              [AC_HELP_STRING([--enable-integer-pixops],
++	                      [use integer math where possible])],,
++	      [enable_integer_pixops=no])
++
++if test "x$enable_integer_pixops" = "xyes"; then
++  AC_DEFINE(ENABLE_INTEGER_PIXOPS)
++fi
++
+ AC_ARG_ENABLE(visibility,
+               [AC_HELP_STRING([--disable-visibility],
+                               [don't use ELF visibility attributes])],,
+--- /tmp/pixops.c	2006-12-23 10:04:02.000000000 +0100
++++ gtk+-2.10.6/gdk-pixbuf/pixops/pixops.c	2006-12-23 10:04:21.772227000 +0100
+@@ -28,6 +28,10 @@
+ #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1)
+ #define SCALE_SHIFT 16
+ 
++#ifdef ENABLE_INTEGER_PIXOPS
++#define FRAC 0x10000ULL
++#endif
++
+ typedef struct _PixopsFilter PixopsFilter;
+ typedef struct _PixopsFilterDimension PixopsFilterDimension;
+ 
+@@ -972,6 +976,29 @@
+   (*pixel_func) (dest, dest_x, dest_channels, dest_has_alpha, src_has_alpha, check_size, color1, color2, r, g, b, a);
+ }
+ 
++#ifdef ENABLE_INTEGER_PIXOPS
++
++static void
++correct_total (int    *weights,
++               int    n_x,
++               int    n_y,
++               int    total,
++               unsigned long overall_alpha)
++{
++  int correction = (int)(overall_alpha - total);
++  int i;
++  for (i = n_x * n_y - 1; i >= 0; i--)
++    {
++      if (*(weights + i) + correction >= 0)
++       {
++         *(weights + i) += correction;
++         break;
++       }
++    }
++}
++
++#else
++
+ static void 
+ correct_total (int    *weights, 
+                int    n_x, 
+@@ -998,6 +1025,8 @@
+     }
+ }
+ 
++#endif
++
+ static int *
+ make_filter_table (PixopsFilter *filter)
+ {
+@@ -1026,7 +1055,11 @@
+               *(pixel_weights + n_x * i + j) = weight;
+             }
+ 
+-        correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha);
++#ifdef ENABLE_INTEGER_PIXOPS   
++        correct_total (pixel_weights, n_x, n_y, total, overall_alpha * FRAC);
++#else
++        correct_total (pixel_weights, n_x, n_y, total, overall_alpha);
++#endif
+       }
+ 
+   return weights;
+@@ -1178,6 +1211,93 @@
+ /* Compute weights for reconstruction by replication followed by
+  * sampling with a box filter
+  */
++#ifdef ENABLE_INTEGER_PIXOPS
++
++static void
++tile_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d)
++{
++  int i_offset, j_offset;
++  unsigned long x_scale = x_scale_d * FRAC;
++  unsigned long y_scale = y_scale_d * FRAC;
++  unsigned long overall_alpha = overall_alpha_d * FRAC;
++  unsigned long x_scale_r = FRAC / x_scale;
++  unsigned long y_scale_r = FRAC / y_scale;
++
++  int n_x = ceil(1/x_scale_d + 1);
++  int n_y = ceil(1/y_scale_d + 1);
++
++  filter->x_offset = 0;
++  filter->y_offset = 0;
++  filter->n_x = n_x;
++  filter->n_y = n_y;
++  filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y);
++
++  for (i_offset=0; i_offset<SUBSAMPLE; i_offset++)
++    for (j_offset=0; j_offset<SUBSAMPLE; j_offset++)
++      {
++       int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y;
++       unsigned long x = j_offset * FRAC / SUBSAMPLE;
++       unsigned long y = i_offset * FRAC / SUBSAMPLE;
++       int i,j;
++       int total = 0;
++
++       for (i = 0; i < n_y; i++)
++         {
++           unsigned long tw, th;
++
++           if (i < y)
++             {
++
++               if (i + FRAC > y)
++                 th = MIN(i+FRAC, y + y_scale_r) - y;
++               else
++                 th = 0;
++             }
++           else
++             {
++               if (y + FRAC/y_scale > i)
++                 th = MIN(i+FRAC, y + y_scale_r) - i;
++               else
++                 th = 0;
++             }
++
++           for (j = 0; j < n_x; j++)
++             {
++               int weight;
++
++               if (j < x)
++                 {
++                   if (j + FRAC > x)
++                     tw = MIN(j+FRAC, x + x_scale_r) - x;
++                   else
++                     tw = 0;
++                 }
++               else
++                 {
++                   if (x + FRAC/x_scale > j)
++                     tw = MIN(j+FRAC, x + x_scale_r) - j;
++                   else
++                     tw = 0;
++                 }
++
++               {
++                 unsigned long lweight = (tw * x_scale) / FRAC;
++                 lweight = (lweight * th) / FRAC;
++                 lweight = (lweight * y_scale) / FRAC;
++                 lweight = (lweight * overall_alpha) / FRAC;
++                 weight = lweight;
++               }
++               total += weight;
++               *(pixel_weights + n_x * i + j) = weight;
++             }
++         }
++
++       correct_total (pixel_weights, n_x, n_y, total, overall_alpha);
++      }
++}
++
++#else 
++ 
+ static void
+ tile_make_weights (PixopsFilterDimension *dim,
+ 		   double                 scale)
+@@ -1216,10 +1336,151 @@
+     }
+ }
+ 
++#endif
++
+ /* Compute weights for a filter that, for minification
+  * is the same as 'tiles', and for magnification, is bilinear
+  * reconstruction followed by a sampling with a delta function.
+  */
++#ifdef ENABLE_INTEGER_PIXOPS
++
++static void
++bilinear_magnify_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d)
++{
++  int i_offset, j_offset;
++  unsigned long *x_weights, *y_weights;
++  int n_x, n_y;
++  unsigned long x_scale = x_scale_d * FRAC;
++  unsigned long y_scale = y_scale_d * FRAC;
++  unsigned long overall_alpha = overall_alpha_d * FRAC;
++  unsigned long x_scale_r = (FRAC / x_scale_d);
++  unsigned long y_scale_r = (FRAC / y_scale_d);
++
++  if (x_scale > FRAC)          /* Bilinear */
++    {
++      n_x = 2;
++      filter->x_offset = 0.5 * (1/x_scale_d - 1);
++    }
++  else                         /* Tile */
++    {
++      n_x = ceil(1.0 + 1.0/x_scale_d);
++      filter->x_offset = 0.0;
++    }
++
++  if (y_scale > FRAC)          /* Bilinear */
++    {
++      n_y = 2;
++      filter->y_offset = 0.5 * (1/y_scale_d - 1);
++    }
++  else                         /* Tile */
++    {
++      n_y = ceil(1.0 + 1.0/y_scale_d);
++      filter->y_offset = 0.0;
++    }
++
++  filter->n_y = n_y;
++  filter->n_x = n_x;
++  filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y);
++
++  x_weights = g_new (unsigned long, n_x);
++  y_weights = g_new (unsigned long, n_y);
++
++  for (i_offset=0; i_offset<SUBSAMPLE; i_offset++)
++    for (j_offset=0; j_offset<SUBSAMPLE; j_offset++)
++      {
++       int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y;
++       unsigned long x = j_offset * FRAC / SUBSAMPLE;
++       unsigned long y = i_offset * FRAC / SUBSAMPLE;
++       int i,j;
++       int total = 0;
++
++       if (x_scale > FRAC)     /* Bilinear */
++         {
++           for (i = 0; i < n_x; i++)
++             {
++               /* x_weights[i] = ((i == 0) ? (1 - x) : x) / x_scale; */
++               unsigned long w = (((i == 0) ? (FRAC - x) : x) * x_scale_r);
++               x_weights[i] = w / FRAC;
++             }
++         }
++       else                    /* Tile */
++         {
++           /*           x
++            * ---------|--.-|----|--.-|-------  SRC
++            * ------------|---------|---------  DEST
++            */
++           for (i = 0; i < n_x; i++)
++             {
++               if (i < x)
++                 {
++                   if (i + 1 > x)
++                     x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (x * FRAC);
++                   else
++                     x_weights[i] = 0;
++                 }
++               else
++                 {
++                   if (x + 1/x_scale > i)
++                     x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (i * FRAC);
++                   else
++                     x_weights[i] = 0;
++                 }
++             }
++         }
++
++       if (y_scale > FRAC)     /* Bilinear */
++         {
++           for (i = 0; i < n_y; i++)
++             {
++               unsigned long w = ((unsigned long)((i == 0) ? (FRAC - y) : y) * y_scale_r);
++               y_weights[i] = w / FRAC;
++             }
++         }
++       else                    /* Tile */
++         {
++           /*           y
++            * ---------|--.-|----|--.-|-------  SRC
++            * ------------|---------|---------  DEST
++            */
++           for (i = 0; i < n_y; i++)
++             {
++               if (i < y)
++                 {
++                   if (i + 1 > y)
++                     y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (y * FRAC);
++                   else
++                     y_weights[i] = 0;
++                 }
++               else
++                 {
++                   if (y + 1/y_scale > i)
++                     y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (i * FRAC);
++                   else
++                     y_weights[i] = 0;
++                 }
++