merge of 1dee375784a345fa0f5a64a238267569e93342c5

     and 3aec9f1e3ffb99d10a3a1025fe75aa3bcbef3e23

44 files changed, 1401 insertions, 119 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 8b2186dec6..ff9aeeab78 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -193,6 +193,7 @@ module_autoload_rfcomm = "rfcomm"
 module_autoload_sa1100-rtc = "sa1100-rtc"
 
 # alias defaults (alphabetically sorted)
+module_conf_af_packet = "alias net-pf-17 af_packet"
 module_conf_bluez = "alias net-pf-31 bluez"
 module_conf_bnep = "alias bt-proto-4 bnep"
 module_conf_hci_uart = "alias tty-ldisc-15 hci_uart"
@@ -229,7 +230,7 @@ python populate_packages_prepend () {
 
 		kernelver = bb.data.getVar('PV', d, 1) + bb.data.getVar('KERNEL_LOCALVERSION', d, 1)
 		kernelver_stripped = kernelver
-		m = re.match('^(.*-hh.*)\..*$', kernelver)
+		m = re.match('^(.*-hh.*)[\.\+].*$', kernelver)
 		if m:
 			kernelver_stripped = m.group(1)
 		path = bb.data.getVar("PATH", d, 1)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a6a137d4de..04603d393d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -319,7 +319,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}"
 # Program to be used to patch sources, use 'inherit patcher' to overwrite this:
 
 PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi'
-PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
+PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
 PATCH_DEPENDS = "quilt-native"
 
 # GNU patch tries to be intellgent about checking out read-only files from
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 9e91dcfbbc..0363bd2f01 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -8,7 +8,7 @@ KERNEL ?= "kernel24"
 OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ipaqpxa h3900"
+IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
 PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
new file mode 100644
index 0000000000..aa97a9f4de
--- /dev/null
+++ b/packages/cairo/cairo_1.0.0.bb
@@ -0,0 +1,15 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "x11 libpng fontconfig libxrender"
+DESCRIPTION = "Cairo graphics library"
+LICENSE = "MPL LGPL"
+PR = "r1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/glib-2.0/glib-2.0_2.8.0.bb b/packages/glib-2.0/glib-2.0_2.8.1.bb
index d377a0aeae..d377a0aeae 100644
--- a/packages/glib-2.0/glib-2.0_2.8.0.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.1.bb
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
index 76884bd09e..14e10e0d5e 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
@@ -4,7 +4,7 @@ PV = "0.16+cvs-${CVSDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser"
 DESCRIPTION = "A lightweight webbrowser for the GPE platform"
 LICENSE = "GPL"
-DEPENDS = "osb-nrcit libgpewidget"
+DEPENDS = "sqlite osb-nrcit libgpewidget"
 DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/gpe-mini-browser"
