Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

34 files changed, 321 insertions, 86 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 069dcebf3d..83530b5a5e 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -208,8 +208,12 @@ kernel_do_install() {
 kernel_do_configure() {
 	yes '' | oe_runmake oldconfig
 	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
-		cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" initramfs.cpio.gz
-	fi 
+		for img in cpio.gz cpio.lzo cpio.lzma; do
+		if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
+			cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img
+		fi
+		done
+	fi
 }
 
 do_menuconfig() {
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0a27d6896a..48f8ff3591 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3218,6 +3218,10 @@ sha256=bef741e8538f99baad6c32b4026cdecc636e8fa0c9f549542a4451e0987ceccf
 md5=92ea2e86a5489f0d16567920f2ec9b36
 sha256=24c8ce0626edb9ef8799a95ecfc252635842038242fba8fe90301f1e0eabfb8b
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.59.tar.gz]
+md5=1c7cee215bc84656b1edee019cee78f5
+sha256=c1f4496a1c23038fc7924d0b3eaf83c6dfb22611196e2d07d4a81efef8ca55e5
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -16438,6 +16442,14 @@ sha256=4d67aa8d2d3c719b67bde58ca3b8a94aa1d172bc242672401d7f3d22685065b9
 md5=58e5518a483fbef0b72f142e63f43e9f
 sha256=b39fd86e555cc530ec587db8860b084e95555e044c0cf8b213e636aff043e4f3
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.28/libsoup-2.28.2.tar.bz2]
+md5=31d7ad416005eed4b78f07ac01b6b9f0
+sha256=9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300
+
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.29/libsoup-2.29.3.tar.bz2]
+md5=f2b0f1bfd1657b74f6dfbec20bb94e08
+sha256=4b38450a74b569a63bd36a793de25dd84570e47948bf63889c4b808c9f18cf3e
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
@@ -18730,6 +18742,10 @@ sha256=97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
 md5=3cee94c9a22316504a3ba99bc92e0245
 sha256=7d79a45331cfcf002ccd5a386b5597f91e0ee048b2b040a57c6faebc02bba79c
 
+[http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.2.tar.bz2]
+md5=14f81a7a10f80a173da1b5e88713400b
+sha256=bec38745947b79a80352374937cecb81fd21d30c35f11b11290fabdad1e4cb07
+
 [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2]
 md5=d50f0a9683dee60685bcd48e04970949
 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee
@@ -19690,6 +19706,10 @@ sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
 md5=4e4582ed5f84fa074137c1a7ee39a689
 sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
 
+[http://linuxtogo.org/~koen/netbook-base-r3.patch]
+md5=b6e67a96e2f84bb70912da8c7e0d5ec1
+sha256=e836560ffae454d4ca0c4cacd1f2a3e8528c5744372a77968bba3b947328ca38
+
 [http://downloads.sourceforge.net/netcat/netcat-0.7.1.tar.bz2]
 md5=0a29eff1736ddb5effd0b1ec1f6fe0ef
 sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
@@ -21074,6 +21094,10 @@ sha256=457ec3ccb135b80ce3b5c79ad356b142080405f7bd510b52c349567fff82fa46
 md5=f9c9b0fe2ce0eef71c50ef45ddd0075d
 sha256=e4ac37531a455776ace04e234001c2849cbe2b1a3563409d23e4a6b3390c3e2d
 
+[http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2]
+md5=b8de4aa518292ad3aef913645898218a
+sha256=34beecc0dd156267e8004fb79efea9bf97e1157ed597bdde1841c16def2e9195
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2]
 md5=b8de4aa518292ad3aef913645898218a
 sha256=34beecc0dd156267e8004fb79efea9bf97e1157ed597bdde1841c16def2e9195
@@ -21150,6 +21174,10 @@ sha256=c2085fc8fc6df586ef8c19a4562b84162f0b77956d691aa4fbee5e90c9800cb7
 md5=736ea68a03158c24e55aa95e0ab15ceb
 sha256=4d2c13dee5ea7bd8b5cdbf63afa9383b45f6bad1f75b163c49e086a5030a04de
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.23/patch-2.6.23-rc3.bz2]
+md5=736ea68a03158c24e55aa95e0ab15ceb
+sha256=4d2c13dee5ea7bd8b5cdbf63afa9383b45f6bad1f75b163c49e086a5030a04de
+
 [http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.23/patch-2.6.23-rc5.bz2]
 md5=8253467313749aee6065093cd3c5fd9c
 sha256=c8c2068183aca79c46182f3d3fe6d7579cd60809681d42c52d71cf1873cd1a0e
@@ -21178,10 +21206,18 @@ sha256=2512a51923318bde6175e073b3eec0e58ae07123bcdc49afa11f286b0d4bd06d
 md5=ae984c2ba6bf54e3f7d139c197563792
 sha256=fc8edda5992a3d45bb0b2cfbad9c9a683f74be110f8d767745182c49a86072fd
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc5.bz2]
+md5=ae984c2ba6bf54e3f7d139c197563792
+sha256=fc8edda5992a3d45bb0b2cfbad9c9a683f74be110f8d767745182c49a86072fd
+
 [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc6.bz2]
 md5=d3f31d6564386938e18e8f74646de9da
 sha256=95880162dd0839d9b509152e34cf9356b051dff7daf2216ff50474efbe68f6c3
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.24/patch-2.6.24-rc6.bz2]
+md5=d3f31d6564386938e18e8f74646de9da
+sha256=95880162dd0839d9b509152e34cf9356b051dff7daf2216ff50474efbe68f6c3
+
 [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc8.bz2]
 md5=527687c63f4252989dba6fb92baf9707
 sha256=1daafd156f00c2b3b7981f197465d78e689fda506054d011ba0da6513319fe2c
