merge of '917b0d8264255bcc05a47f9b2b7167bf8781ef46'

     and 'd355cc8d988e0476f885987030dc5cdc1fc2614e'

13 files changed, 463 insertions, 39 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 71303ab836..6019980ac9 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -152,9 +152,14 @@ PREFERRED_VERSION_osb-nrcore  = "0.5.2+svn${SRCDATE}"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
+PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
+PREFERRED_VERSION_libxrandr ?= "1.2.1"
+PREFERRED_VERSION_xrandr ?= "1.2.0" 
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+
 require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
-#PREFERRED_VERSION_xserver-kdrive = "1.2.0"
+
 PREFERRED_VERSION_gtk+ = "2.10.12"
 PREFERRED_VERSION_libgnomeui = "2.16.1"
 
diff --git a/packages/gcc/gcc-4.1.2/cache-amnesia.patch b/packages/gcc/gcc-4.1.2/cache-amnesia.patch
new file mode 100644
index 0000000000..ef7cd111c5
--- /dev/null
+++ b/packages/gcc/gcc-4.1.2/cache-amnesia.patch
@@ -0,0 +1,13 @@
+diff --git a/gcc/configure b/gcc/configure
+index 44620ab..6e1830c 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -12272,7 +12272,7 @@ else
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+-	${realsrcdir}/configure \
++	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+ 	CFLAGS="${saved_CFLAGS}"
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 417909eb1b..2557a2694e 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -29,6 +29,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
         file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+	file://cache-amnesia.patch;patch=1 \
 	"
 
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
@@ -45,6 +46,7 @@ JAVA = ""
 
 LANGUAGES = "c,c++${FORTRAN}${JAVA}"
 require gcc3-build.inc
+ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
 
 
 EXTRA_OECONF += " --disable-libssp "
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index 2910cbd0a4..34fe1ac123 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -34,7 +34,7 @@ PACKAGE_ARCH_mencoder_collie = "collie"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r12"
+PR = "r13"
 
 PARALLEL_MAKE = ""
 
@@ -177,13 +177,24 @@ EXTRA_OECONF = " \
 EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \
 			    --disable-encoder=vorbis_encoder"
 
-EXTRA_OECONF_append_c7x0 = " --enable-w100 --enable-imageon "
-EXTRA_OECONF_append_hx4700 = " --enable-imageon "
 EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
+
+#enable support for the ati imageon series (w100 and w3220)
+EXTRA_OECONF_append_c7x0 = " --enable-w100 "
+EXTRA_OECONF_append_hx4700 = " --enable-imageon "
+
+#enable pxa270 overlay support
 EXTRA_OECONF_append_spitz = " --enable-pxa "
+EXTRA_OECONF_append_a780 = " --enable-pxa "
 
+#build with support for the iwmmxt instruction support (pxa270 and up)
 TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt"
 PACKAGE_ARCH_spitz = "iwmmxt"