diff --git a/packages/qc-usb-messenger/.mtn2git_empty b/packages/gtk+/gtk+-2.8.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qc-usb-messenger/.mtn2git_empty
+++ b/packages/gtk+/gtk+-2.8.0/.mtn2git_empty
diff --git a/packages/gtk+/gtk+-2.8.0/automake-lossage.patch b/packages/gtk+/gtk+-2.8.0/automake-lossage.patch
new file mode 100644
index 0000000000..0d423ddbb9
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/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.8.0/disable-tooltips.patch b/packages/gtk+/gtk+-2.8.0/disable-tooltips.patch
new file mode 100644
index 0000000000..d71d839c3c
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/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.8.0/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.8.0/gtk+-handhelds.patch
new file mode 100644
index 0000000000..20481f059b
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/gtk+-handhelds.patch
@@ -0,0 +1,236 @@
+--- 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.8.0/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.0/gtklabel-resize-patch
new file mode 100644
index 0000000000..df29656343
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/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.8.0/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.8.0/hardcoded_libtool.patch
new file mode 100644
index 0000000000..b2afddcc61
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/hardcoded_libtool.patch
@@ -0,0 +1,29 @@
+--- gtk+-2.6.0/configure.in.old	2005-01-01 16:23:45.000000000 +0000
++++ gtk+-2.6.0/configure.in	2005-01-01 16:24:03.000000000 +0000
+@@ -360,7 +360,7 @@
+ AC_MSG_CHECKING([Whether to write dependencies into .pc files])
+ case $enable_explicit_deps in
+   auto)
+-    deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
++    deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
+     if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
+       enable_explicit_deps=yes  
+     else
+@@ -688,7 +688,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/'`
+@@ -1512,7 +1512,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.8.0/menu-deactivate.patch b/packages/gtk+/gtk+-2.8.0/menu-deactivate.patch
new file mode 100644
index 0000000000..29e665fbf3
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/menu-deactivate.patch
@@ -0,0 +1,50 @@
+--- gtk+-2.4.4/gtk/gtkmenushell.c.old	Thu Aug 26 23:45:28 2004
++++ gtk+-2.4.4/gtk/gtkmenushell.c	Fri Aug 27 00:13:33 2004
+@@ -37,7 +37,7 @@
+ #include "gtktearoffmenuitem.h"
+ #include "gtkwindow.h"
+ 
+-#define MENU_SHELL_TIMEOUT   500
++#define MENU_SHELL_TIMEOUT   2000
+ 
+ enum {
+   DEACTIVATE,
+@@ -156,6 +156,7 @@
+ static GtkContainerClass *parent_class = NULL;
+ static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
+ 
++static int last_crossing_time;
+ 
+ GType
+ gtk_menu_shell_get_type (void)
+@@ -418,6 +419,7 @@
+       gtk_grab_add (GTK_WIDGET (menu_shell));
+       menu_shell->have_grab = TRUE;
+       menu_shell->active = TRUE;
++      last_crossing_time = 0;
+     }
+ }
+ 
+@@ -545,6 +547,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)
+ 	{
+@@ -597,6 +606,8 @@
+   if (menu_shell->active)
+     {
+       menu_item = gtk_get_event_widget ((GdkEvent*) event);
++
++      last_crossing_time = event->time;
+ 
+       if (!menu_item ||
+ 	  (GTK_IS_MENU_ITEM (menu_item) && 
diff --git a/packages/gtk+/gtk+-2.8.0/no-demos.patch b/packages/gtk+/gtk+-2.8.0/no-demos.patch
new file mode 100644
index 0000000000..2f10a30dda
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/no-demos.patch
@@ -0,0 +1,10 @@
+--- 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.8.0/no-xwc.patch b/packages/gtk+/gtk+-2.8.0/no-xwc.patch
new file mode 100644
index 0000000000..affb4a303e
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/no-xwc.patch
@@ -0,0 +1,151 @@
+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.8.0/scroll-timings.patch b/packages/gtk+/gtk+-2.8.0/scroll-timings.patch
new file mode 100644
index 0000000000..a38b21dcc2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/scroll-timings.patch
@@ -0,0 +1,15 @@
+--- gtk+-2.4.4/gtk/gtkrange.c~	2004-08-23 01:50:22.000000000 +0100
++++ gtk+-2.4.4/gtk/gtkrange.c	2004-08-27 15:48:49.000000000 +0100
+@@ -35,9 +35,9 @@
+ #include "gtkintl.h"
+ #include "gtkscrollbar.h"
+ 
+-#define SCROLL_INITIAL_DELAY 250  /* must hold button this long before ... */
+-#define SCROLL_LATER_DELAY   100  /* ... it starts repeating at this rate  */
+-#define UPDATE_DELAY         300  /* Delay for queued update */
++#define SCROLL_INITIAL_DELAY 500  /* must hold button this long before ... */
++#define SCROLL_LATER_DELAY   200  /* ... it starts repeating at this rate  */
++#define UPDATE_DELAY         1000  /* Delay for queued update */
+ 
+ enum {
+   PROP_0,
diff --git a/packages/gtk+/gtk+-2.8.0/single-click.patch b/packages/gtk+/gtk+-2.8.0/single-click.patch
new file mode 100644
index 0000000000..3bb208d4d6
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/single-click.patch
@@ -0,0 +1,54 @@
+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.8.0/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.8.0/small-gtkfilesel.patch
new file mode 100644
index 0000000000..20bf4cf366
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/small-gtkfilesel.patch
@@ -0,0 +1,267 @@
+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.8.0/spinbutton.patch b/packages/gtk+/gtk+-2.8.0/spinbutton.patch
new file mode 100644
index 0000000000..8ad7507af0
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/spinbutton.patch
@@ -0,0 +1,128 @@
+--- 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.8.0/xsettings.patch b/packages/gtk+/gtk+-2.8.0/xsettings.patch
new file mode 100644
index 0000000000..b63e262d34
--- /dev/null
+++ b/packages/gtk+/gtk+-2.8.0/xsettings.patch
@@ -0,0 +1,16 @@
+--- 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.8.0.bb b/packages/gtk+/gtk+_2.8.0.bb
new file mode 100644
index 0000000000..126bc22307
--- /dev/null
+++ b/packages/gtk+/gtk+_2.8.0.bb
@@ -0,0 +1,82 @@
+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"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
+           file://no-xwc.patch;patch=1 \
+           file://automake-lossage.patch;patch=1 \
+	   file://spinbutton.patch;patch=1 \
+	   file://hardcoded_libtool.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://no-demos.patch;patch=1
+#           file://gtk+-handhelds.patch;patch=1
+#	   file://single-click.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"
+
+EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
+# --disable-cruft
+
+LIBV = "2.4.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
+
+}
+
+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')
+
+	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')
+
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
+}
diff --git a/packages/vlc/files/.mtn2git_empty b/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/vlc/files/.mtn2git_empty
+++ b/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty
diff --git a/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch
new file mode 100644
index 0000000000..b139ef38f1
--- /dev/null
+++ b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch
@@ -0,0 +1,11 @@
+--- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old	2005-04-17 09:12:38.304421464 +0100
++++ hostap-driver-0.3.7/driver/modules/hostap_compat.h	2005-04-17 09:13:04.413452288 +0100
+@@ -5,7 +5,7 @@
+ #define NEW_MODULE_CODE
+ #endif
+ 
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD)
+ 
+ #define HOSTAP_QUEUE struct tq_struct
+ 
diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff
new file mode 100644
index 0000000000..c2d6662d69
--- /dev/null
+++ b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff
@@ -0,0 +1,20 @@
+--- driver/modules/hostap_compat.h.orig	2004-08-09 16:16:48.359929856 +0200
++++ driver/modules/hostap_compat.h	2004-08-09 16:17:12.383277752 +0200
+@@ -13,7 +13,7 @@
+ MOD_INC_USE_COUNT; \
+ if (schedule_task((q)) == 0) \
+ 	MOD_DEC_USE_COUNT;
+-
++/*
+ static inline void flush_scheduled_work(void)
+ {
+ 	flush_scheduled_tasks();
+@@ -27,7 +27,7 @@
+ 	tq->routine = routine;
+ 	tq->data = data;
+ }
+-
++*/
+ #else /* kernel < 2.5.44 */
+ 
+ #define HOSTAP_QUEUE struct work_struct
diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff
new file mode 100644
index 0000000000..e979b72d93
--- /dev/null
+++ b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff
@@ -0,0 +1,81 @@
+--- driver/modules/hostap_pci.c.orig	2004-11-30 06:41:48.000000000 +0100
++++ driver/modules/hostap_pci.c	2005-01-17 19:47:33.710400496 +0100
+@@ -50,6 +50,13 @@
+ };
+ 
+ 
++#define DEFERRED_IRQ_INITIALIZATION
++
++#ifdef DEFERRED_IRQ_INITIALIZATION
++struct net_device *devb[MAX_PARM_DEVICES];
++#endif
++
++
+ #ifdef PRISM2_IO_DEBUG
+ 
+ static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
+@@ -280,6 +287,10 @@
+ 
+ 	pci_set_drvdata(pdev, dev);
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++	printk("%s: deferred initialization of IRQs\n", dev_info);
++	devb[cards_found-1] = dev;
++#else
+ 	if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+ 			dev)) {
+ 		printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+@@ -295,7 +306,7 @@
+ 
+ 	printk(KERN_INFO "%s: Intersil Prism2.5 PCI: "
+ 	       "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq);
+-
++#endif
+ 	return hostap_hw_ready(dev);
+ 
+  fail:
+@@ -399,18 +410,43 @@
+ };
+ 
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++static void deferred_init(int num_devices)
++{
++      int n;
++      for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++)
++      {
++              if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name,
++                              devb[n])) {
++                      printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name);
++              }
++              if (prism2_hw_config(devb[n], 1)) {
++                      printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name)
++;
++              }
++              printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]->
++irq);
++      }
++}
++#endif
++
+ static int __init init_prism2_pci(void)
+ {
+ 	printk(KERN_INFO "%s: %s\n", dev_info, version);
+ 
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
+-	if (pci_register_driver(&prism2_pci_drv_id) <= 0) {
++	int n;
++	if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) {
+ 		printk("hostap_pci: No devices found, driver not "
+ 		       "installed.\n");
+ 		pci_unregister_driver(&prism2_pci_drv_id);
+ 		return -ENODEV;
+ 	}
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++	deferred_init(n);
++#endif
++
+ 	return 0;
+ #else
+ 	return pci_register_driver(&prism2_pci_drv_id);
diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb
new file mode 100644
index 0000000000..fd7a3eaff9
--- /dev/null
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
+           file://hostap_cs.conf "
+
+SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
+	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
+
+S = "${WORKDIR}/hostap-driver-${PV}"
+
+inherit module
+
+# Hack Alert :D
+ARCH_mipsel = "mips"
+MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
+
+NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
+
+do_install() {
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}${sysconfdir}/pcmcia
+	for i in ${NET_MODULES}
+	do
+		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+	done
+	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+	install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf
+	cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
+}
+
+PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
+FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/"
+FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}"
+FILES_hostap-modules = "/lib/modules/"
+RDEPENDS_hostap-modules-cs = "hostap-modules"
+RDEPENDS_hostap-modules-pci = "hostap-modules"
diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb
new file mode 100644
index 0000000000..8c2601bce8
--- /dev/null
+++ b/packages/libao/libao_0.8.6.bb
@@ -0,0 +1,26 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cross platform audio library"
+HOMEPAGE = "http://www.xiph.org/ao/"
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-esd --disable-esdtest \
+		--disable-alsa --disable-alsa09 \
+		--disable-arts --disable-nas"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/ao
+	install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \
+			${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/
+
+	oe_libinstall -so -C src libao ${STAGING_LIBDIR}
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN} += "${libdir}/ao/plugins-2/*.so"
diff --git a/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb
index 83afaacefe..578c9b7674 100644
--- a/packages/libdaemon/libdaemon_0.6.bb
+++ b/packages/libdaemon/libdaemon_0.6.bb
@@ -12,7 +12,7 @@ EXTRA_OECONF = "--disable-lynx --disable-doxygen"
 do_stage () {
 	oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/libdaemon
-	for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do
+	for i in dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
 		install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/
 	done
 }
diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb
index 62ce3c61e5..9de579917c 100644
--- a/packages/libdvb/libdvb_0.5.5.1.bb
+++ b/packages/libdvb/libdvb_0.5.5.1.bb
@@ -1,10 +1,11 @@
 LICENSE = "GPL"
 DESCRIPTION = "Linux Digital Video Broadcast library"
+DESCRIPTION_libdvb-dev = "Headers for libdvb development"
 HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 SECTION = "libs"
 PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.metzlerbros.org/dvb/${PN}-${PV}.tar.gz"
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 065d5d9eb8..2842eea8cb 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r11"
+PR = "r12"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -51,7 +51,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${RPSRC}/corgi_irda-r2.patch;patch=1 \
            ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
-           ${RPSRC}/corgi_power-r24.patch;patch=1 \
+           ${RPSRC}/sharpsl_bl_kick-r0.patch;patch=1 \
            ${RPSRC}/corgi_power1-r1.patch;patch=1 \
            ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
@@ -79,14 +79,16 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
            ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
+           ${RPSRC}/pxafb_hsync-r0.patch;patch=1 \
            ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \
-           ${RPSRC}/spitzbase-r5.patch;patch=1 \
+           ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_lcd-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_ts-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \
+           ${RPSRC}/spitz_base-r7.patch;patch=1 \
            ${RPSRC}/spitzkbd-r1.patch;patch=1 \