@@ -21254,6 +21290,10 @@ sha256=0e5e633e81f1dcc0dcd2372494fbd2d6a72b28bb177a3285c4766a9659b454bd
 md5=a431f1f68badcfa5a6cecc6b4d52d319
 sha256=ed3ec802ccb3585bf0a57724471fa24b98cce5caef8f35d6c26fed7c9213168d
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.42.bz2]
+md5=79782ebd9672c39dd7303d7442756556
+sha256=ad9e0c07e709e9e9a60abe0b15a61482645f3aa64b30fa72c27f1bd13d7aa84d
+
 [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.8.bz2]
 md5=ec23e3dce22b23ca681199fe515f10fb
 sha256=31c35db09289c6e0436a258745d7180e0cd8f567949f27b3dab5a57a3664ed2f
@@ -21298,6 +21338,10 @@ sha256=25a9aff47cc568e4bcaa4377cacbcae11ea454aeeea9519aa3a1b6dbffea713c
 md5=2f399a5e286a9fe7cb40bfd3d42a7a3d
 sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.30/patch-2.6.30-rc5.bz2]
+md5=2f399a5e286a9fe7cb40bfd3d42a7a3d
+sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4
+
 [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.30.10.bz2]
 md5=6485fe0cf0f0220493647505bfd2f7b0
 sha256=a1ffb806d7d0083aa8d0525cbccede4172f4a44c8df1ddfeece629b6d8304201
@@ -21338,10 +21382,18 @@ sha256=f9edbb3c15c4094d840d5954131bb91c4513d333b30bced7b5c906d36c843d5e
 md5=0fda994c76a981a67464f43c766f2180
 sha256=c120bf7018749fca765773975b3d4444fa244781ceb844e4b9bab9b478cad213
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.9.bz2]
+md5=819f1552906be755b53154fd570866eb
+sha256=958c0dff262e4e434d4d51995ad2ae928c5c0bcdb6ea3f458e8323de5bff4da0
+
 [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.1.bz2]
 md5=abc24a9beb8431a75301dd3884b37a3c
 sha256=26f6fad3259ad6d2356cfa04462ace5fd3b5cecec410bbcefe7d5f6dbeb00baa
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.2.bz2]
+md5=924b7aa0fcd6e54c12ecc9b3c3082f59
+sha256=d207f4217c4b3fef9c5a19620b6ca90dbd9b9583ed9c686b5636eec973a7cc60
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -27198,6 +27250,10 @@ sha256=074b4576113e89213940e3ea3901dd035ab317255cd78c929aa52d89227f1f37
 md5=cdbed540daf7975b56000420c9aa5bf9
 sha256=bf49cd45ffb197a6992b3b7c99c94161eaf7cf6a2b661d3905ac382bedce34b8
 
+[http://xorg.freedesktop.org/releases/individual/app/viewres-1.0.2.tar.bz2]
+md5=f35c4ad7e1aa1ee2b25373dcdc34345b
+sha256=85c7207f89bfb13cc9f3c3c9d9a785094e7576e5e3e7ef0450544c4cd6bbbf3b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/viewres-X11R7.0-1.0.1.tar.bz2]
 md5=004bf8dd4646aca86faf5aa22b0c3f2f
 sha256=0ee43fd2dd9c8b60fad0e3d89bb04dcb8d7e398b33bbcc603a8e0900c3144a28
@@ -27902,6 +27958,10 @@ sha256=c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
 md5=404f5add4537d22dd109c33e518a5190
 sha256=9845b1fa8a1cfd408f01fd69b66808068e847cdc925d114c7723c17934a96503
 
+[http://xorg.freedesktop.org/releases/individual/app/xbiff-1.0.2.tar.bz2]
+md5=1d4ad06725f9dc4b877ecd210b7b1607
+sha256=7c21763a90599ad627739804ba76dd33516b76cce440294e1154bf680eca60f7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xbiff-X11R7.0-1.0.1.tar.bz2]
 md5=c4eb71a3187586d02365a67fc1445e54
 sha256=c9c899fddcb5053d6cf2a00a933b6e6b0429af547efbe85f89ad3bb35176bbec
@@ -27930,6 +27990,10 @@ sha256=17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248
 md5=d31a99795b9668f047aa11bf36df6df0
 sha256=96375e2d212e7249d14d0beac73c1a6d89252b5fcf571bd9f5c7303a14bb4a32
 
+[http://xorg.freedesktop.org/releases/individual/app/xcalc-1.0.3.tar.bz2]
+md5=0b981e360b54584fcb6dc2ec4658c406
+sha256=96c413998c664a8397313d749b20e18308bcd82187a89446a64b3557b089b42f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcalc-X11R7.0-1.0.1.tar.bz2]
 md5=c1ecea85be15f746a59931e288768bdb
 sha256=a1af9c7474307077e69cf86c185c77a3a1454ada64e3abf766fcdee6e92b4fd6
@@ -28306,6 +28370,10 @@ sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
 md5=ba1b886bd6104018fe78ab431d83ce4d
 sha256=594324114bb20a502102a9a584dfa5c63d85aa60b7975fd7587d82d42c8ef115
 
