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

43 files changed, 871 insertions, 1 deletions

diff --git a/classes/xfce46.bbclass b/classes/xfce46.bbclass
index 84b73cda56..c24dfa4d8c 100644
--- a/classes/xfce46.bbclass
+++ b/classes/xfce46.bbclass
@@ -11,7 +11,7 @@ SECTION ?= "x11/xfce"
 
 XFCE_VERSION = ${PV}
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://mocha.xfce.org/archive/src/xfce/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2"
 
 inherit autotools gtk-icon-cache pkgconfig
 
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 49e1a29ca3..1619c93f45 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1186,10 +1186,18 @@ sha256=c1f29cfd31c335a409bdc530c2e68661d20a1e3c2e5d64454470b6700a40681e
 md5=f0ef2cea8acfbcc58d865c05b0c7e1ff
 sha256=8c4c70bf487f2e432046dce07cf4b77ff181667d0905f9cb1203ff95ff5dd5ff
 
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/Terminal-0.2.12.tar.bz2]
+md5=adb419d279c9fc16d02291c052190717
+sha256=352205b03e9ed1b9080c61235fbc0fa15609410e724237441055a232a3b603dc
+
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-0.2.8.tar.bz2]
 md5=cfe660ecf50e9d3b073576bbc4af6ab2
 sha256=20a58b96915f67c5b4f49fb1428e1876195f1f9fd7d37e0081352cadc13463e7
 
+[http://www.xfce.org/archive/src/apps/terminal/0.4/Terminal-0.4.2.tar.bz2]
+md5=9754afef6b79fa1df9aaf41fb8cc6374
+sha256=4d5a07f3a1b68c9825cc3b82fc2672785ba91247a34e4ac462841f0b1ea21079
+
 [http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-1.01.tar.gz]
 md5=4751252f1e33af4f582c8af4c7b7666f
 sha256=62bc416ccb3f01c3911d9744d6c865d9fa4d008bd47dbecc2adde5c3892ce868
@@ -1218,6 +1226,10 @@ sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7
 md5=0fc5008858661c0abd0399acbe30ef28
 sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037
 
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2]
+md5=218373aa45d74b6ba8c69c4d5af3bb19
+sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
+
 [http://www.cpan.org/modules/by-module/Time/TimeDate-1.16.tar.gz]
 md5=b3cc35a7cabd106ac8829d2f2ff4bd9d
 sha256=7942ef0181b5828563a1b98a0a801a75bc0102773a1c942a09ac1d0b9fba6cb3
@@ -6222,6 +6234,14 @@ sha256=53082354ae893fd385051c96214640cbeba527131ccf9f5320626252a4aef8d5
 md5=eb8b6d834d2224e17561593dc4158e4d
 sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b
 
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/exo-0.3.101.tar.bz2]
+md5=1c0eebb360f53eab70454b70e1bde36e
+sha256=0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324
+
+[http://mocha.xfce.org/archive/src/xfce/exo/0.3/exo-0.3.105.tar.bz2]
+md5=ba87f84894498bf23ae39d849c55f98c
+sha256=278f702d890c89bd3923ce1bdaf29bd9f2c800c2e4cfd9e902d99663bba337e5
+
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/exo-0.3.4.tar.bz2]
 md5=7a1af943b1df32b6f89ae91823118a22
 sha256=a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538
@@ -8178,6 +8198,10 @@ sha256=3d3013fb5648b6060202a63c13c160899da8baf756140c7fd8f4ed432b40fdd2
 md5=f492b6e3607aed801b77657f3808f5c1
 sha256=3d3013fb5648b6060202a63c13c160899da8baf756140c7fd8f4ed432b40fdd2
 
