Merge branch 'org.openembedded.dev' of ssh://git@git.openembedded.net/openembedded into org.openembedded.dev

49 files changed, 1072 insertions, 0 deletions

diff --git a/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch b/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch
new file mode 100644
index 0000000000..a667f11665
--- /dev/null
+++ b/recipes/xfce-base/exo-0.3.105/exo-0.3.105-iocharset.patch
@@ -0,0 +1,79 @@
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index 791a536..4b130c3 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -34,6 +34,8 @@
+ #include <unistd.h>
+ #endif
+ 
++#include <langinfo.h>
++
+ #include <libhal-storage.h>
+ 
+ #include <exo-hal/exo-hal.h>
+@@ -616,6 +618,30 @@ oom:  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
+ 
+ 
+ /**
++ * exo_mount_hal_iocharset:
++ *
++ * Determines the preferred iocharset for filesystems
++ * that support it.
++ *
++ * Return value: iocharset string or %NULL if none.
++ **/
++static const gchar*
++exo_mount_hal_iocharset ()
++{
++  const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
++  if (cs != NULL)
++    return cs;
++
++  const char* codeset = nl_langinfo (CODESET);
++  if (codeset && !strcmp (codeset, "UTF-8"))
++    return "utf8";
++
++  return NULL;
++}
++
++
++
++/**
+  * exo_mount_hal_device_mount:
+  * @device : an #ExoMountHalDevice.
+  * @error  : return location for errors or %NULL.
+@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
+               /* however this one is FreeBSD specific */
+               options[n++] = g_strdup ("longnames");
+             }
++          else if (strcmp (device->fsoptions[m], "iocharset=") == 0)
++            {
++              const gchar* iocharset = exo_mount_hal_iocharset();
++              if (iocharset != NULL)
++                options[n++] = g_strdup_printf ("iocharset=%s", iocharset);
++            }
+         }
+     }
+ 
+diff --git a/exo-mount/main.c b/exo-mount/main.c
+index 80eae1d..f442019 100644
+--- a/exo-mount/main.c
++++ b/exo-mount/main.c
+@@ -39,6 +39,8 @@
+ #include <string.h>
+ #endif
+ 
++#include <locale.h>
++
+ #include <glib/gstdio.h>
+ 
+ #include <exo-hal/exo-hal.h>
+@@ -97,6 +99,8 @@ main (int argc, char **argv)
+   /* initialize the i18n support */
+   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ 
++  setlocale(LC_CTYPE, "");
++
+   /* initialize GTK+ */
+   if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err))
+     {
diff --git a/recipes/xfce-base/exo/configure.patch b/recipes/xfce-base/exo/configure.patch
new file mode 100644
index 0000000000..2ccfcfc994
--- /dev/null
+++ b/recipes/xfce-base/exo/configure.patch
@@ -0,0 +1,43 @@
+--- exo-0.3.4/configure.in~	2007-12-02 10:37:06.000000000 -0200
++++ exo-0.3.4/configure.in	2008-06-05 17:21:42.000000000 -0300
+@@ -127,22 +127,24 @@
+ dnl ***************************************
+ dnl *** Check for strftime() extensions ***
+ dnl ***************************************
+-AC_TRY_RUN([
+-  #include <string.h>
+-  #include <time.h>
+-  int
+-  main (int argc, char **argv)
+-  {
+-    struct tm tm;
+-    char      buffer[16];
+-    tm.tm_year = 81;
+-    if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
+-      return 0;
+-    return 1;
+-  }
+-], [
+-  AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
+-])
++dnl grrrr...  this doesn't work for cross compiling, define it for OE
++AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
++dnl AC_TRY_RUN([
++dnl   #include <string.h>
++dnl   #include <time.h>
++dnl   int
++dnl   main (int argc, char **argv)
++dnl   {
++dnl     struct tm tm;
++dnl     char      buffer[16];
++dnl     tm.tm_year = 81;
++dnl     if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
++dnl       return 0;
++dnl     return 1;
++dnl   }
++dnl ], [
++dnl   AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
++dnl ])
+ 
+ dnl ******************************
+ dnl *** Check for i18n support ***
diff --git a/recipes/xfce-base/exo/exo-no-tests.patch b/recipes/xfce-base/exo/exo-no-tests.patch
new file mode 100644
index 0000000000..1cb51ab600
--- /dev/null
+++ b/recipes/xfce-base/exo/exo-no-tests.patch
@@ -0,0 +1,14 @@
+The tests/ subdir consists of stuff trying to run a generated file ('exo-csource'), which doesn't work on host systems
+
+--- /tmp/Makefile.am	2008-10-30 09:23:41.000000000 +0100
++++ exo-0.3.4/Makefile.am	2008-10-30 09:24:03.011124000 +0100
+@@ -23,8 +23,7 @@
+ 	pixmaps								\
+ 	po								\
+ 	po-doc								\
+-	$(PYTHON_SUBDIR)						\
+-	tests
++	$(PYTHON_SUBDIR)
+ 
+ AUTOMAKE_OPTIONS =							\
+ 	1.8								\
diff --git a/recipes/xfce-base/exo_0.3.105.bb b/recipes/xfce-base/exo_0.3.105.bb
new file mode 100644
index 0000000000..ab3b2a22e5
--- /dev/null
+++ b/recipes/xfce-base/exo_0.3.105.bb
@@ -0,0 +1,30 @@
+DESCRIPTION="XFCE extensions and framework library with session management support"
+DEPENDS = "libxfce4util hal liburi-perl-native python-native cairo"
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+SRC_URI += " \
+    file://exo-0.3.105-iocharset.patch;patch=1 \
+    file://exo-no-tests.patch;patch=1 \
+    file://configure.patch;patch=1 \
+"
+
+# Note: Python checking is broken
+do_configure_prepend() {
+	sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
+}
+
+do_stage() {
+    autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+                ${libdir}/python*/site-packages/* \
+                ${prefix}/share/pygtk/2.0/defs/exo-0.3/exo.defs \
+"
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug/*"
diff --git a/recipes/xfce-base/exo_0.3.4.bb b/recipes/xfce-base/exo_0.3.4.bb
new file mode 100644
index 0000000000..17ea87d3d3
--- /dev/null
+++ b/recipes/xfce-base/exo_0.3.4.bb
@@ -0,0 +1,21 @@
+DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+
+inherit xfce
+XFCE_VERSION = 4.4.2
+
+SRC_URI += " file://configure.patch;patch=1"
+SRC_URI += " file://exo-no-tests.patch;patch=1"
+
+# Note: Python checking is broken
+do_configure_prepend() {
+	sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.in
+}
+
+do_stage() {
+    autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+                ${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so"
+FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*"
+FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug/exo-preferred-applications-settings.*"
diff --git a/recipes/xfce-base/gtk-xfce-engine_2.4.2.bb b/recipes/xfce-base/gtk-xfce-engine_2.4.2.bb
new file mode 100644
index 0000000000..0287f04485
--- /dev/null
+++ b/recipes/xfce-base/gtk-xfce-engine_2.4.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "XFCE theme for GTK"
+DEPENDS += "gtk+"
+
+inherit xfce
+XFCE_VERSION = 4.4.2
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
+                ${datadir}/themes/"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
diff --git a/recipes/xfce-base/gtk-xfce-engine_2.6.0.bb b/recipes/xfce-base/gtk-xfce-engine_2.6.0.bb
new file mode 100644
index 0000000000..ce76eaabfd
--- /dev/null
+++ b/recipes/xfce-base/gtk-xfce-engine_2.6.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "XFCE theme for GTK"
+DEPENDS += "gtk+"
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
+                ${datadir}/themes/"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
diff --git a/recipes/xfce-base/libxfce4mcs_4.4.2.bb b/recipes/xfce-base/libxfce4mcs_4.4.2.bb
new file mode 100644
index 0000000000..20448240e2
--- /dev/null
+++ b/recipes/xfce-base/libxfce4mcs_4.4.2.bb
@@ -0,0 +1,19 @@
+# libxfce4mcs OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="Settings management library used by most XFce 4 modules"
+DEPENDS="libxfce4util"
+SECTION = "x11/libs"
+
+inherit xfce pkgconfig
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs
+	    
+	install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
+	install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
+	install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs    
+	oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR}	
+	oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR}	
+}
diff --git a/recipes/xfce-base/libxfce4menu_4.6.1.bb b/recipes/xfce-base/libxfce4menu_4.6.1.bb
new file mode 100644
index 0000000000..6b87387f6e
--- /dev/null
+++ b/recipes/xfce-base/libxfce4menu_4.6.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION="a freedesktop.org compliant menu library for Xfce4"
+HOMEPAGE="http://www.xfce.org/projects/libraries"
+DEPENDS = "gettext pkgconfig libxfce4util intltool"
+RDEPENDS = "gtk+ libxfce4util"
+
+LICENSE="LGPL-2 FDL-1.1"
+PR = "r1"
+
+inherit xfce46
+
+do_stage() {
+   autotools_stage_all
+}
diff --git a/recipes/xfce-base/libxfce4util_4.4.2.bb b/recipes/xfce-base/libxfce4util_4.4.2.bb
new file mode 100644
index 0000000000..3386ad57e3
--- /dev/null
+++ b/recipes/xfce-base/libxfce4util_4.4.2.bb
@@ -0,0 +1,26 @@
+# libxfce4util OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION = "Basic utility library for Xfce4"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xfce4-dev-tools"
+
+inherit xfce pkgconfig
+
+MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
+
+do_stage() {
+	install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
+	# The line below expands to the list of headers that native makefile
+	# would install.  Complain and/or fix if it's not portable enough
+	for file in  $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do 
+		install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
+	done
+
+	oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
+
+}
+
+FILES_${PN}-dev += " ${datadir}/xfce4/m4"
diff --git a/recipes/xfce-base/libxfce4util_4.6.1.bb b/recipes/xfce-base/libxfce4util_4.6.1.bb
new file mode 100644
index 0000000000..6c40d2d50f
--- /dev/null
+++ b/recipes/xfce-base/libxfce4util_4.6.1.bb
@@ -0,0 +1,27 @@
+# libxfce4util OE build file
+
+DESCRIPTION = "Basic utility library for Xfce4"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xfce4-dev-tools "
+PR = "r1"
+
+inherit xfce46
+
+EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes"
+
+MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
+
+do_stage() {
+	install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
+	# The line below expands to the list of headers that native makefile
+	# would install.  Complain and/or fix if it's not portable enough
+	for file in  $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do 
+		install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
+	done
+
+	oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
+
+}
+
+FILES_${PN}-dev += " ${datadir}/xfce4/m4"
diff --git a/recipes/xfce-base/libxfcegui4_4.4.2.bb b/recipes/xfce-base/libxfcegui4_4.4.2.bb
new file mode 100644
index 0000000000..d38269d6f8
--- /dev/null
+++ b/recipes/xfce-base/libxfcegui4_4.4.2.bb
@@ -0,0 +1,15 @@
+# libxfcegui4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION = "XFCE Widget library and X Window System interaction"
+DEPENDS = "libxfce4util dbh libxml2 gtk+"
+SECTION = "x11/libs"
+
+inherit xfce
+
+do_stage() {
+autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
diff --git a/recipes/xfce-base/libxfcegui4_4.6.1.bb b/recipes/xfce-base/libxfcegui4_4.6.1.bb
new file mode 100644
index 0000000000..e5654b9857
--- /dev/null
+++ b/recipes/xfce-base/libxfcegui4_4.6.1.bb
@@ -0,0 +1,18 @@
+# libxfcegui4 OE build file
+
+DESCRIPTION = "Xfce Widget library and X Window System interaction"
+DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh libxml2 gtk+ libglade"
+RDEPENDS = "xfconf startup-notification "
+
+SECTION = "x11/libs"
+PR = "r4"
+
+inherit xfce46
+
+do_stage() {
+   autotools_stage_all
+}
+
+LEAD_SONAME = "libxfcegui4.so.4"
+
+FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
diff --git a/recipes/xfce-base/thunar_0.9.0.bb b/recipes/xfce-base/thunar_0.9.0.bb
new file mode 100644
index 0000000000..44afb06774
--- /dev/null
+++ b/recipes/xfce-base/thunar_0.9.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "File manager for the Xfce Desktop Environment"
+DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm gamin"
+RRECOMMENDS = "shared-mime-info"
+
+inherit xfce pkgconfig
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2"
+PR = 'r3'
+
+S = "${WORKDIR}/Thunar-${PV}/"
+
+FILES_${PN} += "${libdir}/thunarx-1/*.so \
+                ${datadir}/dbus-1 \
+                ${datadir}/thumbnailers \
+                ${datadir}/Thunar \
+                ${datadir}/xfce4"
+FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/recipes/xfce-base/thunar_1.0.1.bb b/recipes/xfce-base/thunar_1.0.1.bb
new file mode 100644
index 0000000000..96a494efc3
--- /dev/null
+++ b/recipes/xfce-base/thunar_1.0.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "File manager for the Xfce Desktop Environment"
+HOMEPAGE="http://thunar.xfce.org"
+DEPENDS = "exo dbus-glib libexif xfce4-panel libice libsm gamin"
+RDEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm gamin"
+RRECOMMENDS = "shared-mime-info"
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/Thunar-${PV}.tar.bz2"
+
+S = "${WORKDIR}/Thunar-${PV}/"
+
+EXTRA_OECONF += "--disable-dependency-tracking --enable-dbus"
+
+FILES_${PN} += "${libdir}/thunarx-1/*.so \
+		${libdir}/thunarx-1/*.la \
+                ${datadir}/dbus-1 \
+                ${datadir}/thumbnailers \
+                ${datadir}/Thunar \
+                ${datadir}/xfce4"
+FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
+
+do_stage () {
+ 	autotools_stage_all
+}
diff --git a/recipes/xfce-base/xfce-mcs-manager.inc b/recipes/xfce-base/xfce-mcs-manager.inc
new file mode 100644
index 0000000000..4edbf9d13b
--- /dev/null
+++ b/recipes/xfce-base/xfce-mcs-manager.inc
@@ -0,0 +1,20 @@
+# xfce-mcs-manager OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE4 Settings manager."
+DEPENDS="libxfcegui4 libxfce4mcs intltool-native"
+SECTION = "x11"
+PR = "r2"
+
+inherit xfce 
+
+do_stage() {
+	autotools_stage_all
+}
+
+
+do_stage_append () {
+	install -d ${PKG_CONFIG_DIR}
+	sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc
+}
diff --git a/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb b/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb
new file mode 100644
index 0000000000..0b9fc43f70
--- /dev/null
+++ b/recipes/xfce-base/xfce-mcs-manager_4.4.2.bb
@@ -0,0 +1,25 @@
+# xfce-mcs-manager OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE4 Settings manager."
+DEPENDS="libxfcegui4 libxfce4mcs intltool-native"
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce 
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xfce4
+	install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
+	install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
+}
+
+# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live
+# the standard pkgconfig mangling was confusing us.  Mangling is not required
+# for this particular .pc, so the following will suffice:
+
+do_stage_append () {
+	install -d ${PKG_CONFIG_DIR}
+	sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc
+}
diff --git a/recipes/xfce-base/xfce-mcs-plugins_4.4.2.bb b/recipes/xfce-base/xfce-mcs-plugins_4.4.2.bb
new file mode 100644
index 0000000000..80037841fa
--- /dev/null
+++ b/recipes/xfce-base/xfce-mcs-plugins_4.4.2.bb
@@ -0,0 +1,12 @@
+# xfce-mcs-plugins OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION = "Common XFCE4 configuration plugins."
+DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+"
+SECTION = "x11"
+
+inherit xfce
+
+PACKAGES += "${PN}-mcs-plugins"
+FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so"
diff --git a/recipes/xfce-base/xfce-terminal/into-support.patch b/recipes/xfce-base/xfce-terminal/into-support.patch
new file mode 100644
index 0000000000..30540d0558
--- /dev/null
+++ b/recipes/xfce-base/xfce-terminal/into-support.patch
@@ -0,0 +1,94 @@
+diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
+index 4b7ae6f..a581a85 100644
+--- a/terminal/terminal-app.c
++++ b/terminal/terminal-app.c
+@@ -37,6 +37,8 @@
+ #include <string.h>
+ #endif
+ 
++#include <gdk/gdkx.h>
++
+ #include <terminal/terminal-accel-map.h>
+ #include <terminal/terminal-app.h>
+ #include <terminal/terminal-config.h>
+@@ -565,7 +567,8 @@ terminal_app_open_window (TerminalApp         *app,
+           g_free (geometry);
+ 
+           /* show the window */
+-          gtk_widget_show (window);
++          if (!attr->embed_window)
++            gtk_widget_show (window);
+         }
+ 
+       terminal_screen_launch_child (TERMINAL_SCREEN (terminal));
+@@ -584,6 +587,14 @@ terminal_app_open_window (TerminalApp         *app,
+       g_signal_connect (G_OBJECT (app->session_client), "save-yourself",
+                         G_CALLBACK (terminal_app_save_yourself), app);
+     }
++
++  if (attr->embed_window)
++    {
++      GdkDrawable* win = GDK_DRAWABLE(window->window);
++	  XReparentWindow(GDK_DRAWABLE_XDISPLAY(win), GDK_DRAWABLE_XID(win), attr->embed_window, 0, 0);
++	  XMapWindow(GDK_DRAWABLE_XDISPLAY(win), GDK_DRAWABLE_XID(win));
++      gtk_widget_show(window);
++    }
+ }
+ 
+ 
+diff --git a/terminal/terminal-options.c b/terminal/terminal-options.c
+index ec6a934..ad9dace 100644
+--- a/terminal/terminal-options.c
++++ b/terminal/terminal-options.c
+@@ -30,6 +30,8 @@
+ #include <string.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include <libxfce4util/libxfce4util.h>
+ 
+ #include <terminal/terminal-options.h>
+@@ -454,6 +456,31 @@ terminal_options_parse (gint              argc,
+           g_free (default_directory);
+           default_directory = g_strdup (s);
+         }
++      else if (strncmp ("--into", argv[n], 6) == 0)
++        {
++          s = argv[n] + 6;
++
++          if (*s == '=')
++            {
++              ++s;
++            }
++          else if (n + 1 >= argc)
++            {
++              g_set_error (error, G_SHELL_ERROR, G_SHELL_ERROR_FAILED,
++                           _("Option \"--into\" requires specifying "
++                             "the window id as its parameter"));
++              goto failed;
++            }
++          else
++            {
++              s = argv[++n];
++            }
++
++          if (win_attr != NULL)
++            {
++              win_attr->embed_window = strtoul(s, NULL, 0);
++            }
++        }
+       else
+         {
+           g_set_error (error, G_SHELL_ERROR, G_SHELL_ERROR_FAILED,
+diff --git a/terminal/terminal-options.h b/terminal/terminal-options.h
+index b047269..4783596 100644
+--- a/terminal/terminal-options.h
++++ b/terminal/terminal-options.h
+@@ -65,5 +65,6 @@ struct _TerminalWindowAttr
+   TerminalVisibility   borders;
+   TerminalVisibility   toolbars;
++  guint32              embed_window;
+ };
+ 
+ gboolean  terminal_options_parse    (gint                 argc,
diff --git a/recipes/xfce-base/xfce-terminal_0.2.12.bb b/recipes/xfce-base/xfce-terminal_0.2.12.bb
new file mode 100644
index 0000000000..e644521139
--- /dev/null
+++ b/recipes/xfce-base/xfce-terminal_0.2.12.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
+DEPENDS = "exo vte dbus-glib gtk+"
+RDEPENDS += "gnome-pty-helper"
+PR = "r2"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/Terminal-${PV}.tar.bz2 \
+"
+
+S = "${WORKDIR}/Terminal-${PV}"
+
+FILES_${PN} += "${datadir}/Terminal"
diff --git a/recipes/xfce-base/xfce-terminal_0.2.8.bb b/recipes/xfce-base/xfce-terminal_0.2.8.bb
new file mode 100644
index 0000000000..c8c4903513
--- /dev/null
+++ b/recipes/xfce-base/xfce-terminal_0.2.8.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
+DEPENDS = "exo vte dbus-glib gtk+"
+RDEPENDS += "gnome-pty-helper"
+PR = "r2"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-${PV}.tar.bz2 \
+           file://into-support.patch;patch=1"
+
+S = "${WORKDIR}/Terminal-${PV}"
diff --git a/recipes/xfce-base/xfce-terminal_0.4.2.bb b/recipes/xfce-base/xfce-terminal_0.4.2.bb
new file mode 100644
index 0000000000..08c2e4e438
--- /dev/null
+++ b/recipes/xfce-base/xfce-terminal_0.4.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
+DEPENDS = "exo vte dbus-glib gtk+"
+RDEPENDS += "gnome-pty-helper"
+PR = "r2"
+
+inherit xfce46
+
+SRC_URI = "http://www.xfce.org/archive/src/apps/terminal/0.4/Terminal-${PV}.tar.bz2 \
+"
+
+S = "${WORKDIR}/Terminal-${PV}"
+
+FILES_${PN} += "${datadir}/Terminal"
diff --git a/recipes/xfce-base/xfce-utils_4.4.2.bb b/recipes/xfce-base/xfce-utils_4.4.2.bb
new file mode 100644
index 0000000000..d681fd7adb
--- /dev/null
+++ b/recipes/xfce-base/xfce-utils_4.4.2.bb
@@ -0,0 +1,29 @@
+# xfce-utils OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE4 Utilities"
+DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager"
+inherit xfce
+
+FILES_${PN} += " \ 
+        ${bindir}/* \
+        ${datadir}/dbus-1/* \
+        ${datadir}/xfce4/AUTHORS \
+        ${datadir}/xfce4/BSD \
+        ${datadir}/xfce4/COPYING \
+        ${datadir}/xfce4/GPL \
+	${datadir}/xfce4/INFO \
+        ${datadir}/xfce4/LGPL \
+        ${datadir}/xfce4/AUTHORS.html \
+        ${datadir}/xfce4/BSD.html \
+        ${datadir}/xfce4/COPYING.html \
+        ${datadir}/xfce4/GPL.html \
+	${datadir}/xfce4/INFO.html \
+        ${datadir}/xfce4/LGPL.html"
+
+PACKAGES =+ "${PN}-mcs-plugins"
+FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/"
+
+# NOTE:  This package takes a --with-browser for the default browser
+# NOTE:  Works with gdm also gtkhtml
diff --git a/recipes/xfce-base/xfce-utils_4.6.1.bb b/recipes/xfce-base/xfce-utils_4.6.1.bb
new file mode 100644
index 0000000000..b9ff25e48f
--- /dev/null
+++ b/recipes/xfce-base/xfce-utils_4.6.1.bb
@@ -0,0 +1,27 @@
+DESCRIPTION="XFCE4 Utilities"
+DEPENDS = "virtual/libx11 libxfcegui4"
+SECTION = "x11"
+PR = "r3"
+
+inherit xfce46
+
+FILES_${PN} += " \ 
+        ${bindir}/* \
+        ${datadir}/dbus-1/* \
+        ${datadir}/xfce4/AUTHORS \
+        ${datadir}/xfce4/BSD \
+        ${datadir}/xfce4/COPYING \
+        ${datadir}/xfce4/GPL \
+	${datadir}/xfce4/INFO* \
+        ${datadir}/xfce4/LGPL \
+        ${datadir}/xfce4/AUTHORS.html \
+        ${datadir}/xfce4/BSD.html \
+        ${datadir}/xfce4/COPYING.html \
+        ${datadir}/xfce4/GPL.html \
+	${datadir}/xfce4/INFO.html \
+        ${datadir}/xfce4/LGPL.html \
+        ${datadir}/xsessions/xfce.desktop \
+"
+
+# NOTE:  This package takes a --with-browser for the default browser
+# NOTE:  Works with gdm also gtkhtml
diff --git a/recipes/xfce-base/xfce4-appfinder_4.4.2.bb b/recipes/xfce-base/xfce4-appfinder_4.4.2.bb
new file mode 100644
index 0000000000..ddfa3e1e4e
--- /dev/null
+++ b/recipes/xfce-base/xfce4-appfinder_4.4.2.bb
@@ -0,0 +1,8 @@
+# xfce4-appfinder build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE Application Finder"
+SECTION = "x11"
+inherit xfce
+DEPENDS="libxfcegui4"
diff --git a/recipes/xfce-base/xfce4-appfinder_4.6.1.bb b/recipes/xfce-base/xfce4-appfinder_4.6.1.bb
new file mode 100644
index 0000000000..0d1e1b29c4
--- /dev/null
+++ b/recipes/xfce-base/xfce4-appfinder_4.6.1.bb
@@ -0,0 +1,8 @@
+# xfce4-appfinder build file
+
+DESCRIPTION="XFCE Application Finder"
+DEPENDS="libxfcegui4 libxfce4menu thunar"
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46
diff --git a/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb b/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb
new file mode 100644
index 0000000000..67c2d341de
--- /dev/null
+++ b/recipes/xfce-base/xfce4-dev-tools_4.4.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Xfce4 development tools"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+
+inherit xfce
+XFCE_VERSION = 4.4.2
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
diff --git a/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb b/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb
new file mode 100644
index 0000000000..9f96911d8d
--- /dev/null
+++ b/recipes/xfce-base/xfce4-dev-tools_4.6.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Xfce4 development tools"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+PR = "r1"
+
+inherit xfce46
+
+inherit autotools autotools_stage
+
+XFCE_VERSION = ${PV}
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
diff --git a/recipes/xfce-base/xfce4-icon-theme_4.4.2.bb b/recipes/xfce-base/xfce4-icon-theme_4.4.2.bb
new file mode 100644
index 0000000000..69d9dacbac
--- /dev/null
+++ b/recipes/xfce-base/xfce4-icon-theme_4.4.2.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "Rodent vector icon theme used by XFCE"
+PACKAGE_ARCH = "all"
+
+inherit xfce
+
+FILES_${PN} += "${datadir}/xfce4"
diff --git a/recipes/xfce-base/xfce4-mixer_4.4.2.bb b/recipes/xfce-base/xfce4-mixer_4.4.2.bb
new file mode 100644
index 0000000000..60bb012810
--- /dev/null
+++ b/recipes/xfce-base/xfce4-mixer_4.4.2.bb
@@ -0,0 +1,12 @@
+# xfce-mixer-plugin OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE panel mixer plugin"
+SECTION = "x11"
+
+DEPENDS="xfce4-panel"
+inherit xfce
+
+FILES_${PN}-dev += "${libdir}/xfce4/modules/libxfce4mixer.so"
+FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug/"
diff --git a/recipes/xfce-base/xfce4-mixer_4.6.1.bb b/recipes/xfce-base/xfce4-mixer_4.6.1.bb
new file mode 100644
index 0000000000..f6a42d0087
--- /dev/null
+++ b/recipes/xfce-base/xfce4-mixer_4.6.1.bb
@@ -0,0 +1,13 @@
+# xfce-mixer-plugin OE build file
+
+DESCRIPTION="XFCE panel mixer plugin"
+DEPENDS="libwnck xfce4-panel"
+RDEPENDS="xfce4-panel"
+SECTION = "x11"
+PR = "r2"
+
+inherit xfce46
+
+FILES_${PN} += "${datadir}/xfce4/panel-plugins/*.desktop"
+FILES_${PN} += "${libdir}/xfce4/modules/libxfce4mixer.so"
+FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug/"
diff --git a/recipes/xfce-base/xfce4-panel_4.4.2.bb b/recipes/xfce-base/xfce4-panel_4.4.2.bb
new file mode 100644
index 0000000000..2fd087733e
--- /dev/null
+++ b/recipes/xfce-base/xfce4-panel_4.4.2.bb
@@ -0,0 +1,37 @@
+# xfce4-panel OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION = "XFCE4 Panel"
+SECTION = "x11"
+DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
+
+inherit pkgconfig xfce
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+
+do_stage() {
+autotools_stage_all
+}
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+}
+
+python populate_packages_prepend() {
+	plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d)
+	plugin_name = bb.data.expand('${PN}-plugin-%s', d)
+	do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name,
+	                  '${PN} plugin for %s', extra_depends='', prepend=True,
+	                  aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop',
+	                                     '${sysconfdir}/xdg/xfce/panel/%s-*',
+	                                     '${datadir}/icons/hicolor/48x48/apps/*-%s.png',
+	                                     '${bindir}/*%s*'])
+}
+
+PACKAGES += "${PN}-mcs-plugins"
+PACKAGES_DYNAMIC = "${PN}-plugin-*"
+
+FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/"
+FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug"
diff --git a/recipes/xfce-base/xfce4-panel_4.6.1.bb b/recipes/xfce-base/xfce4-panel_4.6.1.bb
new file mode 100644
index 0000000000..c19d6fdd48
--- /dev/null
+++ b/recipes/xfce-base/xfce4-panel_4.6.1.bb
@@ -0,0 +1,31 @@
+# xfce4-panel OE build file
+
+DESCRIPTION = "Xfce4 Panel"
+DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
+SECTION = "x11"
+PR = "r2"
+
+inherit xfce46
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+do_stage() {
+    autotools_stage_all
+}
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+}
+
+python populate_packages_prepend() {
+	plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d)
+	plugin_name = bb.data.expand('${PN}-plugin-%s', d)
+	do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name,
+	                  '${PN} plugin for %s', extra_depends='', prepend=True,
+	                  aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop',
+	                                     '${sysconfdir}/xdg/xfce/panel/%s-*',
+	                                     '${datadir}/icons/hicolor/48x48/apps/*-%s.png',
+	                                     '${bindir}/*%s*'])
+}
+
+PACKAGES_DYNAMIC = "${PN}-plugin-*"
diff --git a/recipes/xfce-base/xfce4-power-manager_4.6.1.bb b/recipes/xfce-base/xfce4-power-manager_4.6.1.bb
new file mode 100644
index 0000000000..b5dd372532
--- /dev/null
+++ b/recipes/xfce-base/xfce4-power-manager_4.6.1.bb
@@ -0,0 +1 @@
+PR = "r1"
diff --git a/recipes/xfce-base/xfce4-session_4.4.2.bb b/recipes/xfce-base/xfce4-session_4.4.2.bb
new file mode 100644
index 0000000000..a572b80f55
--- /dev/null
+++ b/recipes/xfce-base/xfce4-session_4.4.2.bb
@@ -0,0 +1,4 @@
+DESCRIPTION = "Calendar application for the Xfce Desktop  Environment"
+DEPENDS = "libxfcegui4 libxfce4util xfce-mcs-manager dbus"
+
+inherit xfce
diff --git a/recipes/xfce-base/xfce4-session_4.6.1.bb b/recipes/xfce-base/xfce4-session_4.6.1.bb
new file mode 100644
index 0000000000..181625b168
--- /dev/null
+++ b/recipes/xfce-base/xfce4-session_4.6.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop  Environment"
+DEPENDS = "libxfcegui4 libxfce4util dbus iceauth xfce-utils"
+RDEPENDS = "iceauth xfce-utils"
+SECTION = "x11"
+
+PR = "r3"
+
+inherit xfce46
+
+FILES_${PN} += "${libdir}/xfce4/splash/engines/*.so"
+FILES_${PN} += "${datadir}/xfce4/tips/*"
+FILES_${PN} += "${datadir}/themes/Default/balou/*"
+
+FILES_${PN}-dbg += "${libdir}/xfce4/splash/engines/.debug/*.so"
+FILES_${PN}-dbg += "${libdir}/xfce4/splash/engines/.debug/*.a"
+
+FILES_${PN}-dev += "${libdir}/xfce4/splash/engines/*.la"
+FILES_${PN}-dev += "${libdir}/xfce4/splash/engines/*.a"
diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch
new file mode 100644
index 0000000000..beb5857908
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch
@@ -0,0 +1,11 @@
+--- ./configure.ac.orig	2009-02-25 18:58:49.000000000 +0100
++++ ./configure.ac	2009-03-01 11:14:33.000000000 +0100
+@@ -85,8 +85,8 @@ XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE],
+ XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
+ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
+ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
+-XDT_CHECK_PACKAGE([XI], [xi], [1.0.0])
+-XDT_CHECK_PACKAGE([LIBX11], [x11], [1.0.0])
++ XDT_CHECK_PACKAGE([XI], [xi], [1.0.0])
++#XDT_CHECK_PACKAGE([LIBX11], [x11], [1.0.0])
+ XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12.0])
diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch
new file mode 100644
index 0000000000..3268ecad26
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch
@@ -0,0 +1,12 @@
+diff -ur xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c
+--- xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-03-02 19:48:00.000000000 +0200
++++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-07-20 12:08:28.000000000 +0300
+@@ -378,7 +378,7 @@
+   xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
+ 
+   settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
+-  xkl_config_registry_load (settings->priv->xkl_registry);
++  xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
+ 
+   /* Tab */
+   xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");
diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch
new file mode 100644
index 0000000000..6e604050e6
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch
@@ -0,0 +1,17 @@
+--- xfce4-settings-helper/workspaces.c.orig	2009-01-25 15:29:31.000000000 +0100
++++ xfce4-settings-helper/workspaces.c	2009-01-27 13:32:51.000000000 +0100
+@@ -129,9 +129,14 @@ xfce_workspaces_helper_set_workspace_nam
+         wnck_screen_force_update(screen);
+ 
+         /* walk all the workspaces on this screen */
++#if 0
+         workspaces = wnck_screen_get_workspaces(screen);
+         for(li = workspaces, i = 0; li != NULL; li = li->next, i++) {
+             workspace = WNCK_WORKSPACE(li->data);
++#else
++        for(i = 0; i < wnck_screen_get_workspace_count(screen); i++) {
++            workspace = wnck_screen_get_workspace(screen, i);
++#endif
+ 
+             /* check if we have a valid name in the array */
+             if(n_names > i && names[i] != NULL && names[i] != '\0') {
diff --git a/recipes/xfce-base/xfce4-settings_4.6.1.bb b/recipes/xfce-base/xfce4-settings_4.6.1.bb
new file mode 100644
index 0000000000..7d44e97a47
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings_4.6.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION="Xfce4 settings"
+HOMEPAGE = "http://www.xfce.org"
+SECTION = "x11/wm"
+LICENSE = "GPL-2"
+
+DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util"
+RDEPENDS = "gtk+ libxfce4util libxfcegui4 xfconf exo"
+
+PR = "r1"
+
+inherit xfce46
+
+SRC_URI += " \
+    file://xfce4-settings-4.6.1-libxklavier.patch;patch=1 \
+    file://xfce4-settings-4.6.1-configure.patch;patch=1 \
+"
+
+do_stage() {
+autotools_stage_all
+}
diff --git a/recipes/xfce-base/xfconf_4.6.1.bb b/recipes/xfce-base/xfconf_4.6.1.bb
new file mode 100644
index 0000000000..2e167cc01c
--- /dev/null
+++ b/recipes/xfce-base/xfconf_4.6.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Xfce configuration daemon and utilities"
+HOMEPAGE = "http://www.xfce.org"
+SECTION = "x11/wm"
+LICENSE = "GPL-2"
+
+DEPENDS = "libxfce4util"
+RDEPENDS = "libxfce4util"
+
+PR = "r1"
+
+inherit xfce46
+
+do_stage() {
+autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/dbus-1/services/org.xfce.Xfconf.service"
diff --git a/recipes/xfce-base/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch b/recipes/xfce-base/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch
new file mode 100644
index 0000000000..af5bc4cd96
--- /dev/null
+++ b/recipes/xfce-base/xfdesktop/fix-segfault-when-removable-icons-are-disabled.patch
@@ -0,0 +1,16 @@
+diff -Nur xfdesktop-4.4.2-BKP/src/xfdesktop-file-icon-manager.c xfdesktop-4.4.2/src/xfdesktop-file-icon-manager.c
+--- xfdesktop-4.4.2-BKP/src/xfdesktop-file-icon-manager.c	2008-11-03 16:19:46.000000000 -0200
++++ xfdesktop-4.4.2/src/xfdesktop-file-icon-manager.c	2008-11-03 16:20:45.000000000 -0200
+@@ -2046,8 +2046,10 @@
+     
+     g_hash_table_foreach(fmanager->priv->icons,
+                          file_icon_hash_write_icons, rcfile);
+-    g_hash_table_foreach(fmanager->priv->removable_icons,
+-                         file_icon_hash_write_icons, rcfile);
++    if(fmanager->priv->show_removable_media) {
++        g_hash_table_foreach(fmanager->priv->removable_icons,
++                             file_icon_hash_write_icons, rcfile);
++    }
+     g_hash_table_foreach(fmanager->priv->special_icons,
+                          file_icon_hash_write_icons, rcfile);
+     
diff --git a/recipes/xfce-base/xfdesktop/relocation-and-memleak.patch b/recipes/xfce-base/xfdesktop/relocation-and-memleak.patch
new file mode 100644
index 0000000000..df9011d8da
--- /dev/null
+++ b/recipes/xfce-base/xfdesktop/relocation-and-memleak.patch
@@ -0,0 +1,49 @@
+Patch taken from Gentoo at http://overlays.gentoo.org/svn/proj/alt/trunk/prefix-overlay/xfce-base/xfdesktop/files/
+
+Included by: Otavio Salvador <otavio@ossystems.com.br>
+
+diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c
+--- xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c	2007-11-17 21:31:43.000000000 +0200
++++ xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c	2008-03-21 11:18:59.000000000 +0200
+@@ -173,7 +173,8 @@
+         if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
+             break;
+     }
+-    
++    g_list_free(items);
++
+     gtk_menu_shell_insert(menu_shell, mi, i);
+     
+     return i;
+diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.c xfdesktop-4.4.2/modules/menu/desktop-menuspec.c
+--- xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.c	2007-11-17 21:31:43.000000000 +0200
++++ xfdesktop-4.4.2/modules/menu/desktop-menuspec.c	2008-03-21 11:18:59.000000000 +0200
+@@ -203,7 +203,7 @@
+                 else
+                     foundcat = NULL;
+                 if(!foundcat) {
+-                    g_ptr_array_free(revpath, FALSE);
++                    g_ptr_array_free(revpath, TRUE);
+                     revpath = NULL;
+                     break;
+                 }
+@@ -220,7 +220,7 @@
+                 newpath[totlen] = 0;
+                 
+                 g_ptr_array_add(mtfpi->paths, newpath);
+-                g_ptr_array_free(revpath, FALSE);
++                g_ptr_array_free(revpath, TRUE);
+             }
+         }
+     }
+diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.h xfdesktop-4.4.2/modules/menu/desktop-menuspec.h
+--- xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.h	2007-11-17 21:31:43.000000000 +0200
++++ xfdesktop-4.4.2/modules/menu/desktop-menuspec.h	2008-03-21 11:18:56.000000000 +0200
+@@ -82,6 +82,6 @@
+  * @param paths A GPtrArray obtained from either menuspec_get_path_simple() or
+  *              menuspec_get_path_multilevel().
+  */
+-G_INLINE_FUNC void desktop_menuspec_path_free(GPtrArray *paths);
++void desktop_menuspec_path_free(GPtrArray *paths);
+ 
+ #endif /* ifdef __MENUSPEC_H__ */
diff --git a/recipes/xfce-base/xfdesktop_4.4.2.bb b/recipes/xfce-base/xfdesktop_4.4.2.bb
new file mode 100644
index 0000000000..3129feba23
--- /dev/null
+++ b/recipes/xfce-base/xfdesktop_4.4.2.bb
@@ -0,0 +1,22 @@
+# xfdesktop OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="xfce4 Desktop Background Manager"
+SECTION = "x11/base"
+DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel thunar"
+PR = "r2"
+
+inherit xfce
+
+SRC_URI += " file://relocation-and-memleak.patch;patch=1 \
+             file://fix-segfault-when-removable-icons-are-disabled.patch;patch=1"
+
+PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins"
+
+FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*"
+FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
+FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \
+                ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
+                ${datadir}/xfce4/panel-plugins/*.desktop"
+FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug"
diff --git a/recipes/xfce-base/xfdesktop_4.6.1.bb b/recipes/xfce-base/xfdesktop_4.6.1.bb
new file mode 100644
index 0000000000..9c1c2f4f33
--- /dev/null
+++ b/recipes/xfce-base/xfdesktop_4.6.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "XFCE4 Desktop Manager"
+SECTION = "x11/base"
+
+DEPENDS = "virtual/libx11 exo libxfcegui4 xfce4-panel thunar gtk+"
+RDEPENDS = "libxfcegui4 libxml2 xfce4-panel thunar exo gtk+"
+PR = "r2"
+
+inherit xfce46
+
+do_configure() { 
+   oe_runconf
+}
+
+FILES_xfdesktop-backdrops = "${datadir}/xfce4/backdrops/*"
+FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \
+                ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
+                ${datadir}/xfce4/panel-plugins/*.desktop"
+FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug"
diff --git a/recipes/xfce-base/xfwm4-themes_4.4.2.bb b/recipes/xfce-base/xfwm4-themes_4.4.2.bb
new file mode 100644
index 0000000000..63c5ab0296
--- /dev/null
+++ b/recipes/xfce-base/xfwm4-themes_4.4.2.bb
@@ -0,0 +1,18 @@
+# xfwm4-themes OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE4 Window Manager Themes"
+SECTION = "x11/wm"
+
+inherit xfce
+
+# No ${PN} for this one 
+PACKAGES=""
+
+PACKAGES_DYNAMIC = "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/xfwm4/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
diff --git a/recipes/xfce-base/xfwm4-themes_4.6.0.bb b/recipes/xfce-base/xfwm4-themes_4.6.0.bb
new file mode 100644
index 0000000000..e3c86fbcc4
--- /dev/null
+++ b/recipes/xfce-base/xfwm4-themes_4.6.0.bb
@@ -0,0 +1,22 @@
+# xfwm4-themes OE build file
+
+DESCRIPTION="Xfce4 Window Manager Themes"
+SECTION = "x11/wm"
+PR = "r2"
+
+DEPENDS = "xfwm4 libglade libxml2"
+RDEPENDS = "xfwm4 libglade libxml2"
+
+inherit xfce46
+
+SRC_URI = "http://mocha.xfce.org/archive/src/art/xfwm4-themes/4.6/xfwm4-themes-${PV}.tar.bz2"
+
+# No ${PN} for this one 
+PACKAGES=""
+
+PACKAGES_DYNAMIC = "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/xfwm4/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
diff --git a/recipes/xfce-base/xfwm4_4.4.2.bb b/recipes/xfce-base/xfwm4_4.4.2.bb
new file mode 100644
index 0000000000..8d1a1835cf
--- /dev/null
+++ b/recipes/xfce-base/xfwm4_4.4.2.bb
@@ -0,0 +1,31 @@
+# xfwm4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE4 Window Manager"
+SECTION = "x11/wm"
+inherit xfce update-alternatives
+
+FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
+
+DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+RDEPENDS = "xfwm4-theme-default"
+
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+PACKAGES_DYNAMIC += "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
+
+PACKAGES += " ${PN}-mcs-plugins"
+
+FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
+
+ALTERNATIVE_PATH = "${bindir}/xfce4-session"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "10"
diff --git a/recipes/xfce-base/xfwm4_4.6.1.bb b/recipes/xfce-base/xfwm4_4.6.1.bb
new file mode 100644
index 0000000000..116006ada7
--- /dev/null
+++ b/recipes/xfce-base/xfwm4_4.6.1.bb
@@ -0,0 +1,28 @@
+# xfwm4 OE build file
+
+DESCRIPTION="XFCE4 Window Manager"
+SECTION = "x11/wm"
+PR = "r1"
+
+inherit xfce46 update-alternatives
+
+FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
+
+DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4"
+RDEPENDS = "xfwm4-theme-default"
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+PACKAGES_DYNAMIC += "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/xfce4-session"
+ALTERNATIVE_PRIORITY = "30"
+
+FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*"