merge of '1bb8268fd7793fa7cde34e0d086742cc7a98a639'

     and '88cbce2efbfb5b53d746089e00d4c028271d57d2'

36 files changed, 387 insertions, 0 deletions

diff --git a/packages/xfce/.mtn2git_empty b/packages/xfce/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfce/.mtn2git_empty
diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb
new file mode 100644
index 0000000000..6bf0e1292f
--- /dev/null
+++ b/packages/xfce/exo_0.3.2.bb
@@ -0,0 +1,17 @@
+
+DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+
+inherit pkgconfig xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2"
+
+# Note: Python checking is broken
+
+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/packages/xfce/gtk-xfce-engine_2.4.1.bb b/packages/xfce/gtk-xfce-engine_2.4.1.bb
new file mode 100644
index 0000000000..bcfecaf53b
--- /dev/null
+++ b/packages/xfce/gtk-xfce-engine_2.4.1.bb
@@ -0,0 +1,9 @@
+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"
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
+                ${datadir}/themes/"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
diff --git a/packages/xfce/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc
new file mode 100644
index 0000000000..19268fc9b3
--- /dev/null
+++ b/packages/xfce/libxfce4mcs.inc
@@ -0,0 +1,19 @@
+# libxfce4mcs OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+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/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb
new file mode 100644
index 0000000000..07d7a95ae1
--- /dev/null
+++ b/packages/xfce/libxfce4mcs_4.4.1.bb
@@ -0,0 +1,5 @@
+# libxfce4mcs OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc
new file mode 100644
index 0000000000..d5dd6d6565
--- /dev/null
+++ b/packages/xfce/libxfce4util.inc
@@ -0,0 +1,26 @@
+# libxfce4util OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+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/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb
new file mode 100644
index 0000000000..70f5ddac93
--- /dev/null
+++ b/packages/xfce/libxfce4util_4.4.1.bb
@@ -0,0 +1,5 @@
+# libxfce4util OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc
new file mode 100644
index 0000000000..714e365af4
--- /dev/null
+++ b/packages/xfce/libxfcegui4.inc
@@ -0,0 +1,16 @@
+# libxfcegui4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "XFCE Widget library and X Window System interaction"
+DEPENDS = "libxfce4util dbh libxml2 gtk+"
+SECTION = "x11/libs"
+
+inherit xfce pkgconfig
+
+
+do_stage() {
+autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb
new file mode 100644
index 0000000000..2def53685a
--- /dev/null
+++ b/packages/xfce/libxfcegui4_4.4.1.bb
@@ -0,0 +1,5 @@
+# libxfcegui4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce/mousepad_0.2.12.bb b/packages/xfce/mousepad_0.2.12.bb
new file mode 100644
index 0000000000..670a28dbd7
--- /dev/null
+++ b/packages/xfce/mousepad_0.2.12.bb
@@ -0,0 +1,6 @@
+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"
diff --git a/packages/xfce/orage_4.4.1.bb b/packages/xfce/orage_4.4.1.bb
new file mode 100644
index 0000000000..b8f5284454
--- /dev/null
+++ b/packages/xfce/orage_4.4.1.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Calendar application for the Xfce Desktop  Environment"
+DEPENDS = "libxfcegui4 exo libxml-parser-perl-native xfce4-panel xfce-mcs-manager"
+RREPLACES = "xfcalendar"
+
+inherit xfce
diff --git a/packages/xfce/thunar_0.8.0.bb b/packages/xfce/thunar_0.8.0.bb
new file mode 100644
index 0000000000..ea739e4cde
--- /dev/null
+++ b/packages/xfce/thunar_0.8.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "File manager for the Xfce Desktop Environment"
+DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm"
+
+inherit xfce
+
+SRC_URI = "http://thunar.xfce.org/download/sources/Thunar/0.8.0/Thunar-0.8.0.tar.bz2"
+
+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/"
diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc
new file mode 100644
index 0000000000..c50bf0ca64
--- /dev/null
+++ b/packages/xfce/xfce-mcs-manager.inc
@@ -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 packages/COPYING)
+
+DESCRIPTION="XFCE4 Settings manager."
+DEPENDS="libxfcegui4 libxfce4mcs"
+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_PATH}
+	sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_PATH}/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
new file mode 100644
index 0000000000..de5cf2b012
--- /dev/null
+++ b/packages/xfce/xfce-mcs-manager_4.4.1.bb
@@ -0,0 +1,5 @@
+# xfce-mcs-manager OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc
new file mode 100644
index 0000000000..b5b4505e98
--- /dev/null
+++ b/packages/xfce/xfce-mcs-plugins.inc
@@ -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 packages/COPYING)
+
+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/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
new file mode 100644
index 0000000000..02ad97e860
--- /dev/null
+++ b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
@@ -0,0 +1,5 @@
+# xfce-mcs-plugins OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce/xfce-terminal_0.2.6.bb b/packages/xfce/xfce-terminal_0.2.6.bb
new file mode 100644
index 0000000000..07a8eb6eb5
--- /dev/null
+++ b/packages/xfce/xfce-terminal_0.2.6.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
+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"
+
+S = "${WORKDIR}/Terminal-${PV}"
diff --git a/packages/xfce/xfce-utils.inc b/packages/xfce/xfce-utils.inc
new file mode 100644
index 0000000000..0b191194d7
--- /dev/null
+++ b/packages/xfce/xfce-utils.inc
@@ -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 packages/COPYING)
+
+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/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb
new file mode 100644
index 0000000000..57909f2c2d
--- /dev/null
+++ b/packages/xfce/xfce-utils_4.4.1.bb
@@ -0,0 +1,6 @@
+# xfce-utils OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR = "r1"
+require ${PN}.inc
diff --git a/packages/xfce/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc
new file mode 100644
index 0000000000..0d102f3bd0
--- /dev/null
+++ b/packages/xfce/xfce4-appfinder.inc
@@ -0,0 +1,8 @@
+# xfce4-appfinder build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="XFCE Application Finder"
+SECTION = "x11"
+inherit xfce
+DEPENDS="libxfcegui4"
diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb
new file mode 100644
index 0000000000..f7c97970d5
--- /dev/null
+++ b/packages/xfce/xfce4-appfinder_4.4.1.bb
@@ -0,0 +1,5 @@
+# xfce4-appfinder build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc
new file mode 100644
index 0000000000..03f64e39e5
--- /dev/null
+++ b/packages/xfce/xfce4-dev-tools.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Xfce4 development tools"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+
+inherit xfce pkgconfig
+
+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/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb
new file mode 100644
index 0000000000..bd54419686
--- /dev/null
+++ b/packages/xfce/xfce4-dev-tools_4.4.0.bb
@@ -0,0 +1 @@
+require ${PN}.inc
diff --git a/packages/xfce/xfce4-icon-theme_4.4.1.bb b/packages/xfce/xfce4-icon-theme_4.4.1.bb
new file mode 100644
index 0000000000..69d9dacbac
--- /dev/null
+++ b/packages/xfce/xfce4-icon-theme_4.4.1.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/packages/xfce/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc
new file mode 100644
index 0000000000..a923489f32
--- /dev/null
+++ b/packages/xfce/xfce4-mixer.inc
@@ -0,0 +1,9 @@
+# xfce-mixer-plugin OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="XFCE panel mixer plugin"
+SECTION = "x11"
+
+DEPENDS="xfce4-panel"
+inherit xfce
diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb
new file mode 100644
index 0000000000..6dd3c0565b
--- /dev/null
+++ b/packages/xfce/xfce4-mixer_4.4.1.bb
@@ -0,0 +1,5 @@
+# xfce-mixer-plugin OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc
new file mode 100644
index 0000000000..e43807540e
--- /dev/null
+++ b/packages/xfce/xfce4-panel.inc
@@ -0,0 +1,24 @@
+# xfce4-panel OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+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
+}
+
+PACKAGES += "${PN}-plugins ${PN}-mcs-plugins"
+FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*"
+FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/"
diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb
new file mode 100644
index 0000000000..18dce6fa3c
--- /dev/null
+++ b/packages/xfce/xfce4-panel_4.4.1.bb
@@ -0,0 +1,6 @@
+# xfce4-panel OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR="r1"
+require ${PN}.inc
diff --git a/packages/xfce/xfce4-session_4.4.1.bb b/packages/xfce/xfce4-session_4.4.1.bb
new file mode 100644
index 0000000000..a572b80f55
--- /dev/null
+++ b/packages/xfce/xfce4-session_4.4.1.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/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc
new file mode 100644
index 0000000000..e3e64ef355
--- /dev/null
+++ b/packages/xfce/xfdesktop.inc
@@ -0,0 +1,14 @@
+# xfdesktop OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="xfce4 Desktop Background Manager"
+SECTION = "x11/base"
+DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel"
+
+inherit xfce
+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"
diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb
new file mode 100644
index 0000000000..d7af836791
--- /dev/null
+++ b/packages/xfce/xfdesktop_4.4.1.bb
@@ -0,0 +1,6 @@
+# xfdesktop OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR = "r1"
+require ${PN}.inc
diff --git a/packages/xfce/xfprint_4.4.1.bb b/packages/xfce/xfprint_4.4.1.bb
new file mode 100644
index 0000000000..7e349ce881
--- /dev/null
+++ b/packages/xfce/xfprint_4.4.1.bb
@@ -0,0 +1,9 @@
+# xfprint OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="XFCE4 Print Manager"
+SECTION = "x11/base"
+
+DEPENDS="libxfcegui4"
+inherit xfce
diff --git a/packages/xfce/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc
new file mode 100644
index 0000000000..c60edc5b83
--- /dev/null
+++ b/packages/xfce/xfwm4-themes.inc
@@ -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 packages/COPYING)
+
+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/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb
new file mode 100644
index 0000000000..9f67ad2ed9
--- /dev/null
+++ b/packages/xfce/xfwm4-themes_4.4.1.bb
@@ -0,0 +1,5 @@
+# xfwm4-themes OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc
new file mode 100644
index 0000000000..e7e5bc1862
--- /dev/null
+++ b/packages/xfce/xfwm4.inc
@@ -0,0 +1,31 @@
+# xfwm4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="XFCE4 Window Manager"
+SECTION = "x11/wm"
+inherit xfce
+
+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"
+
+do_configure_append() {
+	sed -i s:/usr/include/xfce4::g mcs-plugin/Makefile
+}
+
+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"
+
diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb
new file mode 100644
index 0000000000..2fc47e641e
--- /dev/null
+++ b/packages/xfce/xfwm4_4.4.1.bb
@@ -0,0 +1,6 @@
+# xfwm4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR="r1"
+require ${PN}.inc