39 files changed, 191 insertions, 110 deletions
diff --git a/packages/xfce/exo/configure.patch b/packages/xfce/exo/configure.patch
new file mode 100644
index 0000000000..2ccfcfc994
--- /dev/null
+++ b/packages/xfce/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/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.4.bb
index b48eeba645..49ab44582c 100644
--- a/packages/xfce/exo_0.3.2.bb
+++ b/packages/xfce/exo_0.3.4.bb
@@ -1,9 +1,9 @@
-
 DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
 
-inherit  xfce
+inherit xfce
+XFCE_VERSION = 4.4.2
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2"
+SRC_URI += " file://configure.patch;patch=1"
 
 # Note: Python checking is broken
 
diff --git a/packages/xfce/gtk-xfce-engine_2.4.1.bb b/packages/xfce/gtk-xfce-engine_2.4.2.bb
index bcfecaf53b..fda9b9d833 100644
--- a/packages/xfce/gtk-xfce-engine_2.4.1.bb
+++ b/packages/xfce/gtk-xfce-engine_2.4.2.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "XFCE theme for GTK"
 
 inherit xfce
-
-SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/gtk-xfce-engine-${PV}.tar.bz2"
+XFCE_VERSION = 4.4.2
 
 FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
                 ${datadir}/themes/"
diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb
deleted file mode 100644
index 8e2d522962..0000000000
--- a/packages/xfce/libxfce4mcs_4.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfce4mcs OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-require ${PN}.inc
diff --git a/packages/xfce/libxfce4mcs.inc b/packages/xfce/libxfce4mcs_4.4.2.bb
index 6ecbc8db58..20448240e2 100644
--- a/packages/xfce/libxfce4mcs.inc
+++ b/packages/xfce/libxfce4mcs_4.4.2.bb
@@ -6,7 +6,7 @@ DESCRIPTION="Settings management library used by most XFce 4 modules"
 DEPENDS="libxfce4util"
 SECTION = "x11/libs"
 