+[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.1.0.tar.bz2]
+md5=933f6d2b132d14f707f1f3c87b39ebe2
+sha256=996b9641fea06e2f0dde9cbf5fb31b5cd139376198057a88ca59820fdb94d507
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xeyes-X11R7.0-1.0.1.tar.bz2]
 md5=3ffafa7f222ea799bcd9fcd85c60ab98
 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
index c505032201..a8e0e49ce0 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
@@ -9,7 +9,7 @@ PREFERRED_VERSION_fonttosfnt ?= "1.0.4"
 PREFERRED_VERSION_fslsfonts ?= "1.0.2"
 PREFERRED_VERSION_fstobdf ?= "1.0.3"
 PREFERRED_VERSION_ico ?= "1.0.2"
-PREFERRED_VERSION_lbxproxy ?= "1.0.1"
+PREFERRED_VERSION_lbxproxy ?= "1.0.2"
 PREFERRED_VERSION_listres ?= "1.0.1"
 PREFERRED_VERSION_mkcfm ?= "1.0.1"
 PREFERRED_VERSION_mkcomposecache ?= "1.2.1"
@@ -32,7 +32,7 @@ PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
 PREFERRED_VERSION_xditview ?= "1.0.1"
 PREFERRED_VERSION_xdm ?= "1.1.9"
 PREFERRED_VERSION_xedit ?= "1.1.2"
-PREFERRED_VERSION_xeyes ?= "1.0.991"
+PREFERRED_VERSION_xeyes ?= "1.1.0"
 PREFERRED_VERSION_xf86dga ?= "1.0.2"
 PREFERRED_VERSION_xfd ?= "1.0.1"
 PREFERRED_VERSION_xfindproxy ?= "1.0.1"
@@ -105,7 +105,7 @@ PREFERRED_VERSION_libxp ?= "1.0.0"
 PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
 PREFERRED_VERSION_libxprintutil ?= "1.0.1"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.2"
-PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_liblbxutil ?= "1.1.0"
 PREFERRED_VERSION_liboldx ?= "1.0.1"
 PREFERRED_VERSION_libxkbui ?= "1.0.2"
 PREFERRED_VERSION_pixman ?= "0.16.2"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index 766afe486a..6e8c93a95a 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -77,7 +77,6 @@ PREFERRED_VERSION_xvinfo ?= "1.1.0"
 PREFERRED_VERSION_xwd ?= "1.0.3"
 PREFERRED_VERSION_xwininfo ?= "1.0.5"
 PREFERRED_VERSION_xwud ?= "1.0.2"
-#driver
 
 # data
 PREFERRED_VERSION_xbitmaps ?= "1.1.0"
@@ -91,7 +90,7 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3"
 PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.3.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.4.99.2"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0"
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 7da1c16a2a..bea2b4105c 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Wed Dec 16 09:33:47 CET 2009
+#Thu Dec 31 14:54:51 CET 2009
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -32,12 +32,12 @@ PREFERRED_VERSION_setxkbmap ?= "1.1.0"
 PREFERRED_VERSION_showfont ?= "1.0.2"
 PREFERRED_VERSION_smproxy ?= "1.0.3"
 PREFERRED_VERSION_twm ?= "1.0.4"
-PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_viewres ?= "1.0.2"
 PREFERRED_VERSION_x11perf ?= "1.5.1"
 PREFERRED_VERSION_xauth ?= "1.0.4"
 PREFERRED_VERSION_xbacklight ?= "1.1.1"
-PREFERRED_VERSION_xbiff ?= "1.0.1"
-PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xbiff ?= "1.0.2"
+PREFERRED_VERSION_xcalc ?= "1.0.3"
 PREFERRED_VERSION_xclipboard ?= "1.1.0"
 PREFERRED_VERSION_xclock ?= "1.0.4"
 PREFERRED_VERSION_xcmsdb ?= "1.0.2"
@@ -52,7 +52,7 @@ PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
 PREFERRED_VERSION_xdriinfo ?= "1.0.3"
 PREFERRED_VERSION_xedit ?= "1.1.2"
 PREFERRED_VERSION_xev ?= "1.0.4"
-PREFERRED_VERSION_xeyes ?= "1.0.991"
+PREFERRED_VERSION_xeyes ?= "1.1.0"
 PREFERRED_VERSION_xf86dga ?= "1.0.2"
 PREFERRED_VERSION_xfd ?= "1.0.1"
 PREFERRED_VERSION_xfindproxy ?= "1.0.1"
@@ -156,6 +156,7 @@ PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
 PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4"
 PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
 PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+#PREFERRED_VERSION_xf86-video-intel ?= "2.9.99.902"
 PREFERRED_VERSION_xf86-video-intel ?= "2.9.1"
 PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2"
 PREFERRED_VERSION_xf86-video-mga ?= "1.9.100"
@@ -189,6 +190,7 @@ PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
 PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1"
 PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
 PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+#PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9"
 PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3"
 PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
@@ -292,6 +294,7 @@ PREFERRED_VERSION_libpciaccess ?= "0.11.0"
 PREFERRED_VERSION_libxkbfile ?= "1.0.6"
 PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
 PREFERRED_VERSION_libxkbui ?= "1.0.2"
+#PREFERRED_VERSION_pixman ?= "0.17.2"
 PREFERRED_VERSION_pixman ?= "0.16.2"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
@@ -350,4 +353,5 @@ PREFERRED_VERSION_util-macros ?= "1.4.1"
 PREFERRED_VERSION_util-macros-native ?= "1.4.1"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
+#PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2"
 PREFERRED_VERSION_xserver-xorg ?= "1.7.3"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index c65d971144..12cea679a8 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -15,8 +15,9 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
 
 PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
