XFCE: Import all the 4.6.1 recipes (and a newer version of xfce-terminal).

41 files changed, 674 insertions, 0 deletions

diff --git a/recipes/tasks/task-xfce46-base.bb b/recipes/tasks/task-xfce46-base.bb
new file mode 100644
index 0000000000..430d048a7d
--- /dev/null
+++ b/recipes/tasks/task-xfce46-base.bb
@@ -0,0 +1,32 @@
+# task-xfce46-base
+
+DESCRIPTION = "All packages required for a base installation of XFCE 4.6.*"
+PR = "r1"
+
+inherit task
+
+RDEPENDS_${PN} = " \
+    xfwm4 \
+    xfwm4-theme-default \
+    xfce4-session \     
+    xfconf \
+    xfdesktop \
+    xfce4-panel \
+    \
+    gtk-xfce-engine \
+    \
+    xfce-utils \
+    xfce4-panel-plugin-actions \
+    xfce4-panel-plugin-clock \
+    xfce4-panel-plugin-iconbox \
+    xfce4-panel-plugin-launcher \
+    xfce4-panel-plugin-pager \
+    xfce4-panel-plugin-separator \
+    xfce4-panel-plugin-showdesktop \
+    xfce4-panel-plugin-systray \
+    xfce4-panel-plugin-tasklist \
+    xfce4-panel-plugin-windowlist \   
+    xfce4-settings \
+    xfce-terminal \
+    thunar \
+"
diff --git a/recipes/tasks/task-xfce46-extras.bb b/recipes/tasks/task-xfce46-extras.bb
new file mode 100644
index 0000000000..abbe3b0fdc
--- /dev/null
+++ b/recipes/tasks/task-xfce46-extras.bb
@@ -0,0 +1,39 @@
+# task-xfce46-extras
+
+DESCRIPTION = "Extra suggested packages to produce a recommended XFCE 4.6.* installation"
+PR = "r2"
+
+inherit task
+
+XFCE_THEMES = " \
+    xfwm4-theme-daloa \
+    xfwm4-theme-moheli \
+    xfwm4-theme-default-4.0 \
+    xfwm4-theme-default-4.2 \
+    xfwm4-theme-default-4.4 \
+    xfwm4-theme-katiola \
+    xfwm4-theme-kokodi \
+    xfwm4-theme-moheli \
+    xfwm4-theme-sassandra \
+    xfwm4-theme-stoneage \
+    xfwm4-theme-therapy \
+    xfwm4-theme-tyrex \
+    xfwm4-theme-wallis \  
+"
+
+RDEPENDS_${PN} = " \
+    task-xfce46-base \
+    \
+    ${XFCE_THEMES} \
+    \
+    xfce4-notifyd \
+    xfce4-mixer \
+    xfce4-appfinder \
+    xfprint \    
+    midori \
+    orage \
+    squeeze \
+    ristretto \
+    mousepad \ 
+    gigolo \
+"
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_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/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/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.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.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_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-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.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.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.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.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-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.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.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_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.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.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/*"
diff --git a/recipes/xfce-extras/gigolo_0.3.2.bb b/recipes/xfce-extras/gigolo_0.3.2.bb
new file mode 100644
index 0000000000..22f83538ef
--- /dev/null
+++ b/recipes/xfce-extras/gigolo_0.3.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Gigolo is a frontend to easily manage connections to remote filesystems using GIO/GVfs."
+DEPENDS = "pkgconfig gtk+"
+RDEPENDS = "libxfce4util libxfcegui4"
+
+SECTION = "x11"
+LICENSE = "GPL-2"
+PR = "r1"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+SRC_URI = "http://files.uvena.de/${PN}/${PN}-${PV}.tar.bz2"
+
+do_compile() {
+   oe_runmake
+}
diff --git a/recipes/xfce-base/mousepad_0.2.13.bb b/recipes/xfce-extras/mousepad_0.2.13.bb
index c55ce5a047..c55ce5a047 100644
--- a/recipes/xfce-base/mousepad_0.2.13.bb
+++ b/recipes/xfce-extras/mousepad_0.2.13.bb
diff --git a/recipes/xfce-extras/mousepad_0.2.16.bb b/recipes/xfce-extras/mousepad_0.2.16.bb
new file mode 100644
index 0000000000..b5671179f0
--- /dev/null
+++ b/recipes/xfce-extras/mousepad_0.2.16.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Text editor for Xfce based on Leafpad"
+RDEPENDS = "libxfce4util hal"
+SECTION = "x11"
+PR = "r2"
+
+inherit xfce46
+
+SRC_URI = "http://mocha.xfce.org/archive/src/apps/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2"
+
diff --git a/recipes/xfce-base/orage_4.4.2.bb b/recipes/xfce-extras/orage_4.4.2.bb
index b8f5284454..b8f5284454 100644
--- a/recipes/xfce-base/orage_4.4.2.bb
+++ b/recipes/xfce-extras/orage_4.4.2.bb
diff --git a/recipes/xfce-extras/orage_4.6.1.bb b/recipes/xfce-extras/orage_4.6.1.bb
new file mode 100644
index 0000000000..06f7296429
--- /dev/null
+++ b/recipes/xfce-extras/orage_4.6.1.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Calendar application for the Xfce Desktop  Environment"
+DEPENDS = "libxfcegui4  exo xfce4-panel"
+RDEPENDS = "xfce4-panel"
+RREPLACES = "xfcalendar"
+
+SECTION = "x11"
+PR = "r3"
+
+inherit xfce46
+
+SRC_URI = "http://mocha.xfce.org/archive/src/apps/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2"
+
+XFCE_VERSION = "4.6.1"
+
+EXTRA_OECONF += " --disable-libxfce4mcs"
+
+
+FILES_${PN} += "${datadir}/xfce4/panel-plugins/*.desktop \
+                ${datadir}/dbus-1/services/* \
+"
+
+FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug/"
diff --git a/recipes/xfce-extras/ristretto_0.0.21.bb b/recipes/xfce-extras/ristretto_0.0.21.bb
new file mode 100644
index 0000000000..eff3d25b9b
--- /dev/null
+++ b/recipes/xfce-extras/ristretto_0.0.21.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Ristretto is a picture-viewer for XFCE"
+DEPENDS = "thunar libxfce4util libxfcegui4 libexif dbus"
+RDEPENDS = "thunar libxfce4util libxfcegui4"
+
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+SRC_URI = "http://goodies.xfce.org/releases/ristretto/${PN}-${PV}.tar.gz"
diff --git a/recipes/xfce-extras/squeeze_0.2.3.bb b/recipes/xfce-extras/squeeze_0.2.3.bb
new file mode 100644
index 0000000000..ce784c2ea8
--- /dev/null
+++ b/recipes/xfce-extras/squeeze_0.2.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Squeeze is an archive manager for the Xfce Desktop  Environment"
+DEPENDS = "pkgconfig dbus gtk+ thunar"
+RDEPENDS = "libxfce4util"
+
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+SRC_URI = "http://squeeze.xfce.org/downloads/${PN}-${PV}.tar.bz2"
diff --git a/recipes/xfcalendar/xfcalendar.inc b/recipes/xfce-extras/xfcalendar.inc
index 987d8b4d67..987d8b4d67 100644
--- a/recipes/xfcalendar/xfcalendar.inc
+++ b/recipes/xfce-extras/xfcalendar.inc
diff --git a/recipes/xfcalendar/xfcalendar_4.2.0.bb b/recipes/xfce-extras/xfcalendar_4.2.0.bb
index 987d8b4d67..987d8b4d67 100644
--- a/recipes/xfcalendar/xfcalendar_4.2.0.bb
+++ b/recipes/xfce-extras/xfcalendar_4.2.0.bb
diff --git a/recipes/xfcalendar/xfcalendar_4.2.2.bb b/recipes/xfce-extras/xfcalendar_4.2.2.bb
index 41b0db2a51..41b0db2a51 100644
--- a/recipes/xfcalendar/xfcalendar_4.2.2.bb
+++ b/recipes/xfce-extras/xfcalendar_4.2.2.bb
diff --git a/recipes/xfcalendar/xfcalendar_4.2.3.bb b/recipes/xfce-extras/xfcalendar_4.2.3.bb
index ebab53efcd..ebab53efcd 100644
--- a/recipes/xfcalendar/xfcalendar_4.2.3.bb
+++ b/recipes/xfce-extras/xfcalendar_4.2.3.bb
diff --git a/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb b/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb
new file mode 100644
index 0000000000..961b7862b3
--- /dev/null
+++ b/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Notification daemon for the Xfce desktop."
+DEPENDS = "pkgconfig dbus gtk+ libsexy"
+RDEPENDS = "libxfce4util libxfcegui4 libnotify xfconf"
+
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+SRC_URI = "http://spuriousinterrupt.org/files/${PN}/${PN}-${PV}.tar.bz2"
+
+FILES_${PN} = "\
+    ${datadir}/dbus-1/services \
+    ${datadir}/themes \
+    ${datadir}/icons \
+    ${datadir}/applications \  
+    ${libexecdir}/xfce4-notifyd \     
+    ${bindir}/xfce4-notifyd-config \
+"
diff --git a/recipes/xfprint/xfprint_4.3.99.2.bb b/recipes/xfce-extras/xfprint_4.3.99.2.bb
index 7e349ce881..7e349ce881 100644
--- a/recipes/xfprint/xfprint_4.3.99.2.bb
+++ b/recipes/xfce-extras/xfprint_4.3.99.2.bb
diff --git a/recipes/xfce-base/xfprint_4.4.2.bb b/recipes/xfce-extras/xfprint_4.4.2.bb
index 19bfa0dde3..19bfa0dde3 100644
--- a/recipes/xfce-base/xfprint_4.4.2.bb
+++ b/recipes/xfce-extras/xfprint_4.4.2.bb
diff --git a/recipes/xfce-extras/xfprint_4.6.1.bb b/recipes/xfce-extras/xfprint_4.6.1.bb
new file mode 100644
index 0000000000..74d619af66
--- /dev/null
+++ b/recipes/xfce-extras/xfprint_4.6.1.bb
@@ -0,0 +1,13 @@
+# xfprint OE build file
+
+DESCRIPTION="XFCE4 Print Manager"
+SECTION = "x11/base"
+
+PR = "r2"
+
+DEPENDS="libxfcegui4"
+
+inherit xfce46
+
+FILES_${PN} += "${libdir}/xfce4/xfprint-plugins/*.so"
+FILES_${PN}-dev += "${libdir}/xfce4/xfprint-plugins/*.a"