shr/merge: update some recipes (status: Xorg builds)

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>

29 files changed, 743 insertions, 43 deletions

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 12af73628f..625fe24836 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -223,7 +223,7 @@ PREFERRED_VERSION_db ?= "4.3.29"
 PREFERRED_VERSION_dbench ?= "4.0"
 PREFERRED_VERSION_dbh ?= "1.0-18"
 PREFERRED_VERSION_db-native ?= "4.3.29"
-PREFERRED_VERSION_dbus ?= "1.3.0"
+PREFERRED_VERSION_dbus ?= "1.2.14"
 PREFERRED_VERSION_dbus-native ?= "1.2.1"
 PREFERRED_VERSION_dbus-glib ?= "0.78"
 PREFERRED_VERSION_dbus-glib-native ?= "0.76"
@@ -1381,7 +1381,7 @@ PREFERRED_VERSION_opensp ?= "1.5"
 PREFERRED_VERSION_opensp-native ?= "1.5"
 PREFERRED_VERSION_openssh ?= "4.6p1"
 PREFERRED_VERSION_openssl ?= "0.9.8j"
-PREFERRED_VERSION_openssl-native ?= "0.9.8j"
+PREFERRED_VERSION_openssl-native ?= "0.9.8g"
 PREFERRED_VERSION_openswan ?= "2.4.7"
 PREFERRED_VERSION_openttd ?= "0.6.3"
 PREFERRED_VERSION_openvpn ?= "2.0.9"
@@ -1935,6 +1935,7 @@ PREFERRED_VERSION_usound ?= "0.2.0"
 PREFERRED_VERSION_usrp ?= "0.12"
 PREFERRED_VERSION_util-linux ?= "2.12r"
 PREFERRED_VERSION_util-linux-native ?= "2.12r"
+PREFERRED_VERSION_util-linux-ng ?= "2.15"
 PREFERRED_VERSION_util-macros ?= "1.1.5"
 PREFERRED_VERSION_util-macros-native ?= "1.1.5"
 PREFERRED_VERSION_uucp ?= "1.07"
diff --git a/recipes/blktool/blktool_4.bb b/recipes/blktool/blktool_4.bb
index e658e3256f..2d939ea8e2 100644
--- a/recipes/blktool/blktool_4.bb
+++ b/recipes/blktool/blktool_4.bb
@@ -5,4 +5,4 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz"
 
 S = "${WORKDIR}/${PN}-${PV}.orig"
 