-           ${RPSRC}/spitzssp-r4.patch;patch=1 \
-           ${RPSRC}/spitzbl-r1.patch;patch=1 \
-           ${RPSRC}/spitzts-r1.patch;patch=1 \
            ${RPSRC}/spitzcf-r1.patch;patch=1 \
-           ${RPSRC}/spitz_power-r1.patch;patch=1 \
+           ${RPSRC}/spitz_power-r3.patch;patch=1 \
            ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \
            ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
            ${RPSRC}/scoop_susres-r0.patch;patch=1 \
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 2febd8d2b3..80c0a5be09 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -97,6 +97,7 @@ OPENSLUG_PACKAGES = "\
 	puppy \
 	pwc \
 	python \
+	qc-usb-messenger \
 	quilt \
 	reiserfsprogs reiser4progs \
 	rsync \
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
new file mode 100644
index 0000000000..395d69e79e
--- /dev/null
+++ b/packages/musicpd/mpd_0.11.5.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Music Player Daemon (mpd)"
+HOMEPAGE = "http://www.musicpd.org"
+LICENSE = "GPLv2"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "console/multimedia"
+DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz"
+
+inherit autotools
+
+# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
+# be built, instead we use the OE built versions which should be installed
+# in staging - remove the --with and replace with --enable to use the local
+# versions.
+
+EXTRA_OECONF = "--enable-ogg \
+		--with-id3tag-libraries=${STAGING_LIBDIR} \
+		--with-id3tag-includes=${STAGING_INCDIR} \
+		--with-mad-libraries=${STAGING_LIBDIR} \
+		--with-mad-includes=${STAGING_INCDIR} \
+		--without-faad"
diff --git a/packages/pango/pango_1.10.0.bb b/packages/pango/pango_1.10.0.bb
new file mode 100644
index 0000000000..88d1b847d8
--- /dev/null
+++ b/packages/pango/pango_1.10.0.bb
@@ -0,0 +1,47 @@
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+# Xt needed to keep autoconf's check for X11 happy
+DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DESCRIPTION = "The goal of the Pango project is to provide an \
+Open Source framework for the layout and rendering of \
+internationalized text."
+PR = "r0"
+
+# seems to go wrong with default cflags
+FULL_OPTIMIZATION_arm = "-O2"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/pango-${PV}.tar.bz2 \
+	   file://no-tests.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest \
+		--enable-explicit-deps=no \
+	        --disable-debug"
+
+FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+
+LIBV = "1.4.0"
+
+do_stage () {
+	for lib in pango pangox pangoft2 pangoxft pangocairo; do
+		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
+	done
+	install -d ${STAGING_INCDIR}/pango
+	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
+}
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+}
+
+python populate_packages_prepend () {
+	prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
+}
diff --git a/packages/pcmciautils/pcmciautils_001.bb b/packages/pcmciautils/pcmciautils_001.bb
deleted file mode 100644
index 59e0cdb86f..0000000000
--- a/packages/pcmciautils/pcmciautils_001.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DEPENDS += "sysfsutils"
-DESCRIPTION = "2.6 pcmcia utilities"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "base"
-PRIORITY = "optional"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
-S = "${WORKDIR}/pcmciautils-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "coldplug"
-INITSCRIPT_PARAMS = "defaults"
-
-export HOSTCC = "${BUILD_CC}"
-export etcdir = "${sysconfdir}"
-export hotplugdir = "${sysconfdir}/hotplug"
-export pcmciaconfdir = "${sysconfdir}/pcmcia"
-LD = "${CC}"
-
-EXTRA_OEMAKE = "-e \
-		'STRIP=echo'"
-
-do_compile () {
-	oe_runmake build/ccdv
-	oe_runmake
-}
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
-
-CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
-RCONFLICTS_${PN} += "pcmcia-cs"
diff --git a/packages/pcmciautils/pcmciautils_002.bb b/packages/pcmciautils/pcmciautils_002.bb
deleted file mode 100644
index 440d925313..0000000000
--- a/packages/pcmciautils/pcmciautils_002.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DEPENDS += "sysfsutils virtual/libintl"
-DESCRIPTION = "2.6 pcmcia utilities"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "base"
-PRIORITY = "optional"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
-S = "${WORKDIR}/pcmciautils-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "coldplug"
-INITSCRIPT_PARAMS = "defaults"
-
-export HOSTCC = "${BUILD_CC}"
-export etcdir = "${sysconfdir}"
-export hotplugdir = "${sysconfdir}/hotplug"
-export pcmciaconfdir = "${sysconfdir}/pcmcia"
-LD = "${CC}"
-CFLAGS =+ "-I${S}/src"
-
-EXTRA_OEMAKE = "-e \
-		'STRIP=echo' \
-		'LIB_OBJS=-lc -lsysfs -lintl'"
-
-do_compile () {
-	oe_runmake build/ccdv
-	oe_runmake
-}
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
-
-CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
-RCONFLICTS_${PN} += "pcmcia-cs"
diff --git a/packages/pcmciautils/pcmciautils_005.bb b/packages/pcmciautils/pcmciautils_005.bb
deleted file mode 100644
index ad8cf7e2f4..0000000000
--- a/packages/pcmciautils/pcmciautils_005.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "2.6 pcmcia utilities"
-DEPENDS = "sysfsutils"
-SECTION = "kernel/userland"
-PRIORITY = "optional"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
-S = "${WORKDIR}/pcmciautils-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "coldplug"
-INITSCRIPT_PARAMS = "defaults"
-
-export HOSTCC = "${BUILD_CC}"
-export etcdir = "${sysconfdir}"
-export hotplugdir = "${sysconfdir}/hotplug"
-export pcmciaconfdir = "${sysconfdir}/pcmcia"
-LD = "${CC}"
-CFLAGS =+ "-I${S}/src"
-
-PARALLEL_MAKE = ""
-EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'"
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
-
-CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
-RCONFLICTS_${PN} += "pcmcia-cs"
diff --git a/packages/pcmciautils/pcmciautils_003.bb b/packages/pcmciautils/pcmciautils_007.bb
index ad8cf7e2f4..ad8cf7e2f4 100644
--- a/packages/pcmciautils/pcmciautils_003.bb
+++ b/packages/pcmciautils/pcmciautils_007.bb
diff --git a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb
index 2720b3af59..2720b3af59 100644
--- a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb
+++ b/packages/qc-usb/qc-usb-messenger_0.8.bb
diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb
index a4c2fde2d2..bc41020b71 100644
--- a/packages/syslog-ng/syslog-ng_1.6.8.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.8.bb
@@ -1,17 +1,30 @@
-PR = "r4"
+PR = "r7"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol"
 
-SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz"
+SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
+	  file://initscript"
 
 S = "${WORKDIR}/${PN}-${PV}"
-inherit autotools
+inherit autotools update-rc.d
 
 EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/"
 CONFFILES_${PN} = "${sysconfdir}/${PN}/syslog-ng.conf"
+INITSCRIPT_NAME = "syslog-ng"
+INITSCRIPT_PARAMS = "defaults 05"
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/${PN}
 	install ${S}/doc/syslog-ng.conf.sample ${D}${sysconfdir}/${PN}/syslog-ng.conf
-	
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog-ng
+}
+
+pkg_postinst() {
+	update-rc.d -f syslog remove
+}
+
+pkg_postrm() {
+	update-rc.d syslog add 5
 }
diff --git a/packages/vlc/vlc-gpe-0.8.1/.mtn2git_empty b/packages/vlc/vlc-gpe-0.8.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vlc/vlc-gpe-0.8.1/.mtn2git_empty
diff --git a/packages/vlc/files/fix-pda.patch b/packages/vlc/vlc-gpe-0.8.1/fix-pda.patch
index 5338851463..5338851463 100644
--- a/packages/vlc/files/fix-pda.patch
+++ b/packages/vlc/vlc-gpe-0.8.1/fix-pda.patch
diff --git a/packages/vlc/vlc-gpe-0.8.1/vlc-tremor.patch b/packages/vlc/vlc-gpe-0.8.1/vlc-tremor.patch
new file mode 100644
index 0000000000..2a5a92463c
--- /dev/null
+++ b/packages/vlc/vlc-gpe-0.8.1/vlc-tremor.patch
@@ -0,0 +1,14 @@
+--- vlc-0.8.1/modules/codec/vorbis.c.orig	2005-08-05 19:57:05 +0200
++++ vlc-0.8.1/modules/codec/vorbis.c	2005-08-05 20:01:22 +0200
+@@ -481,7 +481,11 @@
+ #endif
+ 
+     if( p_oggpacket->bytes &&
++#ifdef MODULE_NAME_IS_tremor
++        vorbis_synthesis( &p_sys->vb, p_oggpacket, 1 ) == 0 )
++#else
+         vorbis_synthesis( &p_sys->vb, p_oggpacket ) == 0 )
++#endif
+         vorbis_synthesis_blockin( &p_sys->vd, &p_sys->vb );
+ 
+     /* **pp_pcm is a multichannel float vector. In stereo, for
diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb
index f433803b89..599701d5df 100644
--- a/packages/vlc/vlc-gpe_0.8.1.bb
+++ b/packages/vlc/vlc-gpe_0.8.1.bb
@@ -4,12 +4,13 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "gpe"
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \
-file://fix-pda.patch;patch=1"
+	file://fix-pda.patch;patch=1 \
+	file://vlc-tremor.patch;patch=1"
 S = "${WORKDIR}/vlc-${PV}"
 
 inherit autotools
diff --git a/packages/x11/x11-common/etc/X11/Xserver b/packages/x11/x11-common/etc/X11/Xserver
index e7e6dd1ddb..8492bfe214 100644
--- a/packages/x11/x11-common/etc/X11/Xserver
+++ b/packages/x11/x11-common/etc/X11/Xserver
@@ -63,7 +63,7 @@ case `module_id` in
 	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
 		ARGS="$ARGS -rgba rgb" ;;
 	"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
-		ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
+		ARGS="$ARGS -rgba rgb -screen 480x640@270" ;;
 	"Simpad")
 		ARGS="$ARGS -rgba rgb" ;;
 	"Generic OMAP1510/1610/1710")