-MACHINE_DRI_MODULES = "glamo"
+PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
+# Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6
+MACHINE_DRI_MODULES_shr = "glamo"
 
 XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
 
diff --git a/recipes/bluez/bluez4_4.59.bb b/recipes/bluez/bluez4_4.59.bb
new file mode 100644
index 0000000000..79e3005462
--- /dev/null
+++ b/recipes/bluez/bluez4_4.59.bb
@@ -0,0 +1,16 @@
+require bluez4.inc
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+DEFAULT_PREFERENCE_shr = "1"
+
+DEPENDS += "libsndfile1"
+
+PR = "${INC_PR}.0"
+
+# Not all distros have a recent enough udev
+BTUDEV = " --disable-udevrules"
+BTUDEV_angstrom = " --enable-udevrules"
+BTUDEV_shr = " --enable-udevrules"
+EXTRA_OECONF += "${BTUDEV}"
+
diff --git a/recipes/gcc/gcc-cross-initial_svn.bb b/recipes/gcc/gcc-cross-initial_svn.bb
index 0650a81ecf..8356dd1fac 100644
--- a/recipes/gcc/gcc-cross-initial_svn.bb
+++ b/recipes/gcc/gcc-cross-initial_svn.bb
@@ -1,7 +1,7 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native mpc-native"
+DEPENDS += "gmp-native mpfr-native libmpc-native"
 
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
diff --git a/recipes/gcc/gcc-cross-intermediate_svn.bb b/recipes/gcc/gcc-cross-intermediate_svn.bb
index 93cd35730b..b816c8b81c 100644
--- a/recipes/gcc/gcc-cross-intermediate_svn.bb
+++ b/recipes/gcc/gcc-cross-intermediate_svn.bb
@@ -1,7 +1,7 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "mpc-native gmp-native mpfr-native"
+DEPENDS += "libmpc-native gmp-native mpfr-native"
 
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb
index 752266be5f..48d8a0d1ed 100644
--- a/recipes/gcc/gcc-cross-sdk_svn.bb
+++ b/recipes/gcc/gcc-cross-sdk_svn.bb
@@ -7,7 +7,7 @@ require gcc-cross-sdk.inc
 require gcc-configure-sdk.inc
 require gcc-package-sdk.inc
 
-DEPENDS += "mpc-native gmp-native mpfr-native"
+DEPENDS += "libmpc-native gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb
index c8e75d1881..2d3c1368dc 100644
--- a/recipes/gcc/gcc-cross_svn.bb
+++ b/recipes/gcc/gcc-cross_svn.bb
@@ -4,7 +4,7 @@ require gcc-cross4.inc
 require gcc-configure-cross.inc
 require gcc-package-cross.inc
 
-DEPENDS += "mpc-native"
+DEPENDS += "libmpc-native"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc
index 0198a8ddd9..6134aa2eaf 100644
--- a/recipes/gcc/gcc-svn.inc
+++ b/recipes/gcc/gcc-svn.inc
@@ -1,15 +1,14 @@
 DEFAULT_PREFERENCE = "-999"
 ARM_INSTRUCTION_SET = "arm"
 
-SRCREV="155514"
+SRCREV = "155514"
 
 require gcc-common.inc
 
-DEPENDS = "mpfr gmp mpc"
+DEPENDS = "mpfr gmp libmpc"
 
-GCC_BASE ?= "4.5"
-PV = "${GCC_BASE}+svnr${SRCREV}"
-PR = "r0"
+BINV = "4.5.0"
+PV = "4.5+svnr${SRCPV}"
 
 FILESPATHPKG .= ":gcc-svn"
 