-inherit xfce 
+inherit xfce pkgconfig
 
 do_stage() {
 	install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs
diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb
deleted file mode 100644
index a53a83e861..0000000000
--- a/packages/xfce/libxfce4util_4.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfce4util OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-require ${PN}.inc
diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util_4.4.2.bb
index ee7b886f20..3386ad57e3 100644
--- a/packages/xfce/libxfce4util.inc
+++ b/packages/xfce/libxfce4util_4.4.2.bb
@@ -7,7 +7,7 @@ SECTION = "x11/libs"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 xfce4-dev-tools"
 
-inherit xfce 
+inherit xfce pkgconfig
 
 MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
 
diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb
deleted file mode 100644
index a36897f822..0000000000
--- a/packages/xfce/libxfcegui4_4.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfcegui4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-require ${PN}.inc
diff --git a/packages/xfce/libxfcegui4.inc b/packages/xfce/libxfcegui4_4.4.2.bb
index 1b7703abf9..d38269d6f8 100644
--- a/packages/xfce/libxfcegui4.inc
+++ b/packages/xfce/libxfcegui4_4.4.2.bb
@@ -6,8 +6,7 @@ DESCRIPTION = "XFCE Widget library and X Window System interaction"
 DEPENDS = "libxfce4util dbh libxml2 gtk+"
 SECTION = "x11/libs"
 
-inherit xfce 
-
+inherit xfce
 
 do_stage() {
 autotools_stage_all
diff --git a/packages/xfce/mousepad_0.2.12.bb b/packages/xfce/mousepad_0.2.13.bb
index 670a28dbd7..c55ce5a047 100644
--- a/packages/xfce/mousepad_0.2.12.bb
+++ b/packages/xfce/mousepad_0.2.13.bb
@@ -2,5 +2,4 @@ DESCRIPTION = "Text editor for Xfce based on Leafpad"
 DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
 
 inherit xfce
-
-SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/mousepad-${PV}.tar.bz2"
+XFCE_VERSION = 4.4.2
diff --git a/packages/xfce/orage_4.4.1.bb b/packages/xfce/orage_4.4.2.bb
index b8f5284454..b8f5284454 100644
--- a/packages/xfce/orage_4.4.1.bb
+++ b/packages/xfce/orage_4.4.2.bb
diff --git a/packages/xfce/thunar_0.8.0.bb b/packages/xfce/thunar_0.9.0.bb
index ea739e4cde..4c5f02565e 100644
--- a/packages/xfce/thunar_0.8.0.bb
+++ b/packages/xfce/thunar_0.9.0.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "File manager for the Xfce Desktop Environment"
 DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm"
 
-inherit xfce
+inherit xfce pkgconfig
 
-SRC_URI = "http://thunar.xfce.org/download/sources/Thunar/0.8.0/Thunar-0.8.0.tar.bz2"
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2"
+FILE_PR = 'r1'
 
 S = "${WORKDIR}/Thunar-${PV}/"
 
@@ -12,4 +13,8 @@ FILES_${PN} += "${libdir}/thunarx-1/*.so \
                 ${datadir}/thumbnailers \
                 ${datadir}/Thunar \
                 ${datadir}/xfce4"
-FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/"
+FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc
index de12b14b05..8ad747b3bc 100644
--- a/packages/xfce/xfce-mcs-manager.inc
+++ b/packages/xfce/xfce-mcs-manager.inc
@@ -14,3 +14,7 @@ do_stage() {
 }
 
 
+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/packages/xfce/xfce-mcs-manager_4.4.1.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb
deleted file mode 100644
index 76e0452ad8..0000000000
--- a/packages/xfce/xfce-mcs-manager_4.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-manager OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-require ${PN}.inc
diff --git a/packages/xfce/xfce-mcs-manager_4.4.2.bb b/packages/xfce/xfce-mcs-manager_4.4.2.bb
new file mode 100644
index 0000000000..0b9fc43f70
--- /dev/null
+++ b/packages/xfce/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/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
deleted file mode 100644
index bd41458757..0000000000
--- a/packages/xfce/xfce-mcs-plugins_4.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-plugins OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-require ${PN}.inc
diff --git a/packages/xfce/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins_4.4.2.bb
index 80037841fa..80037841fa 100644
--- a/packages/xfce/xfce-mcs-plugins.inc
+++ b/packages/xfce/xfce-mcs-plugins_4.4.2.bb
diff --git a/packages/xfce/xfce-terminal_0.2.6.bb b/packages/xfce/xfce-terminal_0.2.8.bb
index 07a8eb6eb5..9a36c69237 100644
--- a/packages/xfce/xfce-terminal_0.2.6.bb
+++ b/packages/xfce/xfce-terminal_0.2.8.bb
@@ -3,6 +3,6 @@ DEPENDS = "exo vte dbus-glib gtk+"
 
 inherit xfce
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/Terminal-${PV}.tar.bz2"
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-${PV}.tar.bz2"
 
 S = "${WORKDIR}/Terminal-${PV}"
diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb
deleted file mode 100644
index c48026b190..0000000000
--- a/packages/xfce/xfce-utils_4.4.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfce-utils OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-FILE_PR = "r1"
-require ${PN}.inc
diff --git a/packages/xfce/xfce-utils.inc b/packages/xfce/xfce-utils_4.4.2.bb
index d681fd7adb..d681fd7adb 100644
--- a/packages/xfce/xfce-utils.inc
+++ b/packages/xfce/xfce-utils_4.4.2.bb
diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb
deleted file mode 100644
index 471122ea02..0000000000
--- a/packages/xfce/xfce4-appfinder_4.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce4-appfinder build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-require ${PN}.inc
diff --git a/packages/xfce/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder_4.4.2.bb
index ddfa3e1e4e..ddfa3e1e4e 100644
--- a/packages/xfce/xfce4-appfinder.inc
+++ b/packages/xfce/xfce4-appfinder_4.4.2.bb
diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools_4.4.0.1.bb
index 2116b1d414..67c2d341de 100644
--- a/packages/xfce/xfce4-dev-tools.inc
+++ b/packages/xfce/xfce4-dev-tools_4.4.0.1.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Xfce4 development tools"
 SECTION = "x11/libs"
 LICENSE = "GPL"
 
-inherit xfce 
+inherit xfce
+XFCE_VERSION = 4.4.2
 
 do_stage() {
 	install -d ${STAGING_DATADIR}/aclocal
diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb
deleted file mode 100644
index bd54419686..0000000000
--- a/packages/xfce/xfce4-dev-tools_4.4.0.bb
+++ /dev/null
@@ -1 +0,0 @@
-require ${PN}.inc
diff --git a/packages/xfce/xfce4-icon-theme_4.4.1.bb b/packages/xfce/xfce4-icon-theme_4.4.2.bb
index 69d9dacbac..69d9dacbac 100644
--- a/packages/xfce/xfce4-icon-theme_4.4.1.bb
+++ b/packages/xfce/xfce4-icon-theme_4.4.2.bb
diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb
deleted file mode 100644
index 13ba0f32e3..0000000000
--- a/packages/xfce/xfce4-mixer_4.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mixer-plugin OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-require ${PN}.inc
diff --git a/packages/xfce/xfce4-mixer.inc b/packages/xfce/xfce4-mixer_4.4.2.bb
index 4d3faed14c..60bb012810 100644
--- a/packages/xfce/xfce4-mixer.inc
+++ b/packages/xfce/xfce4-mixer_4.4.2.bb
@@ -7,3 +7,6 @@ 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/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc
deleted file mode 100644
index be7092ab9e..0000000000
--- a/packages/xfce/xfce4-panel.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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  xfce
-
-EXTRA_OECONF += " --enable-startup-notification"
-
-
-do_stage() {
-autotools_stage_all
-}
-
-do_install() {
-    oe_runmake DESTDIR=${D} install
-}
-
-PACKAGES += "${PN}-plugins ${PN}-mcs-plugins"
-FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \
-                        ${datadir}/xfce4/panel-plugins/*.desktop"
-FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/"
-FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug"
diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb
deleted file mode 100644
index d855f35f49..0000000000
--- a/packages/xfce/xfce4-panel_4.4.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfce4-panel OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-FILE_PR ="r2"
-require ${PN}.inc
diff --git a/packages/xfce/xfce4-panel_4.4.2.bb b/packages/xfce/xfce4-panel_4.4.2.bb
new file mode 100644
index 0000000000..2fd087733e
--- /dev/null
+++ b/packages/xfce/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/packages/xfce/xfce4-session_4.4.1.bb b/packages/xfce/xfce4-session_4.4.2.bb
index a572b80f55..a572b80f55 100644
--- a/packages/xfce/xfce4-session_4.4.1.bb
+++ b/packages/xfce/xfce4-session_4.4.2.bb
diff --git a/packages/xfce/xfdesktop/relocation-and-memleak.patch b/packages/xfce/xfdesktop/relocation-and-memleak.patch
new file mode 100644
index 0000000000..df9011d8da
--- /dev/null
+++ b/packages/xfce/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/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb
deleted file mode 100644
index bc35acad2a..0000000000
--- a/packages/xfce/xfdesktop_4.4.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-FILE_PR = "r2"
-require ${PN}.inc
diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop_4.4.2.bb
index 35c5ff5954..5b01c16e34 100644
--- a/packages/xfce/xfdesktop.inc
+++ b/packages/xfce/xfdesktop_4.4.2.bb
@@ -4,9 +4,13 @@
 
 DESCRIPTION="xfce4 Desktop Background Manager"
 SECTION = "x11/base"
-DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel"
+DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel thunar"
+FILE_PR = "r1"
 
 inherit xfce
+
+SRC_URI += " file://relocation-and-memleak.patch;patch=1 "
+
 PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins"
 
 FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*"
diff --git a/packages/xfce/xfprint_4.4.1.bb b/packages/xfce/xfprint_4.4.2.bb
index 19bfa0dde3..19bfa0dde3 100644
--- a/packages/xfce/xfprint_4.4.1.bb
+++ b/packages/xfce/xfprint_4.4.2.bb
diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb
deleted file mode 100644
index c7f45d2b09..0000000000
--- a/packages/xfce/xfwm4-themes_4.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfwm4-themes OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-require ${PN}.inc
diff --git a/packages/xfce/xfwm4-themes.inc b/packages/xfce/xfwm4-themes_4.4.2.bb
index 63c5ab0296..63c5ab0296 100644
--- a/packages/xfce/xfwm4-themes.inc
+++ b/packages/xfce/xfwm4-themes_4.4.2.bb
diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb
deleted file mode 100644
index 1d8a176d8a..0000000000
--- a/packages/xfce/xfwm4_4.4.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-FILE_PR ="r1"
-require ${PN}.inc
diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4_4.4.2.bb
index 211853aa18..8d1a1835cf 100644
--- a/packages/xfce/xfwm4.inc
+++ b/packages/xfce/xfwm4_4.4.2.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION="XFCE4 Window Manager"
 SECTION = "x11/wm"
-inherit xfce
+inherit xfce update-alternatives
 
 FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
 
@@ -14,7 +14,7 @@ RDEPENDS = "xfwm4-theme-default"
 
 EXTRA_OECONF += " --enable-startup-notification"
 
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
+PACKAGES_DYNAMIC += "xfwm4-theme-*"
 
 python populate_packages_prepend () {
 	themedir = bb.data.expand('${datadir}/themes', d)
@@ -25,3 +25,7 @@ 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"