+TARGET_CC_ARCH_a780 = "-march=iwmmxt -mtune=iwmmxt"
+PACKAGE_ARCH_a780 = "iwmmxt"
+TARGET_CC_ARCH_hx4700 = "-march=iwmmxt -mtune=iwmmxt"
+PACKAGE_ARCH_hx4700= "iwmmxt"
+
 
 do_configure() {
 	cp ${WORKDIR}/vo_w100.c ${S}/libvo
diff --git a/packages/opie-multikey/files/ru.keymap b/packages/opie-multikey/files/ru.keymap
new file mode 100644
index 0000000000..9f5d1e360b
--- /dev/null
+++ b/packages/opie-multikey/files/ru.keymap
@@ -0,0 +1,255 @@
+# Created by Anton Kachalov (mouse@altlinux.ru)
+title = Russian
+sw = RU
+
+1 0x1000    0       2 # and you can write whatever you want after the last element
+
+
+    "9 9 2 1"
+    ". c None"
+    "a c #000000"
+    "........."
+    "........."
+    ".aa.aa.aa"
+    ".a..a..a."
+    ".aa.aa.a."
+    ".a...a.a."
+    ".aa.aa.aa"
+    "........."
+    "........."
+
+1 0	    0x0451  2   # CYRILLIC SMALL LETTER IO
+1 0         0x31    2   # 1
+1 0         0x32    2	# 2
+1 0         0x33    2   # 3
+1 0         0x34    2   # 4
+1 0         0x35    2   # 5
+1 0         0x36    2   # 6
+1 0         0x37    2   # 7
+1 0         0x38    2   # 8
+1 0         0x39    2   # 9
+1 0	    0x30    2	# 0
+1 0	    0x2d    2	# -
+1 0	    0x3d    2	# =
+1 0x1003    0       2
+
+        "9 9 2 1"
+        ". c None"
+        "a c #000000"
+        "........."
+        "........."
+        "...a....."
+        "..aa....."
+        ".aaaaaaaa"
+        "..aa....."
+        "...a....."
+        "........."
+        "........."
+
+
+2 0x1001    0x9     3 # tab char, but why doesnt this work...?
+
+
+        "11 9 2 1"
+        ". c None"
+        "a c #000000"
+        "..........."
+        "..........."
+        ".....a..a.."
+        ".....aa.a.."
+        ".aaaaaaaa.."
+        ".....aa.a.."
+        ".....a..a.."
+        "..........."
+        "..........."
+2 0         0x0439    2  # CYRILLIC SMALL LETTER SHORT I
+2 0         0x0446    2  # CYRILLIC SMALL LETTER TSE
+2 0         0x0443    2  # CYRILLIC SMALL LETTER U
+2 0         0x043a    2  # CYRILLIC SMALL LETTER KA
+2 0         0x0435    2  # CYRILLIC SMALL LETTER IE
+2 0         0x043d    2  # CYRILLIC SMALL LETTER EN
+2 0         0x0433    2  # CYRILLIC SMALL LETTER GHE
+2 0         0x0448    2  # CYRILLIC SMALL LETTER SHA
+2 0         0x0449    2  # CYRILLIC SMALL LETTER SHCHA
+2 0         0x0437    2  # CYRILLIC SMALL LETTER ZE
+2 0         0x0445    2  # CYRILLIC SMALL LETTER HA
+2 0         0x044a    2  # CYRILLIC SMALL LETTER HARD SIGN
+2 0         0x2f      4  # /
+
+3 0x1024    0       4
+        "17 7 2 1"
+        "   c None"
+        ".  c #000000"
+        "                 "
+        "  ..  .  ..   .. "
+        " .   . . . . .   "
+        " .   ... ..   .  "
+        " .   . . .     . "
+        "  .. . . .   ..  "
+        "                 "
+3 0         0x0444    2 # CYRILLIC SMALL LETTER EF
+3 0         0x044b    2 # CYRILLIC SMALL LETTER YERU
+3 0         0x0432    2 # CYRILLIC SMALL LETTER VE
+3 0         0x0430    2 # CYRILLIC SMALL LETTER A
+3 0         0x043f    2 # CYRILLIC SMALL LETTER PE
+3 0         0x0440    2 # CYRILLIC SMALL LETTER ER
+3 0         0x043e    2 # CYRILLIC SMALL LETTER O
+3 0         0x043b    2 # CYRILLIC SMALL LETTER EL
+3 0         0x0434    2 # CYRILLIC SMALL LETTER DE
+3 0         0x0436    2 # CYRILLIC SMALL LETTER ZHE
+3 0         0x044d    2 # CYRILLIC SMALL LETTER E
+3 0x1004    0         5 # ENTER
+        "16 9 2 1"
+        ". c None"
+        "a c #000000"
+        "................"
+        "................"
+        "...........a...."
+        "....aa.....a...."
+        "...aa......a...."
+        "..aaaaaaaaaa...."
+        "...aa..........."
+        "....aa.........."
+        "................"
+
+4 0x1020    0       5
+        "21 7 2 1"
+        "   c None"
+        ".  c #000000"
+        "                     "
+        "  .. . . ... ... ... "
+        " .   . .  .  .    .  "
+        "  .  ...  .  ..   .  "
+        "   . . .  .  .    .  "
+        " ..  . . ... .    .  "
+        "                     "
+4 0         0x044f    2 # CYRILLIC SMALL LETTER YA
+4 0         0x0447    2 # CYRILLIC SMALL LETTER CHE
+4 0         0x0441    2 # CYRILLIC SMALL LETTER ES
+4 0         0x043c    2 # CYRILLIC SMALL LETTER EM
+4 0         0x0438    2 # CYRILLIC SMALL LETTER I
+4 0         0x0442    2 # CYRILLIC SMALL LETTER TE
+4 0         0x044c    2 # CYRILLIC SMALL LETTER SOFT SIGN
+4 0         0x0431    2 # CYRILLIC SMALL LETTER BE
+4 0         0x044e    2 # CYRILLIC SMALL LETTER YU
+4 0         0x2e      2 # .
+4 0x1020    0         5 # SHIFT
+        "21 7 2 1"
+        "   c None"
+        ".  c #000000"
+        "                     "
+        "  .. . . ... ... ... "
+        " .   . .  .  .    .  "
+        "  .  ...  .  ..   .  "
+        "   . . .  .  .    .  "
+        " ..  . . ... .    .  "
+        "                     "
+
+5 0x1021    0       3
+        "17 7 2 1"
+        "   c None"
+        ".  c #000000"
+        "                 "
+        "  .. ... ..  .   "
+        " .    .  . . .   "
+        " .    .  ..  .   "
+        " .    .  . . .   "
+        "  ..  .  . . ... "
+        "                 "
+5 0x1023    0       3
+        "13 7 2 1"
+        "   c None"
+        ".  c #000000"
+        "             "
+        "  .  .   ... "
+        " . . .    .  "
+        " ... .    .  "
+        " . . .    .  "
+        " . . ...  .  "
+        "             "
+5 0         0x20    16
+5 0x1023    0       3
+        "13 7 2 1"
+        "   c None"
+        ".  c #000000"
+        "             "
+        "  .  .   ... "
+        " . . .    .  "
+        " ... .    .  "
+        " . . .    .  "
+        " . . ...  .  "
+        "             "
+5 0x1021    0       3 
+        "17 7 2 1"
+        "   c None"
+        ".  c #000000"
+        "                 "
+        "  .. ... ..  .   "
+        " .    .  . . .   "
+        " .    .  ..  .   "
+        " .    .  . . .   "
+        "  ..  .  . . ... "
+        "                 "
+5 0x1030    0       2 #original code is F1, but i'll use it for turning on/off the config dialog
+        "13 7 2 1"
+        "   c None"
+        ".  c #000000"
+        "             "
+        "      .      "
+        "     ...     "
+        "    .....    "
+        "      .      "
+        "      .      "
+        "             "
+
+# shift table
+0x0451  0x0401 # CYRILLIC SMALL LETTER IO -> CYRILLIC CAPITAL LETTER IO
+0x31  0x21 # 1 -> !
+0x32  0x22 # 2 -> "
+0x33  0x4e # 3 -> N
+0x34  0x3b # 4 -> ;
+0x35  0x25 # 5 -> %
+0x36  0x3a # 6 -> :
+0x37  0x3f # 7 -> ?
+0x38  0x2a # 8 -> *
+0x39  0x28 # 9 -> (
+0x30  0x29 # 0 -> )
+0x2d  0x5f # - -> _
+0x3d  0x2b # = -> +
+
+0x0439  0x0419  # CYRILLIC SMALL LETTER SHORT I   -> CYRILLIC CAPITAL LETTER SHORT I
+0x0446  0x0426  # CYRILLIC SMALL LETTER TSE       -> CYRILLIC CAPITAL LETTER TSE
+0x0443  0x0423  # CYRILLIC SMALL LETTER U         -> CYRILLIC CAPITAL LETTER U
+0x043a  0x041a  # CYRILLIC SMALL LETTER KA        -> CYRILLIC CAPITAL LETTER KA
+0x0435  0x0415  # CYRILLIC SMALL LETTER IE        -> CYRILLIC CAPITAL LETTER IE
+0x043d  0x041d  # CYRILLIC SMALL LETTER EN        -> CYRILLIC CAPITAL LETTER EN
+0x0433  0x0413  # CYRILLIC SMALL LETTER GHE       -> CYRILLIC CAPITAL LETTER GHE
+0x0448  0x0428  # CYRILLIC SMALL LETTER SHA       -> CYRILLIC CAPITAL LETTER SHA
+0x0449  0x0429  # CYRILLIC SMALL LETTER SHCHA     -> CYRILLIC CAPITAL LETTER SHCHA
+0x0437  0x0417  # CYRILLIC SMALL LETTER ZE        -> CYRILLIC CAPITAL LETTER ZE
+0x0445  0x0425  # CYRILLIC SMALL LETTER HA        -> CYRILLIC CAPITAL LETTER HA
+0x044a  0x042a  # CYRILLIC SMALL LETTER HARD SIGN -> CYRILLIC CAPITAL LETTER HARD SIGN
+
+0x0444  0x0424 # CYRILLIC SMALL LETTER EF         -> CYRILLIC CAPITAL LETTER EF
+0x044b  0x042b # CYRILLIC SMALL LETTER YERU       -> CYRILLIC CAPITAL LETTER YERU
+0x0432  0x0412 # CYRILLIC SMALL LETTER VE         -> CYRILLIC CAPITAL LETTER VE
+0x0430  0x0410 # CYRILLIC SMALL LETTER A          -> CYRILLIC CAPITAL LETTER A
+0x043f  0x041f # CYRILLIC SMALL LETTER PE         -> CYRILLIC CAPITAL LETTER PE
+0x0440  0x0420 # CYRILLIC SMALL LETTER ER         -> CYRILLIC CAPITAL LETTER ER
+0x043e  0x041e # CYRILLIC SMALL LETTER O          -> CYRILLIC CAPITAL LETTER O
+0x043b  0x041b # CYRILLIC SMALL LETTER EL         -> CYRILLIC CAPITAL LETTER EL
+0x0434  0x0414 # CYRILLIC SMALL LETTER DE         -> CYRILLIC CAPITAL LETTER DE
+0x0436  0x0416 # CYRILLIC SMALL LETTER ZHE        -> CYRILLIC CAPITAL LETTER ZHE
+0x044d  0x042d # CYRILLIC SMALL LETTER E          -> CYRILLIC CAPITAL LETTER E
+
+0x044f  0x042f # CYRILLIC SMALL LETTER YA         -> CYRILLIC CAPITAL LETTER YA
+0x0447  0x0427 # CYRILLIC SMALL LETTER CHE        -> CYRILLIC CAPITAL LETTER CHE
+0x0441  0x0421 # CYRILLIC SMALL LETTER ES         -> CYRILLIC CAPITAL LETTER ES
+0x043c  0x041c # CYRILLIC SMALL LETTER EM         -> CYRILLIC CAPITAL LETTER EM
+0x0438  0x0418 # CYRILLIC SMALL LETTER I          -> CYRILLIC CAPITAL LETTER I
+0x0442  0x0422 # CYRILLIC SMALL LETTER TE         -> CYRILLIC CAPITAL LETTER TE
+0x044c  0x042c # CYRILLIC SMALL LETTER SOFT SIGN  -> CYRILLIC CAPITAL LETTER SOFT SIGN
+0x0431  0x0411 # CYRILLIC SMALL LETTER BE         -> CYRILLIC CAPITAL LETTER BE
+0x044e  0x042e # CYRILLIC SMALL LETTER YU         -> CYRILLIC CAPITAL LETTER YU
+0x2f    0x7c   # / -> |
+0x2e    0x2c   # . -> ,
diff --git a/packages/opie-multikey/opie-multikey.inc b/packages/opie-multikey/opie-multikey.inc
index e936072b4c..9676111efa 100644
--- a/packages/opie-multikey/opie-multikey.inc
+++ b/packages/opie-multikey/opie-multikey.inc
@@ -32,5 +32,6 @@ do_install() {
 	install -d ${D}${palmtopdir}/share/multikey/
 	install -m 0644 ${WORKDIR}/share/multikey/*.keymap ${D}${palmtopdir}/share/multikey/
 	install -m 0644 ${WORKDIR}/share/multikey/README ${D}${palmtopdir}/share/multikey/
+	install -m 0644 ${FILESDIR}/ru.keymap ${D}${palmtopdir}/share/multikey/
 }
 
diff --git a/packages/opie-reader/files/.mtn2git_empty b/packages/opie-reader/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-reader/files/.mtn2git_empty
diff --git a/packages/opie-reader/files/opie-reader-unicode-copy.patch b/packages/opie-reader/files/opie-reader-unicode-copy.patch
new file mode 100644
index 0000000000..d7d1ae24bd
--- /dev/null
+++ b/packages/opie-reader/files/opie-reader-unicode-copy.patch
@@ -0,0 +1,11 @@
+--- opie-reader/QTReaderApp.cpp.orig	2005-05-18 00:48:25.000000000 +0200
++++ opie-reader/QTReaderApp.cpp	2006-04-08 15:55:43.000000000 +0200
+@@ -2558,7 +2558,7 @@
+ 	reader->jumpto(m_savedpos);
+ 	while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)
+ 	{
+-	    text += ch;
++	    text += QChar(ch);
+ 	}
+ 	cb->setText(text);
+ 	reader->locate(currentpos);
diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb
index 2f844d8dfd..82b3547ae1 100644
--- a/packages/opie-reader/opie-reader_cvs.bb
+++ b/packages/opie-reader/opie-reader_cvs.bb
@@ -1,8 +1,10 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = r1
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};module=opie/pics \
-           ${HANDHELDS_CVS};module=opie/apps"
+           ${HANDHELDS_CVS};module=opie/apps \
+	   file://opie-reader-unicode-copy.patch;patch=1"
 
diff --git a/packages/sdlperl/sdl-perl_1.20.3.bb b/packages/sdlperl/sdl-perl_1.20.3.bb
index 80bd899dfc..6820fa05ce 100644
--- a/packages/sdlperl/sdl-perl_1.20.3.bb
+++ b/packages/sdlperl/sdl-perl_1.20.3.bb
@@ -1,40 +1,18 @@
 DESCRIPTION = "Perl bindings for SDL"
-HOMEPAGE = "http://bloodgate.com/perl"
 SECTION = "libs"
+HOMEPAGE = "http://sdl.perl.org/"
 LICENSE = "GPL"
 DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg"
+PR = "r1"
 
-SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz \
-    file://Makefile.patch;patch=1;pnum=0"
+SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_perl-${PV}"
 
-do_configure () {
-        if [ -x ${S}/configure ] ; then
-                cfgcmd="${S}/configure \
-                    -GL -GLU"
-                oenote "Running $cfgcmd..."
-                $cfgcmd || oefatal "oe_runconf failed"
-		if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-			. ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
-			sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new
-			mv Makefile.new Makefile
-		fi
-        else
-                oefatal "no configure script found"
-        fi
-}
-
-do_stage () {
-    install -d ${STAGING_LIBDIR}/perl5/vendor_perl
-    install -m 0644 ${S}/lib/SDL.pm ${STAGING_LIBDIR}/perl5/vendor_perl
-}
+inherit cpan
 
-do_compile () {
-        oe_runmake PASTHRU_INC="${CFLAGS}"
+do_configure_prepend() {
+        # Search staging area for includes
+        sed -i -e 's:/usr/\(local/\)\{0,1\}include:${STAGING_INCDIR}:g' Makefile.linux
+        # smpeg.h isn't in a subdirectry
+        sed -i -e 's:#include <smpeg/smpeg.h>:#include <smpeg.h>:g' SDL_perl.xs
 }
-
-do_install () {
-	oe_runmake install_vendor
-}
-
-FILES_${PN} += '${libdir}/perl5'
diff --git a/packages/telepathy/empathy-0.5/.mtn2git_empty b/packages/telepathy/empathy-0.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/telepathy/empathy-0.5/.mtn2git_empty
diff --git a/packages/telepathy/empathy-0.5/no-gnome.diff b/packages/telepathy/empathy-0.5/no-gnome.diff
new file mode 100644
index 0000000000..29d6276f51
--- /dev/null
+++ b/packages/telepathy/empathy-0.5/no-gnome.diff
@@ -0,0 +1,146 @@
+Index: libempathy-gtk/gossip-ui-utils.c
+===================================================================
+--- libempathy-gtk/gossip-ui-utils.c	(revision 99)
++++ libempathy-gtk/gossip-ui-utils.c	(working copy)
+@@ -33,7 +33,7 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <glade/glade.h>
+-#include <libgnome/libgnome.h>
++#include <libgnomevfs/gnome-vfs-utils.h>
+ 
+ #include <libmissioncontrol/mc-profile.h>
+ 
+@@ -1280,13 +1280,14 @@
+ gossip_url_show (const char *url)
+ {
+ 	gchar  *real_url;
+-	GError *error = NULL;
++	GnomeVFSResult res;
+ 
+ 	real_url = fixup_url (url);
+-	gnome_url_show (real_url, &error);
+-	if (error) {
+-		g_warning ("Couldn't show URL:'%s'", real_url);
+-		g_error_free (error);
++	res = gnome_vfs_url_show (real_url);
++	if (res != GNOME_VFS_OK) {
++		g_warning ("Couldn't show URL %s: %s",
++			   real_url,
++			   gnome_vfs_result_to_string (res));
+ 	}
+ 
+ 	g_free (real_url);
+Index: src/empathy-chat-main.c
+===================================================================
+--- src/empathy-chat-main.c	(revision 99)
++++ src/empathy-chat-main.c	(working copy)
+@@ -28,9 +28,6 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-program.h>
+-#include <libgnomeui/gnome-ui-init.h>
+-
+ #include <libtelepathy/tp-conn.h>
+ #include <libtelepathy/tp-chan.h>
+ #include <libmissioncontrol/mc-account.h>
+@@ -162,7 +159,6 @@
+ main (int argc, char *argv[])
+ {
+ 	EmpathyChandler *chandler;
+-	GnomeProgram    *program;
+ 	gchar           *localedir;
+ 
+ 	localedir = gossip_paths_get_locale_path ();
+@@ -171,14 +167,8 @@
+ 	textdomain (GETTEXT_PACKAGE);
+ 	g_free (localedir);
+ 
+-	program = gnome_program_init ("empathy-chat",
+-				      PACKAGE_VERSION,
+-				      LIBGNOMEUI_MODULE,
+-				      argc, argv,
+-				      GNOME_PROGRAM_STANDARD_PROPERTIES,
+-				      GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
+-				      NULL);
+-
++	gtk_init (&argc, &argv);
++	
+ 	gtk_window_set_default_icon_name ("empathy");
+ 
+ 	if (g_getenv ("EMPATHY_DEBUG")) {
+@@ -194,7 +184,6 @@
+ 
+ 	gtk_main ();
+ 
+-	g_object_unref (program);
+ 	g_object_unref (chandler);
+ 
+ 	return EXIT_SUCCESS;
+Index: src/empathy-main.c
+===================================================================
+--- src/empathy-main.c	(revision 99)
++++ src/empathy-main.c	(working copy)
+@@ -28,9 +28,6 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ 
+-#include <libgnome/gnome-program.h>
+-#include <libgnomeui/gnome-ui-init.h>
+-
+ #include <libmissioncontrol/mc-account.h>
+ #include <libmissioncontrol/mc-account-monitor.h>
+ #include <libmissioncontrol/mission-control.h>
+@@ -136,7 +133,6 @@
+ 	McAccountMonitor  *monitor;
+ 	EmpathyFilter     *filter;
+ 	gchar             *localedir;
+-	GnomeProgram      *program;
+ 	gboolean           no_connect = FALSE;
+ 	GOptionContext    *context;
+ 	GOptionEntry       options[] = {
+@@ -157,14 +153,8 @@
+ 
+ 	g_set_application_name (PACKAGE_NAME);
+ 
+-	program = gnome_program_init ("empathy",
+-				      PACKAGE_VERSION,
+-				      LIBGNOMEUI_MODULE,
+-				      argc, argv,
+-				      GNOME_PROGRAM_STANDARD_PROPERTIES,
+-				      "goption-context", context,
+-				      GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
+-				      NULL);
++	gtk_init (&argc, &argv);
++	/* TODO: option parsing */
+ 
+ 	gtk_window_set_default_icon_name ("empathy");
+ 
+@@ -204,7 +194,6 @@
+ 	g_object_unref (monitor);
+ 	g_object_unref (mc);
+ 	g_object_unref (icon);
+-	g_object_unref (program);
+ 
+ 	return EXIT_SUCCESS;
+ }
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 99)
++++ configure.ac	(working copy)
+@@ -62,12 +62,13 @@
+ 
+ PKG_CHECK_MODULES(EMPATHY,
+ [
++   libxml-2.0
+    glib-2.0 >= $GLIB_REQUIRED
+    gobject-2.0
+    gtk+-2.0 >= $GTK_REQUIRED
+    gconf-2.0 >= $GCONF_REQUIRED
+    libglade-2.0 >= $LIBGLADE_REQUIRED
+-   libgnomeui-2.0
++   gnome-vfs-2.0
+    libtelepathy >= $TELEPATHY_REQUIRED
+    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+ ])
diff --git a/packages/telepathy/empathy_0.5.bb b/packages/telepathy/empathy_0.5.bb
index 39cccfbdf0..e7b2af1d57 100644
--- a/packages/telepathy/empathy_0.5.bb
+++ b/packages/telepathy/empathy_0.5.bb
@@ -1,16 +1,16 @@
 DESCRIPTION = "Empathy: a Telepathy based IM client"
 HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
 LICENSE = "GPL"
-DEPENDS = "libgnomeui telepathy-mission-control libtelepathy gtk+ gconf libglade"
+DEPENDS = "telepathy-mission-control libtelepathy gtk+ gconf libglade gnome-vfs"
 RDEPENDS = "telepathy-mission-control"
 RRECOMMENDS = "telepathy-gabble"
 
-PR="r0"
+PR="r1"
 
 inherit gnome
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-${PV}.tar.bz2 \
-          "
+           file://no-gnome.diff;patch=1;pnum=0"
 
 FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
         ${datadir}/dbus-1/services/*.service \