diff --git a/recipes/gcc/gcc-svn/fortran-cross-compile-hack.patch b/recipes/gcc/gcc-svn/fortran-cross-compile-hack.patch
new file mode 100644
index 0000000000..348c77006f
--- /dev/null
+++ b/recipes/gcc/gcc-svn/fortran-cross-compile-hack.patch
@@ -0,0 +1,30 @@
+* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
+  used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
+  directory.
+
+Index: gcc-4.5+svnr155514/libgfortran/configure
+===================================================================
+--- gcc-4.5+svnr155514.orig/libgfortran/configure	2009-12-29 22:02:01.000000000 -0800
++++ gcc-4.5+svnr155514/libgfortran/configure	2009-12-30 08:12:40.889091657 -0800
+@@ -11655,7 +11655,7 @@ CC="$lt_save_CC"
+ 
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ ac_ext=${ac_fc_srcext-f}
+ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+Index: gcc-4.5+svnr155514/libgfortran/configure.ac
+===================================================================
+--- gcc-4.5+svnr155514.orig/libgfortran/configure.ac	2009-12-29 22:02:01.000000000 -0800
++++ gcc-4.5+svnr155514/libgfortran/configure.ac	2009-12-30 08:12:13.453094218 -0800
+@@ -187,7 +187,7 @@ AC_SUBST(enable_static)
+ 
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ AC_PROG_FC(gfortran)
+ 
+ # extra LD Flags which are required for targets
diff --git a/recipes/gnome/libsoup-2.4_2.28.2.bb b/recipes/gnome/libsoup-2.4_2.28.2.bb
new file mode 100644
index 0000000000..a13106e0b5
--- /dev/null
+++ b/recipes/gnome/libsoup-2.4_2.28.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+LICENSE = "GPL"
+DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring"
+
+inherit gnome
+
+SRC_URI = "${GNOME_MIRROR}/libsoup/${@gnome_verdir("${PV}")}/libsoup-${PV}.tar.bz2"
+S = "${WORKDIR}/libsoup-${PV}"
+
+PACKAGES =+ "libsoup-gnome"
+FILES_libsoup-gnome = "${libdir}/libsoup-gnome*.so.*"
+FILES_${PN} = "${libdir}/libsoup-2*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
diff --git a/recipes/gnome/libsoup-2.4_2.29.3.bb b/recipes/gnome/libsoup-2.4_2.29.3.bb
new file mode 100644
index 0000000000..a13106e0b5
--- /dev/null
+++ b/recipes/gnome/libsoup-2.4_2.29.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+LICENSE = "GPL"
+DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring"
+
+inherit gnome
+
+SRC_URI = "${GNOME_MIRROR}/libsoup/${@gnome_verdir("${PV}")}/libsoup-${PV}.tar.bz2"
+S = "${WORKDIR}/libsoup-${PV}"
+
+PACKAGES =+ "libsoup-gnome"
+FILES_libsoup-gnome = "${libdir}/libsoup-gnome*.so.*"
+FILES_${PN} = "${libdir}/libsoup-2*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
diff --git a/recipes/gtk-webcore/midori_0.2.2.bb b/recipes/gtk-webcore/midori_0.2.2.bb
new file mode 100644
index 0000000000..d17e234e51
--- /dev/null
+++ b/recipes/gtk-webcore/midori_0.2.2.bb
@@ -0,0 +1,37 @@
+require midori.inc
+
+DEPENDS += "python-native python-docutils-native"
+
+SRC_URI = "http://archive.xfce.org/src/apps/midori/0.2/midori-${PV}.tar.bz2 \
+           file://waf"
+
+SRC_URI_append_shr = " file://config \
+                     "
+
+do_configure() {
+	cp -f ${WORKDIR}/waf ${S}/
+	sed -i -e 's:, shell=False::g' wscript 
+	./configure \
+            --prefix=${prefix} \
+            --bindir=${bindir} \
+            --sbindir=${sbindir} \
+            --libexecdir=${libexecdir} \
+            --datadir=${datadir} \
+            --sysconfdir=${sysconfdir} \
+            --sharedstatedir=${sharedstatedir} \
+            --localstatedir=${localstatedir} \
+            --libdir=${libdir} \
+            --includedir=${includedir} \
+            --infodir=${infodir} \
+            --mandir=${mandir} \
+            ${EXTRA_OECONF} 
+ 
+	sed -i /LINK_CC/d ./_build_/c4che/default.cache.py 
+	echo "LINK_CC = '${CXX}'" >>  ./_build_/c4che/default.cache.py
+}
+
+do_install_append_shr() {
+	install -d ${D}${sysconfdir}/xdg/midori
+	install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/xdg/midori
+}
+
diff --git a/recipes/iptables/iptables.inc b/recipes/iptables/iptables.inc
index fd16f97b0a..698c25975c 100644
--- a/recipes/iptables/iptables.inc
+++ b/recipes/iptables/iptables.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
 S = "${WORKDIR}/iptables-${PV}"
 
-INC_PR = "r5"
+INC_PR = "r6"
 
 PARALLEL_MAKE = ""
 
@@ -26,7 +26,7 @@ inherit autotools
 PACKAGES =+ "${PN}-utils"
 FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
 FILES_${PN}-doc += "${mandir}"
-FILES_${PN}-dbg += "${libexecdir}/xtables"
+FILES_${PN}-dbg += "${libexecdir}/xtables/.debug/*"
 
 RRECOMMENDS = "\
   kernel-module-ip-tables \
diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc
index 4b2bb1d00a..0d5f2bb2ac 100644
--- a/recipes/kexecboot/linux-kexecboot.inc
+++ b/recipes/kexecboot/linux-kexecboot.inc
@@ -1,5 +1,5 @@
 # We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels:
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "file://defconfig"
 
@@ -31,12 +31,18 @@ TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
 KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE}"
 KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}"
 