-inherit autotools
\ No newline at end of file
+inherit autotools
diff --git a/recipes/dbus/dbus-1.2.14/0001-Make-the-default-DBus-reply-timeout-configurable.patch b/recipes/dbus/dbus-1.2.14/0001-Make-the-default-DBus-reply-timeout-configurable.patch
new file mode 100644
index 0000000000..a38e3db0de
--- /dev/null
+++ b/recipes/dbus/dbus-1.2.14/0001-Make-the-default-DBus-reply-timeout-configurable.patch
@@ -0,0 +1,78 @@
+From fb546488e93a1638d377b228bbb0d2ab58462168 Mon Sep 17 00:00:00 2001
+From: Daniel Willmann <daniel@totalueberwachung.de>
+Date: Thu, 2 Oct 2008 15:50:17 +0800
+Subject: [PATCH] Make the default DBus reply timeout configurable
+
+This patch adds an option --with-dbus-default-reply-timeout to configure
+that will set the default reply timeout used by libdbus in milliseconds.
+autoconf and autoheader need to be rerun in order to regenerate the
+correct configure and config.h.in files.
+---
+ configure.in                    |    9 +++++++++
+ dbus/dbus-connection-internal.h |    3 ---
+ dbus/dbus-pending-call.c        |    1 +
+ 3 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 62ac387..5c912d7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -88,6 +88,7 @@ AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]]
+ AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner]))
+ AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
+ AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon]))
++AC_ARG_WITH(dbus_default_reply_timeout, AS_HELP_STRING([--with-dbus-default-reply-timeout=[milliseconds]],[Default reply timeout for DBus method calls]))
+ 
+ AC_DEFINE(DBUS_UNIX,1,[dbus on unix])
+ 
+@@ -986,6 +987,13 @@ if test x$have_libaudit = xyes ; then
+     AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support])
+ fi
+ 
++if test -z "$with_dbus_default_reply_timeout" ; then
++    DBUS_DEFAULT_REPLY_TIMEOUT=25000
++else
++    DBUS_DEFAULT_REPLY_TIMEOUT=$with_dbus_default_reply_timeout
++fi
++AC_DEFINE_UNQUOTED(_DBUS_DEFAULT_TIMEOUT_VALUE,$DBUS_DEFAULT_REPLY_TIMEOUT,[default timeout value for dbus calls])
++
+ #### Set up final flags
+ DBUS_CLIENT_CFLAGS=
+ DBUS_CLIENT_LIBS="$THREAD_LIBS"
+@@ -1348,6 +1356,7 @@ echo "
+         Gettext libs (empty OK):  ${INTLLIBS}
+         Using XML parser:         ${with_xml}
+         Init scripts style:       ${with_init_scripts}
++        Default reply timeout:    ${DBUS_DEFAULT_REPLY_TIMEOUT}
+         Abstract socket names:    ${ac_cv_have_abstract_sockets}
+         System bus socket:        ${DBUS_SYSTEM_SOCKET}
+         System bus address:       ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS}
+diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
+index df54412..5fe536b 100644
+--- a/dbus/dbus-connection-internal.h
++++ b/dbus/dbus-connection-internal.h
+@@ -41,9 +41,6 @@ typedef enum
+   DBUS_ITERATION_BLOCK      = 1 << 2  /**< Block if nothing to do. */
+ } DBusIterationFlags;
+ 
+-/** default timeout value when waiting for a message reply, 25 seconds */
+-#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000)
+-
+ void              _dbus_connection_lock                        (DBusConnection     *connection);
+ void              _dbus_connection_unlock                      (DBusConnection     *connection);
+ DBusConnection *  _dbus_connection_ref_unlocked                (DBusConnection     *connection);
+diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
+index 51b9378..5a7a5f4 100644
+--- a/dbus/dbus-pending-call.c
++++ b/dbus/dbus-pending-call.c
+@@ -21,6 +21,7 @@
+  *
+  */
+ 
++#include <config.h>
+ #include "dbus-internals.h"
+ #include "dbus-connection-internal.h"
+ #include "dbus-pending-call-internal.h"
+-- 
+1.5.6.4
+
diff --git a/recipes/dbus/dbus-1.2.14/0002-Fix-Pending-Connections-Bug.patch b/recipes/dbus/dbus-1.2.14/0002-Fix-Pending-Connections-Bug.patch
new file mode 100644
index 0000000000..11cb14d7c2
--- /dev/null
+++ b/recipes/dbus/dbus-1.2.14/0002-Fix-Pending-Connections-Bug.patch
@@ -0,0 +1,99 @@
+diff -Naur --exclude '*.swp' dbus-1.2.14.orig/dbus/dbus-connection.c dbus-1.2.14.bug-19796-v2/dbus/dbus-connection.c
+--- dbus-1.2.14.orig/dbus/dbus-connection.c	2009-05-06 17:51:18.000000000 +0100
++++ dbus-1.2.14.bug-19796-v2/dbus/dbus-connection.c	2009-06-04 18:04:51.000000000 +0100
+@@ -3167,12 +3167,25 @@
+  * @returns #FALSE if no memory, #TRUE otherwise.
+  *
+  */
++
++DBUS_DEPRECATED
+ dbus_bool_t
+ dbus_connection_send_with_reply (DBusConnection     *connection,
+                                  DBusMessage        *message,
+                                  DBusPendingCall   **pending_return,
+                                  int                 timeout_milliseconds)
+ {
++  return dbus_connection_send_with_reply_setup (connection, message, pending_return, NULL, NULL, timeout_milliseconds);
++}
++
++dbus_bool_t
++dbus_connection_send_with_reply_setup (DBusConnection        *connection,
++                                       DBusMessage           *message,
++                                       DBusPendingCall      **pending_return,
++                                       DBusPendingCallSetup   pending_setup,
++                                       void                  *setup_user_data,
++                                       int                    timeout_milliseconds)
++{
+   DBusPendingCall *pending;
+   dbus_int32_t serial = -1;
+   DBusDispatchStatus status;
+@@ -3181,6 +3194,11 @@
+   _dbus_return_val_if_fail (message != NULL, FALSE);
+   _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE);
+ 
++  if (pending_return && (!pending_setup))
++  {
++    _dbus_warn ("Using **pending_return in dbus_connection_send_with_reply_setup() without pending_setup is deprecated and strongly discouraged\n");
++  }
++
+   if (pending_return)
+     *pending_return = NULL;
+ 
+@@ -3189,7 +3207,6 @@
+    if (!_dbus_connection_get_is_connected_unlocked (connection))
+     {
+       CONNECTION_UNLOCK (connection);
+-
+       return TRUE;
+     }
+ 
+@@ -3222,6 +3239,9 @@
+ 						      pending))
+     goto error;
+  
++  if (pending_setup)
++    pending_setup(pending, setup_user_data);
++
+   if (!_dbus_connection_send_unlocked_no_update (connection, message, NULL))
+     {
+       _dbus_connection_detach_pending_call_and_unlock (connection,
+@@ -3300,8 +3320,8 @@
+   _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, NULL);
+   _dbus_return_val_if_error_is_set (error, NULL);
+   
+-  if (!dbus_connection_send_with_reply (connection, message,
+-                                        &pending, timeout_milliseconds))
++  if (!dbus_connection_send_with_reply_setup (connection, message,
++                                              &pending, NULL, NULL, timeout_milliseconds))
+     {
+       _DBUS_SET_OOM (error);
+       return NULL;
+diff -Naur --exclude '*.swp' dbus-1.2.14.orig/dbus/dbus-connection.h dbus-1.2.14.bug-19796-v2/dbus/dbus-connection.h
+--- dbus-1.2.14.orig/dbus/dbus-connection.h	2009-04-17 20:45:29.000000000 +0100
++++ dbus-1.2.14.bug-19796-v2/dbus/dbus-connection.h	2009-06-04 17:45:02.000000000 +0100
+@@ -47,6 +47,7 @@
+ typedef struct DBusPreallocatedSend DBusPreallocatedSend;
+ /** Opaque type representing a method call that has not yet received a reply. */
+ typedef struct DBusPendingCall DBusPendingCall;
++typedef void (*DBusPendingCallSetup)(DBusPendingCall *pending, void *user_data);
+ /** Opaque type representing a connection to a remote application and associated incoming/outgoing message queues. */
+ typedef struct DBusConnection DBusConnection;
+ /** Set of functions that must be implemented to handle messages sent to a particular object path. */
+@@ -199,10 +200,17 @@
+ dbus_bool_t        dbus_connection_send                         (DBusConnection             *connection,
+                                                                  DBusMessage                *message,
+                                                                  dbus_uint32_t              *client_serial);
++DBUS_DEPRECATED
+ dbus_bool_t        dbus_connection_send_with_reply              (DBusConnection             *connection,
+                                                                  DBusMessage                *message,
+                                                                  DBusPendingCall           **pending_return,
+                                                                  int                         timeout_milliseconds);
++dbus_bool_t        dbus_connection_send_with_reply_setup        (DBusConnection             *connection,
++                                                                 DBusMessage                *message,
++                                                                 DBusPendingCall           **pending_return,
++                                                                DBusPendingCallSetup        pending_setup,
++                                                                 void                       *setup_user_data,
++                                                                 int                         timeout_milliseconds);
+ DBusMessage *      dbus_connection_send_with_reply_and_block    (DBusConnection             *connection,
+                                                                  DBusMessage                *message,
+                                                                  int                         timeout_milliseconds,
diff --git a/recipes/dbus/dbus-1.2.14/cross.patch b/recipes/dbus/dbus-1.2.14/cross.patch
new file mode 100644
index 0000000000..268a3ae3de
--- /dev/null
+++ b/recipes/dbus/dbus-1.2.14/cross.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure.in	2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in	2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+     exit (0);
+ ]])],
+               [ac_cv_have_abstract_sockets=yes],
++	      [ac_cv_have_abstract_sockets=no],
+               [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
diff --git a/recipes/dbus/dbus-1.2.14/dbus-1.init b/recipes/dbus/dbus-1.2.14/dbus-1.init
new file mode 100644
index 0000000000..a70e7a2373
--- /dev/null
+++ b/recipes/dbus/dbus-1.2.14/dbus-1.init
@@ -0,0 +1,111 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+# Copyright 2008 OE Team
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+RUNDIR=/var/run/dbus
+PIDFILE=/var/run/dbus/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+  . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $RUNDIR ]; then
+    mkdir -p $RUNDIR
+    chown $DAEMONUSER $RUNDIR
+    chgrp $DAEMONUSER $RUNDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  if [ ! -d $UUIDDIR ]; then
+    mkdir -p $UUIDDIR
+    chown $DAEMONUSER $UUIDDIR
+    chgrp $DAEMONUSER $UUIDDIR
+  fi
+ 
+  dbus-uuidgen --ensure  
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      # TODO: --reverse when busybox supports it
+      run-parts --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop --oknodo --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+reload_it()
+{
+  echo -n "Reloading $DESC config: "
+  dbus-send --print-reply --system --type=method_call \
+            --dest=org.freedesktop.DBus \
+            / org.freedesktop.DBus.ReloadConfig > /dev/null
+  # hopefully this is enough time for dbus to reload it's config file.
+  echo "done."
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  reload|force-reload)
+    reload_it
+  ;;
+  restart)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/recipes/dbus/dbus-1.2.14/fix-install-daemon.patch b/recipes/dbus/dbus-1.2.14/fix-install-daemon.patch
new file mode 100644
index 0000000000..c31786357d
--- /dev/null
+++ b/recipes/dbus/dbus-1.2.14/fix-install-daemon.patch
@@ -0,0 +1,13 @@
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 	fi
+-	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/recipes/dbus/dbus-1.2.14/permissive.patch b/recipes/dbus/dbus-1.2.14/permissive.patch
new file mode 100644
index 0000000000..c8d17e06f7
--- /dev/null
+++ b/recipes/dbus/dbus-1.2.14/permissive.patch
@@ -0,0 +1,11 @@
+--- /usr/src/openmoko/unstable-build/work/armv4t-angstrom-linux-gnueabi/dbus-1.2.14-r1/dbus-1.2.14/bus/system.conf.in	2009-05-06 10:19:43.000000000 -0600
++++ dbus-1.2.4.6/bus/system.conf.in	2009-05-06 11:26:47.000000000 -0600
+@@ -48,7 +48,7 @@
+     <!-- Holes must be punched in service configuration files for
+          name ownership and sending method calls -->
+     <deny own="*"/>
+-    <deny send_type="method_call"/>
++    <allow send_type="method_call" log="true"/>
+ 
+     <!-- Signals and reply messages (method returns, errors) are allowed
+          by default -->
diff --git a/recipes/dbus/dbus-1.2.14/tmpdir.patch b/recipes/dbus/dbus-1.2.14/tmpdir.patch
new file mode 100644
index 0000000000..838b903f0a
--- /dev/null
+++ b/recipes/dbus/dbus-1.2.14/tmpdir.patch
@@ -0,0 +1,30 @@
+--- dbus-0.22/configure.in.orig	2004-08-13 00:57:16.000000000 +0200
++++ dbus-0.22/configure.in	2004-12-30 21:15:57.000000000 +0100
+@@ -1047,15 +1048,18 @@
+ AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+ 
+ #### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+-   DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+-   DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+-   DEFAULT_SOCKET_DIR=$TMP
+-else
+-   DEFAULT_SOCKET_DIR=/tmp
+-fi
++#if ! test -z "$TMPDIR" ; then
++#   DEFAULT_SOCKET_DIR=$TMPDIR
++#elif ! test -z "$TEMP" ; then
++#   DEFAULT_SOCKET_DIR=$TEMP
++#elif ! test -z "$TMP" ; then
++#   DEFAULT_SOCKET_DIR=$TMP
++#else
++#   DEFAULT_SOCKET_DIR=/tmp
++#fi
++
++# checks disabled to avoid expanding this at build time
++DEFAULT_SOCKET_DIR=/tmp
+ 
+ if ! test -z "$with_test_socket_dir" ; then
+    TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/recipes/dbus/dbus_1.2.14.bb b/recipes/dbus/dbus_1.2.14.bb
new file mode 100644
index 0000000000..dfed3de93d
--- /dev/null
+++ b/recipes/dbus/dbus_1.2.14.bb
@@ -0,0 +1,5 @@
+include dbus.inc
+SRC_URI += "file://0002-Fix-Pending-Connections-Bug.patch;patch=1 \
+	file://permissive.patch;patch=1"
+
+PR = "${INC_PR}.2"
diff --git a/recipes/gtk-webcore/midori/config b/recipes/gtk-webcore/midori/config
new file mode 100644
index 0000000000..7b6991d063
--- /dev/null
+++ b/recipes/gtk-webcore/midori/config
@@ -0,0 +1,4 @@
+
+[settings]
+enforce-96-dpi=true
+toolbar-items=Back,Forward,ReloadStop,Fullscreen,Location,Panel,
diff --git a/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch b/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch
new file mode 100644
index 0000000000..b2541a5edb
--- /dev/null
+++ b/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch
@@ -0,0 +1,34 @@
+diff -Nur o/midori/midori-websettings.c n/midori/midori-websettings.c
+--- o/midori/midori-websettings.c	2009-09-12 00:09:38.000000000 +0200
++++ n/midori/midori-websettings.c	2009-09-14 13:55:12.000000000 +0200
+@@ -285,6 +285,7 @@
+     {
+         static const GEnumValue values[] = {
+          { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("Midori") },
++         { MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", N_("iPhone") },
+          { MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", N_("Safari") },
+          { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") },
+          { MIDORI_IDENT_EXPLORER, "MIDORI_IDENT_EXPLORER", N_("Internet Explorer") },
+@@ -1118,6 +1119,11 @@
+     case MIDORI_IDENT_MIDORI:
+         return g_strdup_printf ("%s (%s; %s; U; %s) %s",
+                                 appname, platform, os, lang, webcore);
++    case MIDORI_IDENT_IPHONE:
++        return g_strdup_printf ("Mozilla/5.0 (iPhone; U; %s; %s) "
++            "AppleWebKit/532+ (KHTML, like Gecko) Version/3.0 Mobile/1A538b " 
++            "Safari/419.3 %s",
++                                os, lang, appname);
+     case MIDORI_IDENT_SAFARI:
+         return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s) "
+             "AppleWebKit/532+ (KHTML, like Gecko) Safari/%s %s",
+diff -Nur o/midori/midori-websettings.h n/midori/midori-websettings.h
+--- -o/midori/midori-websettings.h	2009-09-12 00:09:38.000000000 +0200
++++ n/midori/midori-websettings.h	2009-09-14 13:55:14.000000000 +0200
+@@ -132,6 +132,7 @@
+ typedef enum
+ {
+     MIDORI_IDENT_MIDORI,
++    MIDORI_IDENT_IPHONE,
+     MIDORI_IDENT_SAFARI,
+     MIDORI_IDENT_FIREFOX,
+     MIDORI_IDENT_EXPLORER,
diff --git a/recipes/gtk-webcore/midori_0.1.10.bb b/recipes/gtk-webcore/midori_0.1.10.bb
index 06d8964082..9d1f1dcec8 100644
--- a/recipes/gtk-webcore/midori_0.1.10.bb
+++ b/recipes/gtk-webcore/midori_0.1.10.bb
@@ -1,9 +1,15 @@
 require midori.inc
 
+PR = "r2"
+
 DEPENDS += "python-native python-docutils-native"
 
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.1/midori-${PV}.tar.bz2 \
-           file://waf"
+           file://waf \
+          "
+
+SRC_URI_append_shr = "file://ua-iphone-0.1.10.patch;patch=1 \
+                      file://config"
 
 do_configure() {
 	cp -f ${WORKDIR}/waf ${S}/
@@ -27,5 +33,8 @@ do_configure() {
 	echo "LINK_CC = '${CXX}'" >>  ./_build_/c4che/default.cache.py
 }
 
-
+do_install_append_shr() {
+	install -d ${D}${sysconfdir}/xdg/midori
+	install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/xdg/midori
+}
 
diff --git a/recipes/libxml/libxml2-native.inc b/recipes/libxml/libxml2-native.inc
index 3f67152ca1..603f48d196 100644
--- a/recipes/libxml/libxml2-native.inc
+++ b/recipes/libxml/libxml2-native.inc
@@ -1,26 +1,21 @@
 DESCRIPTION = "GNOME XML library"
 DEPENDS = "python-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
+PR = "r3"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 S = "${WORKDIR}/libxml2-${PV}"
 
-inherit autotools native pkgconfig distutils-native-base
+inherit distutils-base autotools native pkgconfig
 
-do_configure_prepend () {
-	EXTRA_LIBXML2_OECONF="\
-	--with-python=${PYTHON_DIR} \
-	--without-debug \
-	--without-legacy \
-	--with-catalog \
-	--without-docbook \
-	--with-c14n \
-	"
-}
-
-do_configure (){
-	autotools_do_configure ${EXTRA_LIBXML2_OECONF}
-}
+EXTRA_OECONF = "\
+  --with-python=${STAGING_INCDIR}/${PYTHON_MAJMIN} \
+  --without-debug \
+  --without-legacy \
+  --without-catalog \
+  --without-docbook \
+  --with-c14n \
+"
 
 do_stage () {
 	oe_runmake install
diff --git a/recipes/linux/linux-openmoko-shr-devel/fix-install.patch b/recipes/linux/linux-openmoko-shr-devel/fix-install.patch
new file mode 100644
index 0000000000..b14ca7d740
--- /dev/null
+++ b/recipes/linux/linux-openmoko-shr-devel/fix-install.patch
@@ -0,0 +1,23 @@
+From: Steve Sakoman <steve@sakoman.com>
+Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700)
+Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
+X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70
+
+scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
+
+This was causing build failures on some machines
+---
+
+diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
+index 6bf8e87..fb20532 100644
+--- a/scripts/Makefile.fwinst
++++ b/scripts/Makefile.fwinst
+@@ -37,7 +37,7 @@
+        @true
+
+ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
+-      cmd_install = $(INSTALL) -m0644 $< $@
++      cmd_install = $(INSTALL) -m 0644 $< $@
+
+ $(installed-fw-dirs):
+        $(call cmd,mkdir)
diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb
new file mode 100644
index 0000000000..cee68fc436
--- /dev/null
+++ b/recipes/linux/linux-openmoko-shr-devel_git.bb
@@ -0,0 +1,25 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones"
+
+KERNEL_RELEASE = "2.6.29"
+KERNEL_VERSION = "2.6.29-rc3"
+
+OMV = "oe11"
+PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}"
+PR = "r3.5"
+
+SRC_URI = "\
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
+  file://fix-install.patch;patch=1 \
+"
+S = "${WORKDIR}/git"
+
+CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
+CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
+CONFIG_NAME_om-gta03 = "gta03_defconfig"
+
+do_configure_prepend() { 
+	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
+}
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch b/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch
new file mode 100644
index 0000000000..b14ca7d740
--- /dev/null
+++ b/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch
@@ -0,0 +1,23 @@
+From: Steve Sakoman <steve@sakoman.com>
+Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700)
+Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
+X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70
+
+scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
+
+This was causing build failures on some machines
+---
+
+diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
+index 6bf8e87..fb20532 100644
+--- a/scripts/Makefile.fwinst
++++ b/scripts/Makefile.fwinst
+@@ -37,7 +37,7 @@
+        @true
+
+ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
+-      cmd_install = $(INSTALL) -m0644 $< $@
++      cmd_install = $(INSTALL) -m 0644 $< $@
+
+ $(installed-fw-dirs):
+        $(call cmd,mkdir)
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
new file mode 100644
index 0000000000..547be38ed5
--- /dev/null
+++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
@@ -0,0 +1,26 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones"
+
+DEFAULT_PREFERENCE = "-1"
+KERNEL_RELEASE = "2.6.29"
+KERNEL_VERSION = "2.6.29-rc3-drm"
+
+OMV = "oe13"
+PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "\
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \
+  file://fix-install.patch;patch=1 \
+"
+S = "${WORKDIR}/git"
+
+CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
+CONFIG_NAME_om-gta02 = "gta02_drm_defconfig"
+CONFIG_NAME_om-gta03 = "gta03_defconfig"
+
+do_configure_prepend() { 
+	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
+}
diff --git a/recipes/navit/files/fr-default-config.patch b/recipes/navit/files/fr-default-config.patch
new file mode 100644
index 0000000000..1a6df72708
--- /dev/null
+++ b/recipes/navit/files/fr-default-config.patch
@@ -0,0 +1,135 @@
+Index: navit/navit/navit_shipped.xml
+===================================================================
+--- navit/navit/navit_shipped.xml	(Revision 2614)
++++ navit/navit/navit_shipped.xml	(Arbeitskopie)
+@@ -10,6 +10,7 @@
+         <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
+         <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="no"/>
+         <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/>
++        <plugin path="$NAVIT_LIBDIR/binding/libbinding_dbus.so" active="yes"/>
+     </plugins>
+ 
+     <debug name="navit:do_draw" level="0"/>
+@@ -26,38 +27,55 @@
+          [-][D]D.d[d]... [-][D][D]D.d[d]... 
+          [-]0xX [-]0xX -->
+ 
+-    <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10">
++         <!-- center="4800 N 850 E" -->
++    <navit  zoom="256" tracking="1" orientation="0" recent_dest="10" tracking="1" autozoom_active="1">
+         <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use opengl -->
+-        <graphics type="gtk_drawing_area"/>
+         <!-- The following line let you select which graphical user interface you'd like to use.
+              Options include internal (optimized for touch screen devices), gtk (useful for desktop computers) and cegui.
+              In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport.
+              Here's an example for a freerunner: -->
+-        <!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> -->
++        <gui type="internal" font_size="350" icon_xs="48" icon_s="96" icon_l="96" fullscreen="1"/>
++        <!-- <graphics type="sdl"/> -->
++        <graphics type="gtk_drawing_area"/>
+ 	<!-- Normally it is sufficient to use -->
+         <!-- <gui type="internal" /> -->
+ 
+-        <gui type="gtk" menubar="1" toolbar="1" statusbar="1"/>
++        <!-- <gui type="gtk" menubar="1" toolbar="1" statusbar="1"/> -->
+ 
+ 	<!-- for a debug log -->
+         <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>
+         <!-- osd items allow to position display and control items directly on top of the map: -->
+-        <osd enabled="no" type="compass"/>
+-        <osd enabled="no" type="eta"/> 
+-        <osd enabled="no" type="navigation_distance_to_target"/> 
+-        <osd enabled="no" type="navigation"/> 
+-        <osd enabled="no" type="navigation_distance_to_next"/> 
++        <!-- <osd enabled="yes" type="compass"/>
++        <osd enabled="yes" type="eta"/> 
++        <osd enabled="yes" type="navigation_distance_to_target"/> 
++        <osd enabled="yes" type="navigation"/> 
++        <osd enabled="yes" type="navigation_distance_to_next"/> 
+         <osd enabled="no" type="navigation_next_turn"/> 
++        -->
++        <!--top -->
++	<osd enabled="yes" type="text" label="${navigation.item.street_name} ${navigation.item[1].street_name_systematic}" x="0" y="0" w="480" h="30" align="0" background_color="#000000cc" font_size="300" />
++	<osd enabled="yes" type="navigation_next_turn" x="330" y="30" w="150" h="150"/>
++        <osd enabled="yes" type="button" x="0" y="30" w="60" h="60" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> 
++	<osd enabled="yes" type="text" label="${navigation.item[1].length[named]}" x="330" y="180" w="150" h="50" align="0" font_size="450"/>
++        <!-- bottom -->
++	<osd enabled="yes" type="button" x="-96" y="-121" command="zoom_in()" src="zoom_in.xpm"  background_color="#000000cc" />
++	<osd enabled="yes" type="button" x="0" y="-121" command="zoom_out()" src="zoom_out.xpm"  background_color="#000000cc" />
++	<osd enabled="yes" type="text" label="${vehicle.position_speed}" x="96" y="-50" w="288" h="25" align="0" background_color="#000000cc" font_size="280"/>
++	<osd enabled="yes" type="text" label="ETA:${navigation.item.destination_time[arrival]}" x="0" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" />
++	<osd enabled="yes" type="text" label="TL:${navigation.item.destination_time[remaining]}" x="160" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" />
++	<osd enabled="yes" type="text" label="Dist:${navigation.item.destination_length[named]}" x="320" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" />
+ 
++
++
+         <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out.
+              Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner.
+              It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. -->
+-        <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> 
+-        <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/>
+-        <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/>
+-        <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/> 
+-
+-        <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj">
++<!--        <osd enabled="yes" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> 
++        <osd enabled="yes" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/>
++        <osd enabled="yes" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/>
++        <osd enabled="yes" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/> 
++-->
++<vehicle name="Gypsy" profilename="car" enabled="yes" active="1" source="gypsy:/dev/ttySAC2" gpsd_query="w+xj" color="#00ff00" follow="10">
+             <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->
+             <!-- <log type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> -->
+             <cursor w="26" h="26">
+@@ -85,7 +103,7 @@
+         <!-- For SDL, you should add follow="1" to have the view centered on your position -->
+         <!-- <vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1"/> -->
+ 
+-        <vehicle name="Demo" profilename="car" enabled="no" active="yes" source="demo://">
++        <vehicle name="Demo" profilename="car" enabled="no" active="yes" source="demo://" follow="10">
+             <cursor w="26" h="26">
+                 <itemgra>
+                     <circle color="#0000ff" radius="24" width="2">
+@@ -353,33 +371,33 @@
+         <!-- Navit provides speech output in text format.
+              If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second.
+              The default is text output to the shell -->
+-        <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/>
++        <speech type="cmdline" data="espeak --stdout -v ${LANG%%_*} '%s' | aplay" cps="15"/>
+         <!-- <speech type="cmdline" data="flite -t '%s'"/> -->
+ 
+         <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly -->
+-        <mapset enabled="no">
++        <!-- <mapset enabled="no">
+             <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map"/>
+             <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp"/>
+             <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp2.smp"/>
+             <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp3.smp"/>
+             <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp4.smp"/>
+             <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp"/>
+-        </mapset>
++        </mapset> -->
+ 
+         <!-- If you dont want to use the sample map, either set enabled="no" in the next line or remove the xml file from the maps directory -->
+-        <mapset enabled="yes">
++        <!-- <mapset enabled="no">
+             <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/>
+-        </mapset>
++        </mapset> -->
+ 
+ 				<!-- Mapset template for openstreetmaps -->
+-				<mapset enabled="no">
+-					<map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/>
++	<mapset enabled="yes">
++		<map type="binfile" enabled="yes" active="1" data="/usr/share/navit/maps/*.bin"/>
+         </mapset>
+ 
+ 				<!-- Mapset template for garmin maps -->
+-        <mapset enabled="no">
++        <!-- <mapset enabled="no">
+             <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/>
+-        </mapset>
++        </mapset> -->
+ 
+         <layout name="Car" color="#ffefb7" font="Liberation Sans">
+             <layer name="polygons">
diff --git a/recipes/navit/files/navit-svn.xml-so.patch b/recipes/navit/files/navit-svn.xml-so.patch
new file mode 100644
index 0000000000..bde8658c60
--- /dev/null
+++ b/recipes/navit/files/navit-svn.xml-so.patch
@@ -0,0 +1,17 @@
+--- navit/navit/navit_shipped.xml.orig	2009-07-19 13:08:16.000000000 +0200
++++ navit/navit/navit_shipped.xml	2009-07-19 13:09:12.000000000 +0200
+@@ -6,10 +6,10 @@
+      on upgrade. Rather copy it to ~/.navit/. Please read wiki -->
+ <config xmlns:xi="http://www.w3.org/2001/XInclude">
+     <plugins>
+-        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/>
+-        <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
+-        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="no"/>
+-        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/>
++        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0" ondemand="yes"/>
++        <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so.0"/>
++        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so.0" active="no"/>
++        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no"/>
+     </plugins>
+ 
+     <debug name="navit:do_draw" level="0"/>
diff --git a/recipes/navit/files/navit.desktop b/recipes/navit/files/navit.desktop
index 085c8c9238..05ecc1d4ee 100644
--- a/recipes/navit/files/navit.desktop
+++ b/recipes/navit/files/navit.desktop
@@ -2,7 +2,7 @@
 Name=Navit
 Comment=GPS Navigation
 Exec=navit
-Icon=navit.png
+Icon=navit
 Terminal=false
 Type=Application
 Categories=GTK;
diff --git a/recipes/navit/files/navit.service b/recipes/navit/files/navit.service
new file mode 100644
index 0000000000..add181c952
--- /dev/null
+++ b/recipes/navit/files/navit.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.navit_project.navit
+Exec=/usr/bin/navit
diff --git a/recipes/navit/files/navit.xml-so.patch b/recipes/navit/files/navit.xml-so.patch
index c374756447..9151bc4a5e 100644
--- a/recipes/navit/files/navit.xml-so.patch
+++ b/recipes/navit/files/navit.xml-so.patch
@@ -1,13 +1,17 @@
---- navit-0.0.3/src/navit.xml.orig	2008-01-01 15:24:43.000000000 +0000
-+++ navit-0.0.3/src/navit.xml	2008-01-01 15:25:01.000000000 +0000
-@@ -1,8 +1,8 @@
- <?xml version="1.0" encoding="utf-8"?>
- <!DOCTYPE navit SYSTEM "navit.dtd">
- <plugins>
--	<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"/>
--	<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no" />
-+	<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0"/>
-+	<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no" />
- </plugins>
- <debug name="navit:do_draw" level="0" />
- <!--
+--- navit/navit/navit.xml.orig	2009-07-19 13:08:16.000000000 +0200
++++ navit/navit/navit.xml	2009-07-19 13:09:12.000000000 +0200
+@@ -6,10 +6,10 @@
+      on upgrade. Rather copy it to ~/.navit/. Please read wiki -->
+ <config xmlns:xi="http://www.w3.org/2001/XInclude">
+     <plugins>
+-        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/>
+-        <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
+-        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="no"/>
+-        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/>
++        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0" ondemand="yes"/>
++        <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so.0"/>
++        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so.0" active="no"/>
++        <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no"/>
+     </plugins>
+ 
+     <debug name="navit:do_draw" level="0"/>
diff --git a/recipes/navit/files/use-fso-raw.patch b/recipes/navit/files/use-fso-raw.patch
new file mode 100644
index 0000000000..542d27f227
--- /dev/null
+++ b/recipes/navit/files/use-fso-raw.patch
@@ -0,0 +1,13 @@
+--- a/../navit.launcher
++++ b/../navit.launcher
+@@ -25,6 +25,6 @@ then
+ 	fi
+ fi
+ 
+-navit.real $*
++fsoraw -r Display,GPS -- navit.real $*
+ 	
+ 
+-- 
+1.6.0.4
+
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 8ad439df2a..aa0033086f 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -2,31 +2,37 @@ DESCRIPTION = "Navit is a car navigation system with routing engine."
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS = "glib-2.0 gtk+"
-RRECOMMENDS = "gpsd speechd flite"
+RRECOMMENDS = "gpsd espeak flite"
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned  --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher"
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 
 FILES_${PN} += "${libdir}/${PN}/*/*.so"
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN}-dev += "${libdir}/${PN}/*/*.la"
 
 SRC_URI_append = " \
                   file://navit.desktop \
                   file://navit.launcher \
                   file://navit.png \
+                  file://navit.service \
 	  	 "
+SRC_URI_append_shr = "file://use-fso-raw.patch;patch=1 \
+                      file://fr-default-config.patch;patch=1"
+
+DEPENDS_shr += "gypsy"
 
 do_install_append() {
         install -d ${D}${datadir}/applications/
         install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/
         install -d ${D}${datadir}/pixmaps/
         install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/
+        install -d ${D}${datadir}/dbus-1/services/
+        install -m 0644 ${WORKDIR}/navit.service ${D}${datadir}/dbus-1/services/
 
         mv ${D}${bindir}/navit ${D}${bindir}/navit.real
         install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit
-
-	rm ${D}${libdir}/${PN}/*/*.la
 }
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index 833eb4714e..64f55744c6 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -1,10 +1,12 @@
 require navit.inc
 
-PV = "0.1.0+svnrev${SRCREV}"
-PR = "r2"
+PV = "0.2.0+svnrev${SRCREV}"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+EXTRA_OECONF_shr += " --enable-cache-size=20971520 --with-svg2png-use-convert"
+
 S = "${WORKDIR}/navit"
 
 SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https"
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 8a6bf30c22..e7d831b266 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -1,14 +1,14 @@
 DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "udev zlib ncurses virtual/libintl"
+DEPENDS = "blktool udev zlib ncurses virtual/libintl"
 
 inherit autotools_stage
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r8"
+INC_PR = "r9"
 
 # allows for a release candidate
 RC ?= ""
diff --git a/recipes/vagalume/vagalume_0.7.1.bb b/recipes/vagalume/vagalume_0.7.1.bb
index 5b29ae17b6..cfbeffde9c 100644
--- a/recipes/vagalume/vagalume_0.7.1.bb
+++ b/recipes/vagalume/vagalume_0.7.1.bb
@@ -2,8 +2,10 @@ DESCRIPTION = "Last.fm client"
 AUTHOR = "agarcia@igalia.com"
 HOMEPAGE = "http://vagalume.igalia.com/"
 SECTION = "x11"
-DEPENDS = "gtk+ gstreamer"
+DEPENDS = "gtk+ gstreamer curl gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}"
+RDEPENDS = "curl gst-plugin-autodetect gst-plugin-audioconvert gst-plugin-alsa librsvg-gtk ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)}"
 RRECOMMENDS = "dbus-x11"
+PR = "r1"
 
 SRC_URI = "http://vagalume.igalia.com/files/source/vagalume_${PV}.orig.tar.gz\
 	  "
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch
new file mode 100644
index 0000000000..414d72db30
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch
@@ -0,0 +1,21 @@
+Index: xorg-server/m4/dolt.m4
+===================================================================
+--- xorg-server/m4/dolt.m4	2009-04-14 21:14:56.000000000 +0400
++++ xorg-server-2/m4/dolt.m4	2009-07-15 12:38:33.796848843 +0400
+@@ -147,7 +147,7 @@
+     cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
+ #!$DOLT_BASH
+ __DOLTLIBTOOL__EOF__
+-    cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
++    cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
+ top_builddir_slash="${0%%doltlibtool}"
+ : ${top_builddir_slash:=./}
+ args=()
+@@ -163,7 +163,7 @@
+ if $modeok && $tagok ; then
+     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+-    exec ${top_builddir_slash}libtool "$[]@"
++    exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
+ fi
+ __DOLTLIBTOOL__EOF__