+[http://files.uvena.de/gigolo/gigolo-0.3.2.tar.bz2]
+md5=e810a525b495d08bce69317aa37d6134
+sha256=e4b20c058ba70f3aa0258ff16817e238303f5d1efb87dbac4acf016e628a7151
+
 [ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-2.2.10.tar.bz2]
 md5=aa29506ed2272af02941a7a601a7a097
 sha256=41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e
@@ -10894,6 +10918,14 @@ sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50
 md5=00eb6a62defe6867d28a18569b96d151
 sha256=6fecdb590fa024db698de9027314c1be044f28feab9850f592aa60c3a79ede78
 
+[http://mocha.xfce.org/archive/src/xfce/gtk-xfce-engine/2.6/gtk-xfce-engine-2.6.0.tar.bz2]
+md5=e836705d2933d0a77c6628285e10d982
+sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/gtk-xfce-engine-2.6.0.tar.bz2]
+md5=e836705d2933d0a77c6628285e10d982
+sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
+
 [http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-0.3.tar.gz]
 md5=14ca8c653ad19699b7299198d7a94e0a
 sha256=5b0a2b2ea2cbe26d7738a360ba5aad57d7d03297a662cf209a032c0b9725d33c
@@ -16154,6 +16186,14 @@ sha256=8f3cd90d4ea258ffa35b8723c1eae7ace31409baa85361889664084c6c5d1b6d
 md5=5ffe66a3eeb884839806ce929e5d2776
 sha256=192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e
 
+[http://mocha.xfce.org/archive/src/xfce/libxfce4menu/4.6/libxfce4menu-4.6.1.tar.bz2]
+md5=5dc9343885c2c6f931318b2a1cdcc9db
+sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfce4menu-4.6.1.tar.bz2]
+md5=5dc9343885c2c6f931318b2a1cdcc9db
+sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
+
 [http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfce4util-4.2.2.tar.gz]
 md5=5f27635aa0ba5e40ffaf3031b530b36b
 sha256=8efb3416a37654050089234115fe7db9268c8da0ee0369ff3f5330cef3f15a66
@@ -16166,6 +16206,14 @@ sha256=988efce9b4fd7252475234be3ca3fe8b737125ebaadc8c448d1c5d4cbc8bb521
 md5=261e7a5df039493ad746e0c359211092
 sha256=f717dcdb4d8ee8f967ed0882e82aad06abe66c32481b9954737273312c937a6d
 
+[http://mocha.xfce.org/archive/src/xfce/libxfce4util/4.6/libxfce4util-4.6.1.tar.bz2]
+md5=eac51d58179cbcadc3f802450a8ec9cd
+sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2]
+md5=eac51d58179cbcadc3f802450a8ec9cd
+sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
+
 [http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfcegui4-4.2.2.tar.gz]
 md5=e88d6e8379eae60cee6dd6122bf3ae59
 sha256=bdd542e60ffbe4987b5ae765e581fe5bcfdfc4d623341d09aaff7794e90d4454
@@ -16182,6 +16230,14 @@ sha256=a3da5f3b70e65d6679cfb21fd2baf10baedceb8b099347987f9b6c5fa7cd329b
 md5=799a4869138c605126e8e71d58189bfd
 sha256=622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91
 
+[http://mocha.xfce.org/archive/src/xfce/libxfcegui4/4.6/libxfcegui4-4.6.1.tar.bz2]
+md5=539cff747634b8ee6f0d2362ee78a286
+sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfcegui4-4.6.1.tar.bz2]
+md5=539cff747634b8ee6f0d2362ee78a286
+sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093
+
 [http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.4.tar.bz2]
 md5=12b4ceb5d42b520228b5fb40a96ae6c5
 sha256=468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae
@@ -18314,6 +18370,18 @@ sha256=48c456dfcadec2db472320e317fa37dc697f184e12f99006a1ec0b6512d2ebcd
 md5=326075ac933e5da38cedbc20e80b7026
 sha256=f32cc263fb73b05c5bad17121073a2b37a7d5c8e411f780312c2701902e6637a
 
+[http://mocha.xfce.org/archive/src/apps/mousepad/0.2/mousepad-0.2.16.tar.bz2]
+md5=d98854edb76d823ac20b266fdf5a64a1
+sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
+
+[http://mocha.xfce.org/archive/src/xfce/mousepad/0.2/mousepad-0.2.16.tar.bz2]
+md5=d98854edb76d823ac20b266fdf5a64a1
+sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/mousepad-0.2.16.tar.bz2]
+md5=d98854edb76d823ac20b266fdf5a64a1
+sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
+
 [http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-3.1.3.tar.gz]
 md5=38beb6a5648cbca4ec87ee14b0982283
 sha256=c1b110f2aa5ed8744f7f6eeabf24d6cd1cecc50f4b5473ec6ddf622935f360ee
@@ -19634,6 +19702,18 @@ sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae
 md5=0c69e4c20350c3000d49350991d3a520
 sha256=ef08b96e5529f19a2f609525300fbea2019f1afb75fb3c85e474e6041f425abd
 
+[http://mocha.xfce.org/archive/src/apps/orage/4.6/orage-4.6.1.tar.bz2]
+md5=24fa43dd86ec5af5a4766620fd972cf2
+sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
+
+[http://mocha.xfce.org/archive/src/xfce/orage/4.6/orage-4.6.1.tar.bz2]
+md5=24fa43dd86ec5af5a4766620fd972cf2
+sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/orage-4.6.1.tar.bz2]
+md5=24fa43dd86ec5af5a4766620fd972cf2
+sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
+
 [http://ozlabs.org/people/dgibson/dldwd/orinoco-0.13e.tar.gz]
 md5=4cea186648c335752bc241418fd54038
 sha256=07fbed267421ee26ee4b6bc410b68a10a284072d78e1e495c74865db0470306e
@@ -22642,6 +22722,10 @@ sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de
 md5=2ea5f7cd44f79b64721ce60f1fc1c2b7
 sha256=c3ab591b02afbb5b3f76a0c1406c607b9561138bdb0a62105981de559d2920dc
 
+[http://goodies.xfce.org/releases/ristretto/ristretto-0.0.21.tar.gz]
+md5=7774dcafdc365e70b8d981c0a52d6250
+sha256=b3e63ef1d4a582c2a3f4e99f097ec28273edf9feb51162b470d4c12c61a51378
+
 [http://heanet.dl.sourceforge.net/sourceforge/gkernel/rng-tools-2.tar.gz]
 md5=63d503191eabed630324c104cc024475
 sha256=1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25ec2b1e
@@ -23910,6 +23994,10 @@ sha256=8423027a1e7dc238d27ec227f47ce22d1317b4c9a0a9ee49a38b6e6f8da8a5c8
 md5=a3c23391da4ebab0ac4a75021ddabf96
 sha256=18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21
 
+[http://squeeze.xfce.org/downloads/squeeze-0.2.3.tar.bz2]
+md5=bd3cb0648b49be1f146fc4f675606176
+sha256=7b8dc13e0adf72c67bba12e1ed1285ec820946e65d0eec247f7bd159a2cfac2d
+
 [http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2]
 md5=eadb138d48320df8b99349121159c6bf
 sha256=dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
@@ -26306,6 +26394,10 @@ sha256=a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e
 md5=4c6a93e00123d8bb7af48a009519aca4
 sha256=4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7
 
+[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-08-30-2158.zip]
+md5=b69ee5a5ffc825ff6d7970a62dcae46a
+sha256=6641a438972acdc8113957c25a17db55d6d9c3ce037ed3ac5337ac6ee153d73f
+
 [ftp://ftp.elmeg.de/artem/ClientCards/11b/linux/wl_lkm_718_release.tar.gz]
 md5=049c6c3d410e9f46884627b57485d3e7
 sha256=a28c7ea94d57a5354b7de06cf5f6416d80a40596911c129d4b6a4087dc916831
@@ -28438,6 +28530,14 @@ sha256=a40832c874dda5a06c0208cd178a8d02cd61cb2379aa46cdffbe3fb592fd551c
 md5=119dd3f1daedfa41e3be89bad8997336
 sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c
 
+[http://mocha.xfce.org/archive/src/xfce/xfce-utils/4.6/xfce-utils-4.6.1.tar.bz2]
+md5=1aa2362b11e79e56d52ce0d265faf1b6
+sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce-utils-4.6.1.tar.bz2]
+md5=1aa2362b11e79e56d52ce0d265faf1b6
+sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
+
 [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-appfinder-4.2.2.tar.gz]
 md5=0ef8c944e8aa2db06719e02b2c40d70c
 sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5
@@ -28450,10 +28550,26 @@ sha256=1e6c80b800dd02f6b1cbf69df36307cc0b341ab73438c5508ac760fd8be66232
 md5=0bdd0b1e96a1e1cf50ce5d582758b992
 sha256=bdf232505f240d0933ca3cd7d2a5c07c31477a70570d95111f94a1226bf7e59c
 
+[http://mocha.xfce.org/archive/src/xfce/xfce4-appfinder/4.6/xfce4-appfinder-4.6.1.tar.bz2]
+md5=a1bc7d88100cfd92714a300be531589b
+sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-appfinder-4.6.1.tar.bz2]
+md5=a1bc7d88100cfd92714a300be531589b
+sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
+
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2]
 md5=7d09d161efc7ef86b3b48791d98c8ae8
 sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e
 
+[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
+md5=c9587fa78e877eee858a33391d0afd62
+sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-dev-tools-4.6.0.tar.bz2]
+md5=c9587fa78e877eee858a33391d0afd62
+sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
+
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2]
 md5=d3e3e64596a7efa857d2e6bb0cbd09bb
 sha256=72178637c479ba848747285e0c7dc53a3abfe26b6517df5e75c7449542017350
@@ -28470,6 +28586,18 @@ sha256=6beda572195d6f7ed108e0659592d1ca6ad5088e769e3d219cc4114533f8b169
 md5=c21cb5680f135dc86e5f0a6f9473003a
 sha256=b390241dfddbc10ae1b870d1326a7675b9ac99e13c89326ba2accea3bfecc47a
 
+[http://mocha.xfce.org/archive/src/xfce/xfce4-mixer/4.6/xfce4-mixer-4.6.1.tar.bz2]
+md5=a99e2455445480ef5081fe69454a46fc
+sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-mixer-4.6.1.tar.bz2]
+md5=a99e2455445480ef5081fe69454a46fc
+sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
+
+[http://spuriousinterrupt.org/files/xfce4-notifyd/xfce4-notifyd-0.1.0.tar.bz2]
+md5=659ecaf37f0f7ee9e31f7b25f9813778
+sha256=989b0e9ae9ff5bdbdbf56368a44eca039236033f84d05001e311c21c988bd0e1
+
 [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-panel-4.2.2.tar.gz]
 md5=50699e6c8e4a79f0a4f962e12559c9d0
 sha256=b29e8524c448b9712f5eff0d7702706289a4a2967125b82a92a50ca142cc2d66
@@ -28482,10 +28610,42 @@ sha256=1925b19457594b5e2a57f07f649375be428a038eb821c8b445dc1e7d2fe9c769
 md5=8f26b32c442bf9926f98f285a3c251dd
 sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd
 
+[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.1.tar.bz2]
+md5=73a366b9892152266b465d7d9c35bef4
+sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-panel-4.6.1.tar.bz2]
+md5=73a366b9892152266b465d7d9c35bef4
+sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
+
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
 md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
 
+[http://mocha.xfce.org/archive/src/xfce/xfce4-session/4.6/xfce4-session-4.6.1.tar.bz2]
+md5=7628be41ed3511a20cff5673d9d39858
+sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-session-4.6.1.tar.bz2]
+md5=7628be41ed3511a20cff5673d9d39858
+sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
+
+[http://mocha.xfce.org/archive/src/xfce/xfce4-settings/4.6/xfce4-settings-4.6.1.tar.bz2]
+md5=dc1c8704471c5b0104fa10c30eb60cb6
+sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-settings-4.6.1.tar.bz2]
+md5=dc1c8704471c5b0104fa10c30eb60cb6
+sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
+
+[http://mocha.xfce.org/archive/src/xfce/xfconf/4.6/xfconf-4.6.1.tar.bz2]
+md5=d4d3018767ea9eb4b57cc57d4038023b
+sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfconf-4.6.1.tar.bz2]
+md5=d4d3018767ea9eb4b57cc57d4038023b
+sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
+
 [http://xorg.freedesktop.org/releases/individual/app/xfd-1.0.1.tar.bz2]
 md5=c72abd90f50ef459bc14b39ec9fcc7f8
 sha256=111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e
@@ -28510,6 +28670,14 @@ sha256=427df09a88f9b4a38fbed68d8154090bf0c11fbdc132c26247dc5568ee5ae910
 md5=694601234e74903d0fccba064f411e0c
 sha256=7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb
 
+[http://mocha.xfce.org/archive/src/xfce/xfdesktop/4.6/xfdesktop-4.6.1.tar.bz2]
+md5=ae15cacc3e3834cca7238a8e1035c50d
+sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfdesktop-4.6.1.tar.bz2]
+md5=ae15cacc3e3834cca7238a8e1035c50d
+sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
+
 [http://www.us.xfce.org/archive/xfce-4.2.0/src/xffm-4.2.0.tar.gz]
 md5=476b50335da473d46b12f43a07a28e83
 sha256=dcd12681eaaf2b88dd512023949080b6d47426ff855efc03329790ab479280c9
@@ -28550,6 +28718,18 @@ sha256=4eee12555dbc296fa26afbfdbfabad3586000239d5666e54b6bfae7f8cd03e89
 md5=be4802807e74dea30f4825102ceff5c5
 sha256=b9bb03820a8ba1995ffe3e5b96b6d5ebbbc0347ad1202172f13bba63b2984d54
 
+[http://mocha.xfce.org/archive/src/archive/xfprint/4.6/xfprint-4.6.1.tar.bz2]
+md5=d92fca97a42816085080baf07a99a62e
+sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
+
+[http://mocha.xfce.org/archive/src/xfce/xfprint/4.6/xfprint-4.6.1.tar.bz2]
+md5=d92fca97a42816085080baf07a99a62e
+sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfprint-4.6.1.tar.bz2]
+md5=d92fca97a42816085080baf07a99a62e
+sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
+
 [http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.4.tar.bz2]
 md5=f43cb64d623b748208dfd9012d17b654
 sha256=452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b
@@ -28614,6 +28794,14 @@ sha256=3600267ba477217f065628454bffb30d8819731940c7fdbfd197c731bca9125f
 md5=21da77e50b07e72bba784bf3418ca067
 sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a
 
+[http://mocha.xfce.org/archive/src/xfce/xfwm4/4.6/xfwm4-4.6.1.tar.bz2]
+md5=538ff2554a23bf877d336e573884da9a
+sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
+
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfwm4-4.6.1.tar.bz2]
+md5=538ff2554a23bf877d336e573884da9a
+sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
+
 [http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-themes-4.2.0.tar.gz]
 md5=a8d0676fbf9cd3b3514d76a39d4ecbe1
 sha256=9aebac55dfc92a3533678a873d0f3babee285061b0ad5b26a56b6e72fb306ed4
@@ -28630,6 +28818,14 @@ sha256=10b2f7ffbf309c12ec82b4bc28b35014cb223208d3003bab3765b70dea9d96bd
 md5=fbea3ef7eec87fd669958f9cf597bfb8
 sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0
 
+[http://mocha.xfce.org/archive/src/art/xfwm4-themes/4.6/xfwm4-themes-4.6.0.tar.bz2]
+md5=4dc5cb29cbd40e3b9dece12a85e20854
+sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
+
+[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfwm4-themes-4.6.0.tar.bz2]
+md5=4dc5cb29cbd40e3b9dece12a85e20854
+sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
+
 [http://xorg.freedesktop.org/releases/individual/app/xfwp-1.0.1.tar.bz2]
 md5=0dbde8b3867032b9e4a383d46dfd7e48
 sha256=cdd6ecb453c62086dd01808a26787641add419dd42469349f79d0adeb89a6d93
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"