+#
+# default lzma compressor for kernels >= 2.6.30
+INITRAMFS_COMPRESSION = '${@base_version_less_or_equal("PV", "2.6.30", "", "CONFIG_INITRAMFS_COMPRESSION_LZMA=y", d)}'
+INITRAMFS_COMPRESSION_SUFFIX = '${@base_version_less_or_equal("PV", "2.6.30", "gz", "lzma", d)}'
+
 do_configure[depends] += "${INITRAMFS_IMAGE}:do_rootfs"
 
 do_configure_append() {
 sed -i -e /CONFIG_BLK_DEV_INITRD/d \
        -e /CONFIG_KEXEC/d \
        -e /CONFIG_INITRAMFS_SOURCE/d \
+       -e /CONFIG_INITRAMFS_COMPRESSION/d \
        -e /=m/d \
        -e /CONFIG_MODULES/d \
        -e /CONFIG_DEBUG_ERRORS/d \
@@ -50,7 +56,8 @@ sed -i -e /CONFIG_CMDLINE/s/debug/loglevel=3/1 ${S}/.config
 
 echo 'CONFIG_BLK_DEV_INITRD=y
 CONFIG_KEXEC=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz"
+${INITRAMFS_COMPRESSION}
+CONFIG_INITRAMFS_SOURCE="initramfs.cpio.${INITRAMFS_COMPRESSION_SUFFIX}"
 CONFIG_MODULES=n' >> ${S}/.config
 
         yes '' | oe_runmake oldconfig
diff --git a/recipes/mpc/mpc-native_0.8.1.bb b/recipes/libmpc/libmpc-native_0.8.1.bb
index 8dba0b7fc4..a0837a6fbc 100644
--- a/recipes/mpc/mpc-native_0.8.1.bb
+++ b/recipes/libmpc/libmpc-native_0.8.1.bb
@@ -1,3 +1,3 @@
-require mpc_${PV}.bb
+require libmpc_${PV}.bb
 inherit native
 DEPENDS = "mpfr-native gmp-native"
diff --git a/recipes/mpc/mpc.inc b/recipes/libmpc/libmpc.inc
index 6e18e588be..6e18e588be 100644
--- a/recipes/mpc/mpc.inc
+++ b/recipes/libmpc/libmpc.inc
diff --git a/recipes/mpc/mpc_0.8.1.bb b/recipes/libmpc/libmpc_0.8.1.bb
index b62c08673e..670db173f4 100644
--- a/recipes/mpc/mpc_0.8.1.bb
+++ b/recipes/libmpc/libmpc_0.8.1.bb
@@ -1,4 +1,4 @@
-require mpc.inc
+require libmpc.inc
 
 DEPENDS = "gmp mpfr"
 
diff --git a/recipes/linux/linux-2.6.31/qemux86/defconfig b/recipes/linux/linux-2.6.31/qemux86/defconfig
index 3137af0c5e..395258c430 100644
--- a/recipes/linux/linux-2.6.31/qemux86/defconfig
+++ b/recipes/linux/linux-2.6.31/qemux86/defconfig
@@ -1149,7 +1149,7 @@ CONFIG_E100=m
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=y
-# CONFIG_8139CP is not set
+CONFIG_8139CP=y
 CONFIG_8139TOO=y
 CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_TUNE_TWISTER is not set
diff --git a/recipes/linux/linux_2.6.27.bb b/recipes/linux/linux_2.6.27.bb
index 9e8d6a32e0..02f32dc46c 100644
--- a/recipes/linux/linux_2.6.27.bb
+++ b/recipes/linux/linux_2.6.27.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r11"
+PR = "r12"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_progear = "1"
 DEFAULT_PREFERENCE_simpad = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.41.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.42.bz2;patch=1 \
            file://defconfig "
 
 SRC_URI_append_boc01 = "\
diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb
index dcce779ebd..f5dd79b6c9 100644
--- a/recipes/linux/linux_2.6.31.bb
+++ b/recipes/linux/linux_2.6.31.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r8"
+PR = "r9"
 
 S = "${WORKDIR}/linux-${PV}"
 
@@ -16,7 +16,7 @@ DEFAULT_PREFERENCE_ben-nanonote = "1"
 
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.8.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.9.bz2;patch=1 \
            file://defconfig"
 
 SRC_URI += "file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch;patch=1 \
diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb
index be3d8ad7c6..a7861af17c 100644
--- a/recipes/linux/linux_2.6.32.bb
+++ b/recipes/linux/linux_2.6.32.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/linux-${PV}"
 
@@ -15,7 +15,7 @@ DEFAULT_PREFERENCE_spitz = "-1"
 DEFAULT_PREFERENCE_tosa = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.2.bz2;patch=1 \
            file://defconfig"
 
 SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879"
diff --git a/recipes/openmoko-3rdparty/neomis_svn.bb b/recipes/openmoko-3rdparty/neomis_svn.bb
index 2b6075b787..1ea20a2d58 100644
--- a/recipes/openmoko-3rdparty/neomis_svn.bb
+++ b/recipes/openmoko-3rdparty/neomis_svn.bb
@@ -7,6 +7,7 @@ PRIORITY = "optional"
 DEPENDS = "python-native"
 
 PV = "1.1.0+svnr${SRCPV}"
+PR = "r1"
 
 S = "${WORKDIR}/trunk"
 
@@ -16,6 +17,10 @@ SRC_URI = "svn://neomis.googlecode.com/svn;module=trunk;proto=http"
 
 inherit distutils
 
+do_configure_prepend_shr() {
+	sed -e 's,^Exec=,Exec=/usr/bin/fsoraw -r Display ,g' -i ${S}/data/neomis.desktop
+}
+
 FILES_${PN} += "${datadir}/neomis ${datadir}/applications/neomis.desktop ${datadir}/pixmaps"
 
 RDEPENDS += "python-audio python-pyalsaaudio python-elementary" 
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am
index 89260ad3a9..3a0e398aa4 100644
--- a/recipes/webkit/webkit-gtk/GNUmakefile.am
+++ b/recipes/webkit/webkit-gtk/GNUmakefile.am
@@ -29,6 +29,10 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-introspection	\
+	--enable-gtk-doc
+
 # Directory for autogenerated sources
 GENSOURCES := $(top_builddir)/DerivedSources
 GENPROGRAMS := $(top_builddir)/Programs
@@ -74,6 +78,11 @@ global_cflags :=
 global_cxxflags :=
 corekit_cflags :=
 corekit_cppflags :=
+JSCORE_GIRSOURCES :=
+WEBKIT_GIRSOURCES :=
+typelibsdir :=
+typelibs_DATA :=
+EXTRA_DIST :=
 BUILT_SOURCES :=
 CLEANFILES :=
 DISTCLEANFILES :=
@@ -152,6 +161,7 @@ javascriptcore_cppflags += \
 	-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
 	-I$(srcdir)/JavaScriptCore/parser \
 	-I$(srcdir)/JavaScriptCore/wtf \
+	-I$(srcdir)/JavaScriptCore/wtf/gtk \
 	-I$(top_builddir)/DerivedSources
 
 nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
@@ -413,29 +423,16 @@ webkitgtk_cleanfiles += \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
 
-# Files that will be distributed
-EXTRA_DIST = \
-	$(srcdir)/gtk-doc.make \
-	WebKit/LICENSE \
-	$(javascriptcore_dist) \
-	$(webcore_dist) \
-	$(srcdir)/autotools/symbols.filter \
-	$(srcdir)/WebKit/gtk/ChangeLog \
-	$(srcdir)/WebKit/gtk/NEWS \
-	$(srcdir)/WebKit/gtk/webkitmarshal.list \
-	$(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
-	$(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
-	$(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
-	$(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
-	$(srcdir)/WebKit/gtk/docs/version.xml.in \
-	$(srcdir)/WebKit/gtk/po/* \
-	$(srcdir)/WebKit/gtk/resources/*
-
 if ENABLE_INTROSPECTION
-JSCORE_GIRSOURCES = $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten
-WEBKIT_GIRSOURCES = WebKit-1.0.gir
+JSCORE_GIRSOURCES += JSCore-1.0.gir
+WEBKIT_GIRSOURCES += WebKit-1.0.gir
+
+# JSCore-1.0.gir is handwritten - this is a hack to make the typelib
+# generation work during make dist
+JSCore-1.0.gir: $(srcdir)/WebKit/gtk/JSCore-1.0.gir
+	cp $(srcdir)/WebKit/gtk/JSCore-1.0.gir $(builddir)/
 
-$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
+$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la
 	$(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
 	     --include=GObject-2.0 \
 	     --include=Gtk-2.0 \
@@ -446,6 +443,7 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
 	     --pkg gobject-2.0 \
 	     --pkg gtk+-2.0 \
 	     --output $@ \
+	     --add-include-path $(top_srcdir)/WebKit/gtk \
 	     -I$(top_srcdir)/WebKit/gtk \
 	     -I$(top_builddir)/WebKit/gtk \
 	     -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
@@ -455,14 +453,14 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
 girdir = $(GIRDIR)
 gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
 
-typelibsdir = $(GIRTYPELIBDIR)
-typelibs_DATA = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
+typelibsdir += $(GIRTYPELIBDIR)
+typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(G_IR_COMPILER)
-	$(AM_V_GEN)$(G_IR_COMPILER) $< -o $@
+	$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk $< -o $@
 
 EXTRA_DIST += $(JSCORE_GIRSOURCES)
-CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
+CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
 
 endif
 
@@ -528,6 +526,24 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
 	&& cp xgen-gtc $@ \
 	&& rm -f xgen-gtc
 
+# Files that will be distributed
+EXTRA_DIST += \
+	$(srcdir)/gtk-doc.make \
+	WebKit/LICENSE \
+	$(javascriptcore_dist) \
+	$(webcore_dist) \
+	$(srcdir)/autotools/symbols.filter \
+	$(srcdir)/WebKit/gtk/ChangeLog \
+	$(srcdir)/WebKit/gtk/NEWS \
+	$(srcdir)/WebKit/gtk/webkitmarshal.list \
+	$(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
+	$(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
+	$(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
+	$(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
+	$(srcdir)/WebKit/gtk/docs/version.xml.in \
+	$(srcdir)/WebKit/gtk/po/* \
+	$(srcdir)/WebKit/gtk/resources/*
+
 # extra resource files
 resourcesdir = ${datadir}/webkit-1.0/resources
 dist_resources_DATA = \
@@ -566,6 +582,7 @@ webkit_tests_ldflags = \
 
 TEST_PROGS += Programs/unittests/testhttpbackend \
 	Programs/unittests/testloading \
+	Programs/unittests/testmimehandling \
 	Programs/unittests/testnetworkrequest \
 	Programs/unittests/testnetworkresponse \
 	Programs/unittests/testwebframe \
@@ -578,6 +595,7 @@ TEST_PROGS += Programs/unittests/testhttpbackend \
 	Programs/unittests/testwebsettings \
 	Programs/unittests/testwebresource \
 	Programs/unittests/testwebdatasource \
+	Programs/unittests/testwebview \
 	Programs/unittests/testkeyevents
 
 # Add additional tests here
@@ -591,6 +609,11 @@ Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
 
+Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c
+Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
+
 Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
 Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
@@ -644,6 +667,11 @@ Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasourc
 Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
 
+Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c
+Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
+
 Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c
 Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac
index b4230fb7fa..d2877c0834 100644
--- a/recipes/webkit/webkit-gtk/configure.ac
+++ b/recipes/webkit/webkit-gtk/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 
 m4_define([webkit_major_version], [1])
 m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [16])
+m4_define([webkit_micro_version], [18])
 
 # This is the version we'll be using as part of our User-Agent string
 # e.g., AppleWebKit/$(webkit_user_agent_version) ...
@@ -35,7 +35,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h])
 
 dnl # Libtool library version, not to confuse with API version
 dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
-LIBWEBKITGTK_VERSION=14:0:12
+LIBWEBKITGTK_VERSION=15:0:13
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@ -191,7 +191,7 @@ fi
 
 # minimum base dependencies
 LIBSOUP_REQUIRED_VERSION=2.27.91
-CAIRO_REQUIRED_VERSION=1.2
+CAIRO_REQUIRED_VERSION=1.6
 FONTCONFIG_REQUIRED_VERSION=2.4
 FREETYPE2_REQUIRED_VERSION=9.0
 LIBXML_REQUIRED_VERSION=2.6
@@ -371,14 +371,6 @@ AC_ARG_ENABLE(datalist,
               [],[enable_datalist="yes"])
 AC_MSG_RESULT([$enable_datalist])
 
-# check whether to enable HTML5 ruby support
-AC_MSG_CHECKING([whether to enable HTML5 ruby support])
-AC_ARG_ENABLE(ruby,
-              AC_HELP_STRING([--enable-ruby],
-                             [enable HTML5 ruby support [default=yes]]),
-              [],[enable_ruby="yes"])
-AC_MSG_RESULT([$enable_ruby])
-
 # check whether to enable HTML5 audio/video support
 AC_MSG_CHECKING([whether to enable HTML5 video support])
 AC_ARG_ENABLE(video,
@@ -472,8 +464,8 @@ AC_MSG_RESULT([$enable_svg_animation])
 AC_MSG_CHECKING([whether to enable support for filters])
 AC_ARG_ENABLE(filters,
               AC_HELP_STRING([--enable-filters],
-                             [enable support for filters (experimental) [default=no]]),
-              [],[enable_filters="no"])
+                             [enable support for filters (experimental) [default=yes]]),
+              [],[enable_filters="yes"])
 AC_MSG_RESULT([$enable_filters])
 
 # check whether to enable support for SVG fonts
@@ -596,8 +588,8 @@ if test "$enable_introspection" = "yes"; then
   G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
   G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)"
   G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)"
-  GIRDIR="$($PKG_CONFIG --variable=girdir gobject-introspection-1.0)"
-  GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+  GIRDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=girdir gobject-introspection-1.0)"
+  GIRTYPELIBDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=typelibdir gobject-introspection-1.0)"
 
   AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support])
 fi
@@ -643,6 +635,15 @@ PKG_CHECK_MODULES([LIBSOUP],
 AC_SUBST([LIBSOUP_CFLAGS])
 AC_SUBST([LIBSOUP_LIBS])
 
+# check if we can use libSoup 2.29.3 features
+PKG_CHECK_MODULES([LIBSOUP_2_29_3],
+                  [libsoup-2.4 >= 2.29.3],
+                  [have_libsoup_2_29_3=yes],
+                  [have_libsoup_2_29_3=no])
+if test "$have_libsoup_2_29_3" = "yes"; then
+   AC_DEFINE([HAVE_LIBSOUP_2_29_3], 1, [Whether libSoup 2.29.3 features are available])
+fi
+
 # check if FreeType/FontConfig are available
 if test "$with_font_backend" = "freetype"; then
    if test "$with_target" = "directfb"; then
@@ -756,7 +757,6 @@ AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
 AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
 AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
 AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
-AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
 AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
 AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
 AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
@@ -812,7 +812,6 @@ Features:
  HTML5 channel messaging support                          : $enable_channel_messaging
  HTML5 client-side session and persistent storage support : $enable_dom_storage
  HTML5 client-side database storage support               : $enable_database
- HTML5 ruby support                                       : $enable_ruby
  HTML5 server-sent events support                         : $enable_eventsource
  HTML5 video element support                              : $enable_video
  Icon database support                                    : $enable_icon_database
diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb
index 96f47f1663..a2d3be83b1 100644
--- a/recipes/webkit/webkit-gtk_svn.bb
+++ b/recipes/webkit/webkit-gtk_svn.bb
@@ -3,8 +3,8 @@ DEPENDS = "enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl icu lib
 
 SRCREV_FORMAT = "webcore-rwebkit"
 
-SRCREV = "50081"
-PV = "1.1.16+svnr${SRCPV}"
+SRCREV = "52207"
+PV = "1.1.18+svnr${SRCPV}"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -32,9 +32,7 @@ EXTRA_OECONF = "\
                 --enable-debug=no \
                 --enable-svg \
                 --enable-icon-database=yes \
-                --with-http-backend=soup \
 #                --with-unicode-backend=glib \
-                --with-libsoup-gnome=yes \
 "
 
 EXTRA_AUTORECONF = " -I autotools "
diff --git a/recipes/xorg-app/viewres_1.0.2.bb b/recipes/xorg-app/viewres_1.0.2.bb
new file mode 100644
index 0000000000..f884467096
--- /dev/null
+++ b/recipes/xorg-app/viewres_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxt"
+
diff --git a/recipes/xorg-app/xbiff_1.0.2.bb b/recipes/xorg-app/xbiff_1.0.2.bb
new file mode 100644
index 0000000000..e3264d7684
--- /dev/null
+++ b/recipes/xorg-app/xbiff_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxaw xbitmaps libxext"
+
diff --git a/recipes/xorg-app/xcalc_1.0.3.bb b/recipes/xorg-app/xcalc_1.0.3.bb
new file mode 100644
index 0000000000..54b7549f5c
--- /dev/null
+++ b/recipes/xorg-app/xcalc_1.0.3.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "scientific calculator for X"
+DEPENDS += " libxaw libxt"
+PE = "1"
diff --git a/recipes/xorg-app/xeyes_1.0.991.bb b/recipes/xorg-app/xeyes_1.1.0.bb
index 07ce0724fa..07ce0724fa 100644
--- a/recipes/xorg-app/xeyes_1.0.991.bb
+++ b/recipes/xorg-app/xeyes_1.1.0.bb
diff --git a/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb b/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb
deleted file mode 100644
index a53297fd8a..0000000000
--- a/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-driver-input.inc
-
-DESCRIPTION = "X.Org X server -- joystick input driver"
-PE = "1"