merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'

     and '86618f966282489d43b51fbf0ee93b954ac615ae'

142 files changed, 2583 insertions, 1071 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e5a9cf1a98..fd26450557 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -273,8 +273,8 @@ Distros:    chinook-compat
 Recipes:    jikes-native, jikes-initial, ecj-initial, ecj-bootstrap-native
 Recipes:    classpath*, cacao*, jamvm*
 Recipes:    swt-gtk, rxtx, dbus-java, libmatthew, kxml2, xmlpull
+Recipes:    woodstox2
 Recipes:    midpath*, logic-analyze
 Recipes:    kobodeluxe
 Recipes:    hildon-thumbnail, libhildon*, libosso*, mce-dev, libconic
 Recipes:    libgpsbt, libgpsmgr, osso-gnome-vfs2, osso-gwconnect, osso-ic-oss
-
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 991e472b14..4f3e0b1c4d 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -17,6 +17,7 @@ def autotools_dep_prepend(d):
 		deps += 'libtool-native '
 		if not bb.data.inherits_class('native', d) \
                         and not bb.data.inherits_class('cross', d) \
+                        and not bb.data.inherits_class('sdk', d) \
                         and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1):
                     deps += 'libtool-cross '
 
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 7609c05851..615d02d07e 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1,4 +1,4 @@
-BB_DEFAULT_TASK = "build"
+BB_DEFAULT_TASK ?= "build"
 
 # like os.path.join but doesn't treat absolute RHS specially
 def base_path_join(a, *p):
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 8f2b6f3fec..63e9741397 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -1,5 +1,3 @@
-inherit base
-
 # Native packages are built indirectly via dependency,
 # no need for them to be a direct target of 'world'
 EXCLUDE_FROM_WORLD = "1"
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 29ce72d65c..b564136e3f 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -20,6 +20,9 @@ python () {
         bb.data.setVar("PSTAGING_DISABLED", "1", d)
 }
 
+# multimachine.bbclass will override this
+MULTIMACH_ARCH ?= "${PACKAGE_ARCH}"
+
 export PSTAGING_DISABLED = "0"
 
 DEPLOY_DIR_PSTAGE 	= "${DEPLOY_DIR}/pstage" 
@@ -225,5 +228,5 @@ python do_package_stage () {
     bb.utils.unlockfile(lf)
 }
 
-addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build
+addtask package_stage after do_package_write do_populate_staging before do_build
 
diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass
index 71c65a1629..cbc1742dab 100644
--- a/classes/sdk.bbclass
+++ b/classes/sdk.bbclass
@@ -6,16 +6,15 @@ OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
 PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
 
 HOST_ARCH = "${BUILD_ARCH}"
-# This isn't BUILD_VENDOR since we don't want to clash with native staging
-HOST_VENDOR = "${TARGET_VENDOR}"
+HOST_VENDOR = "${BUILD_VENDOR}"
 HOST_OS = "${BUILD_OS}"
 HOST_PREFIX = "${BUILD_PREFIX}"
 HOST_CC_ARCH = "${BUILD_CC_ARCH}"
 
-CPPFLAGS = "${BUILDSDK_CPPFLAGS}"
-CFLAGS = "${BUILDSDK_CFLAGS}"
-CXXFLAGS = "${BUILDSDK_CFLAGS}"
-LDFLAGS = "${BUILDSDK_LDFLAGS}"
+CPPFLAGS = "${BUILD_CPPFLAGS}"
+CFLAGS = "${BUILD_CFLAGS}"
+CXXFLAGS = "${BUILD_CFLAGS}"
+LDFLAGS = "${BUILD_LDFLAGS}"
 
 # Path prefixes
 prefix = "${SDK_PREFIX}"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 4fe5c21e02..c86cda5040 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -354,12 +354,10 @@ PATCHRESOLVE = 'noop'
 ##################################################################
 
 export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
-BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
 export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
-BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
 export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
 
@@ -371,10 +369,6 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
 
-BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
-                    -Wl,-rpath-link,${STAGING_LIBDIR} \
-                    -Wl,-rpath,${libdir} -Wl,-O1"
-
 export LDFLAGS = "${TARGET_LDFLAGS}"
 export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
                          -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index c439ad67f6..e89d2185a7 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -59,9 +59,9 @@ PREFERRED_VERSION_automake-native = "1.9.6"
 PREFERRED_VERSION_binutils = "2.17.50.0.12"
 PREFERRED_VERSION_binutils-cross    = "2.18"
 
-PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3"
-PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
 
 # Use recent enough version of the headers to let HAL build successfully.
 PREFERRED_VERSION_linux-libc-headers = "2.6.20"
@@ -145,8 +145,8 @@ PREFERRED_PROVIDER_avahi		  = "avahi"
 PREFERRED_VERSION_libsoup = "2.2.7"
 PREFERRED_VERSION_libglade = "2.4.2"
 PREFERRED_VERSION_gnutls = "1.4.5"
-PREFERRED_VERSION_libgpg-error = "1.0"
-PREFERRED_VERSION_libgcrypt = "1.2.3"
+PREFERRED_VERSION_libgpg-error = "1.4"
+PREFERRED_VERSION_libgcrypt = "1.4.0"
 
 PREFERRED_VERSION_gpe-scap = "1.3"
 
@@ -164,12 +164,15 @@ PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
 
 PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
 
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_VERSION_classpath = "0.97"
+
 PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
 PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
 
 # Does not compile with the CodeSourcery compiler .. :(
-PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
-PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
+#PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
+#PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
 
 # WARNING: If you change these values after the respective package has
 # been built the change will have no effect. Edit the package's file in 
diff --git a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
index ef97eae09a..700af88653 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
@@ -1111,8 +1111,8 @@ PREFERRED_VERSION_libxres ?= "1.0.3"
 PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
 PREFERRED_VERSION_libxsettings ?= "0.11"
 PREFERRED_VERSION_libxsettings-client ?= "0.17"
-PREFERRED_VERSION_libxslt ?= "1.1.21"
-PREFERRED_VERSION_libxslt-native ?= "1.1.21"
+PREFERRED_VERSION_libxslt ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.22"
 PREFERRED_VERSION_libxt ?= "1.0.5"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxtst ?= "1.0.3"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index b8685a578e..2c9543abd9 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,8 +1,8 @@
-PREFERRED_VERSION_dbus = "1.1.4"
 PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_glib-2.0 = "2.15.6"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_libtool = "1.5.10"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"
-
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index d14c6f1b19..f606395f09 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -14,10 +14,15 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm'
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
+FULL_OPTIMIZATION_pn-glibc-intermediate = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
+
 BUILD_OPTIMIZATION = "-Os"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
+BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2"
+BUILD_OPTIMIZATION_pn-glibc = "-O2"
 BUILD_OPTIMIZATION_sparc = "-O2"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 39550c221e..b0c41bedbf 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -24,16 +24,16 @@ SRCREV_pn-eglibc-initial ?= "4355"
 SRCREV_pn-eglibc-intermediate ?= "4355"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
-SRCREV_pn-epiphany ?= "7650"
+SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-ffmpeg ?= "12186"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "85"
+SRCREV_pn-gsm0710muxd ?= "90"
 SRCREV_pn-gtkhtml2 ?= "1158"
-SRCREV_pn-gypsy ?= "56"
+SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
@@ -61,6 +61,7 @@ SRCREV_pn-matchbox-desktop-2 ?= "1778"
 SRCREV_pn-matchbox-keyboard ?= "1739"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
+SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-moko-gtk-engine ?= "3405"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "24587"
@@ -97,7 +98,7 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3583"
+SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-messages2 ?= "3712"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
@@ -136,6 +137,7 @@ SRCREV_pn-opkg ?= "4142"
 SRCREV_pn-opkg-native ?= "4142"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
+SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "88"
 SRCREV_pn-pyneog ?= "88"
 SRCREV_pn-python-formencode = "3148"
@@ -149,9 +151,9 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "4138"
 SRCREV_pn-usbpath ?= "3108"
 SRCREV_pn-usbpath-native ?= "3108"
-SRCREV_pn-webkit-gtk ?= "28656"
+SRCREV_pn-webkit-gtk ?= "30762"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
-SRCREV_pn-xoo ?= "1623"
+SRCREV_pn-xoo ?= "1971"
 
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 463c5d0442..245bf77d6d 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -36,6 +36,8 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" 
 PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libiconv = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libintl = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
 PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
diff --git a/conf/machine/gumstix-custom-connex.conf b/conf/machine/gumstix-custom-connex.conf
index 1b854582f8..65cbacad41 100644
--- a/conf/machine/gumstix-custom-connex.conf
+++ b/conf/machine/gumstix-custom-connex.conf
@@ -33,8 +33,11 @@ MACHINE_FEATURES  += "sound"
 # if you enable robostix you will need to disable both "lcd" and "touchscreen" features
 #MACHINE_FEATURES  += "robostix"
 
-#MACHINE_FEATURES  += "lcd"
-#MACHINE_FEATURES  += "touchscreen"
+MACHINE_FEATURES  += "lcd"
+MACHINE_FEATURES  += "rgb16"
+#MACHINE_FEATURES  += "rgb18"
+
+MACHINE_FEATURES  += "touchscreen"
 #MACHINE_FEATURES  += "keyboard"
 
 MACHINE_FEATURES  += "pcmcia"
@@ -44,7 +47,11 @@ MACHINE_FEATURES  += "wifi"
 MACHINE_FEATURES  += "ethernet"
 
 MACHINE_FEATURES  += "fat"
-#MACHINE_FEATURES  += "ext2"
+MACHINE_FEATURES  += "ext2"
+
+# enable one of the following if you want to target build for uimage/rootfs on mmc/microSD or CF
+#MACHINE_FEATURES  += "mmcroot"
+#MACHINE_FEATURES  += "cfroot"
 
 #
 # note:  selection of MACHINE_FEATURES above will automatically include necessary kernel modules
@@ -70,6 +77,7 @@ module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget
 module_autoload_g_ether        = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_ether', '',d)}
 #module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
 
+module_autoload_tsc2003        = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)}
 module_autoload_ucb1400-ts     = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)}
 module_autoload_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
 
diff --git a/conf/machine/gumstix-custom-verdex.conf b/conf/machine/gumstix-custom-verdex.conf
index f2488d66e1..5e9360d9b0 100644
--- a/conf/machine/gumstix-custom-verdex.conf
+++ b/conf/machine/gumstix-custom-verdex.conf
@@ -35,6 +35,9 @@ MACHINE_FEATURES  += "sound"
 #MACHINE_FEATURES  += "robostix"
 
 MACHINE_FEATURES  += "lcd"
+#MACHINE_FEATURES  += "rgb16"
+MACHINE_FEATURES  += "rgb18"
+
 MACHINE_FEATURES  += "touchscreen"
 MACHINE_FEATURES  += "keyboard"
 
@@ -47,6 +50,10 @@ MACHINE_FEATURES  += "ethernet"
 MACHINE_FEATURES  += "ext2"
 MACHINE_FEATURES  += "fat"
 
+# enable one of the following if you want to target build for uimage/rootfs on mmc/microSD or CF
+#MACHINE_FEATURES  += "mmcroot"
+#MACHINE_FEATURES  += "cfroot"
+
 #
 # note:  selection of MACHINE_FEATURES above will automatically include necessary kernel modules
 # for those features via task-base-gumstix.  Include below any extra kernel modules that you want installed
@@ -74,5 +81,6 @@ module_autoload_g_ether        = ${@base_contains('MACHINE_FEATURES', 'usbgadget
 #module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
 
 module_autoload_tsc2003        = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)}
+module_autoload_ucb1400-ts     = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)}
 module_autoload_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
 
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 1bc0b2e000..8b7d5be188 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -17,7 +17,7 @@ UBOOT_ENTRYPOINT = "a0008000"
 MACHINE_FEATURES += "kernel26 "
 COMBINED_FEATURES ?= ""
 
-IMAGE_FSTYPES = "jffs2"
+IMAGE_FSTYPES = "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
@@ -31,8 +31,11 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
 # The following *should* be in a distro.conf file
 # We include them here to avoid creating a new distro
 
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
+
 PREFERRED_VERSION_gumstix-kernel = "2.6.21"
-PREFERRED_VERSION_udev = "115"
+PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_gnuplot = "4.0.0"
 PREFERRED_VERSION_dropbear = "0.47"
 PREFERRED_VERSION_wpa-supplicant = "0.5.8"
@@ -41,4 +44,11 @@ PREFERRED_VERSION_bluez-utils-alsa = "3.24"
 PREFERRED_VERSION_bluez-libs = "3.24"
 PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24"
 PREFERRED_VERSION_bluez-hcidump = "1.40"
-
+PREFERRED_VERSION_microwindows = "0.91"
+PREFERRED_VERSION_midori = "0.0.15"
+PREFERRED_VERSION_jamvm = "1.5.0"
+PREFERRED_VERSION_classpath = "0.96"
+PREFERRED_VERSION_qtopia-core = "4.3.3"
+PREFERRED_VERSION_uicmoc4-native = "4.3.3"
+
+SRCREV_pn-webkit-gtk = "28656"
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 2f882450c8..cf5af3073e 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -5,7 +5,26 @@ DO_UCLIBC=1
 do_build() {
 	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
 
+        if [ $DO_UCLIBC = 1 ]
+        then
+                BUILD_MODE="uclibc"
+                echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+                if [ "$BUILD_CLEAN" != "" ]
+                then
+                        bitbake -c clean $BUILD_CLEAN
+                fi
+
+                for target in $BUILD_TARGETS
+                do
+                        bitbake $target && do_report_success
+                done
+        fi
+
 	BUILD_MODE="glibc"
+        echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+        echo 'ANGSTROM_MODE = "glibc"' >> conf/auto.conf
+
 	if [ "$BUILD_CLEAN" != "" ]
 	then
 		bitbake -c clean $BUILD_CLEAN
@@ -15,22 +34,6 @@ do_build() {
 	do
 		bitbake $target && do_report_success
 	done
-
-	if [ $DO_UCLIBC = 1 ]
-	then
-		BUILD_MODE="uclibc"
-		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
-		
-		if [ "$BUILD_CLEAN" != "" ]
-        	then
-                	bitbake -c clean $BUILD_CLEAN
-        	fi
-
-		for target in $BUILD_TARGETS
-		do
-			bitbake $target && do_report_success
-		done
-	fi
 }
 
 do_report_success() {
@@ -79,7 +82,7 @@ for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 pood
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
+	BUILD_TARGETS="initramfs-bootmenu-image base-image console-image minimal-gpe-image x11-image"
 	do_build
 done
 
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index 3419cab2e5..94ae5ce4fd 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -9,12 +9,11 @@ import os
 import sys
 import time
 
-VERSION = "2.5.1"
-# increase when touching python-core, this should be the same ml version as in python_2.5.x.bb
-BASEREV = 7
+VERSION = "2.5.2"
+BASEREV = 0
 
 __author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-__version__ = "20080122"
+__version__ = "20080306"
 
 class MakefileMaker:
 
@@ -188,7 +187,7 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core python-zlib",
     "gzip.* zipfile.*" )
 
-    m.addPackage( 0, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core",
+    m.addPackage( 1, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core",
     "hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" )
 
     m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core python-io python-re python-stringold",
@@ -295,13 +294,13 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-subprocess", "Python Subprocess Support", "python-core python-io python-re python-fcntl python-pickle",
     "subprocess.*" )
 
-    m.addPackage( 0, "python-sqlite3", "Python Sqlite3 Database Support", "python-core",
-    "sqlite3" ) # package
+    m.addPackage( 1, "python-sqlite3", "Python Sqlite3 Database Support", "python-core",
+    "lib-dynload/_sqlite3.so sqlite3" ) # package
 
     m.addPackage( 0, "python-stringold", "Python String APIs [deprecated]", "python-core python-re",
     "lib-dynload/strop.so string.*" )
 
-    m.addPackage( 0, "python-syslog", "Python's syslog Interface", "python-core",
+    m.addPackage( 0, "python-syslog", "Python's Syslog Interface", "python-core",
     "lib-dynload/syslog.so" )
 
     m.addPackage( 0, "python-terminal", "Python Terminal Controlling Support", "python-core python-io",
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb
index 6f739c7b22..d750bf539d 100644
--- a/packages/abiword/abiword-plugins_2.5.2.bb
+++ b/packages/abiword/abiword-plugins_2.5.2.bb
@@ -20,7 +20,7 @@ PARALLEL_MAKE=""
 EXTRA_OECONF = " --without-libwmf \
                  --without-inter7eps \
 		 --with-abiword=${WORKDIR}/abiword-${PV} \
-		 --with-boost=${STAGINC_INCDIR}/../ \ 
+		 --with-boost=${STAGING_INCDIR}/../ \ 
 		 "
 
 PACKAGES_DYNAMIC = "abiword-plugin-*"
diff --git a/packages/apmd/files/90-wifi-off b/packages/apmd/files/90-wifi-off
index c54936c4be..645484b8cd 100644
--- a/packages/apmd/files/90-wifi-off
+++ b/packages/apmd/files/90-wifi-off
@@ -3,7 +3,7 @@
 #
 # turn off wifi cards before suspend so they are fully reloaded upon resume
 
-wifislot = `pccardctl ls|egrep '(hostap|orinoco)'|cut -f 2 -d " "`
+wifislot = `pccardctl ls|egrep '(hostap|orinoco|libertas)'|cut -f 2 -d " "`
 if test $wifislot
 then
   for slot in $wifislot; do
diff --git a/packages/classpath/classpath-minimal_0.96.1.bb b/packages/classpath/classpath-minimal_0.96.1.bb
index e71884dc2b..826c5a9479 100644
--- a/packages/classpath/classpath-minimal_0.96.1.bb
+++ b/packages/classpath/classpath-minimal_0.96.1.bb
@@ -1,8 +1,11 @@
 require classpath.inc
 
-PR = "r5"
+PR = "r6"
 
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+  file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  "
 
 PROVIDES = "${PN} classpath"
 
@@ -15,3 +18,5 @@ EXTRA_OECONF += "\
                 --disable-dssi \
                 --disable-examples \
                "
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
diff --git a/packages/classpath/classpath-minimal_0.97.bb b/packages/classpath/classpath-minimal_0.97.bb
index 14495cedff..7a44226940 100644
--- a/packages/classpath/classpath-minimal_0.97.bb
+++ b/packages/classpath/classpath-minimal_0.97.bb
@@ -1,6 +1,10 @@
 require classpath.inc
 
-PR = "r0"
+SRC_URI += "\
+  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  "
+
+PR = "r1"
 
 PROVIDES = "${PN} classpath"
 
@@ -13,3 +17,6 @@ EXTRA_OECONF += "\
                 --disable-dssi \
                 --disable-examples \
                "
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
+
diff --git a/packages/classpath/classpath-native_0.96.1.bb b/packages/classpath/classpath-native_0.96.1.bb
index e7d1d07a81..b9c3b3a4f1 100644
--- a/packages/classpath/classpath-native_0.96.1.bb
+++ b/packages/classpath/classpath-native_0.96.1.bb
@@ -1,6 +1,9 @@
 require classpath-native.inc
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+  file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  "
 
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index e5f5170b32..cfb9f1c089 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -44,9 +44,14 @@ do_install() {
 	mv ${D}${libdir}/security ${D}${libdir}/${PBN}
 }
 
-PACKAGES =+ "${PBN}-common ${PN}-examples \
+# Defines the packages that this classpath recipe creates.
+# This allows the classpath-minimal variants to override this
+# again.
+CPPACKAGES = "${PBN}-common ${PN}-examples \
              ${PN}-tools ${PN}-tools-doc \
-             ${PN}-gtk ${PN}-gconf "
+             ${PN}-gtk ${PN}-gconf"
+
+PACKAGES =+ "${CPPACKAGES}"
 
 FILES_${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}"
 
diff --git a/packages/classpath/classpath_0.95.bb b/packages/classpath/classpath_0.95.bb
index 6b167a2d47..0b2090f72f 100644
--- a/packages/classpath/classpath_0.95.bb
+++ b/packages/classpath/classpath_0.95.bb
@@ -1,8 +1,11 @@
 require classpath.inc
 
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+  file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  "
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/classpath/classpath_0.96.1.bb b/packages/classpath/classpath_0.96.1.bb
index 799b0f31ac..9d347a0303 100644
--- a/packages/classpath/classpath_0.96.1.bb
+++ b/packages/classpath/classpath_0.96.1.bb
@@ -1,8 +1,11 @@
 require classpath.inc
 
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0 \
-          "
-PR = "r4"
+SRC_URI += "\
+  file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  "
+
+PR = "r5"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/classpath/classpath_0.97.bb b/packages/classpath/classpath_0.97.bb
index b8cd02084a..4e45dd4350 100644
--- a/packages/classpath/classpath_0.97.bb
+++ b/packages/classpath/classpath_0.97.bb
@@ -1,6 +1,10 @@
 require classpath.inc
 
-PR = "r0"
+SRC_URI += "\
+  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  "
+
+PR = "r1"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/classpath/files/xmlstream-fix.patch b/packages/classpath/files/xmlstream-fix.patch
new file mode 100644
index 0000000000..30b44178d7
--- /dev/null
+++ b/packages/classpath/files/xmlstream-fix.patch
@@ -0,0 +1,93 @@
+Index: gnu/xml/stream/AttributeImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/AttributeImpl.java,v
+retrieving revision 1.1
+diff -u -r1.1 AttributeImpl.java
+--- gnu/xml/stream/AttributeImpl.java	4 Sep 2005 09:52:10 -0000	1.1
++++ gnu/xml/stream/AttributeImpl.java	4 Mar 2008 16:02:43 -0000
+@@ -56,11 +56,11 @@
+ 
+   protected final QName name;
+   protected final String value;
+-  protected final QName type;
++  protected final String type;
+   protected final boolean specified;
+ 
+   protected AttributeImpl(Location location,
+-                          QName name, String value, QName type,
++                          QName name, String value, String type,
+                           boolean specified)
+   {
+     super(location);
+@@ -85,7 +85,7 @@
+     return value;
+   }
+ 
+-  public QName getDTDType()
++  public String getDTDType()
+   {
+     return type;
+   }
+Index: gnu/xml/stream/XMLEventAllocatorImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java,v
+retrieving revision 1.3
+diff -u -r1.3 XMLEventAllocatorImpl.java
+--- gnu/xml/stream/XMLEventAllocatorImpl.java	3 Mar 2006 12:30:59 -0000	1.3
++++ gnu/xml/stream/XMLEventAllocatorImpl.java	4 Mar 2008 16:02:44 -0000
+@@ -165,7 +165,7 @@
+           attributes.add(new AttributeImpl(location,
+                                            reader.getAttributeName(i),
+                                            reader.getAttributeValue(i),
+-                                           QName.valueOf(reader.getAttributeType(i)),
++                                           reader.getAttributeType(i),
+                                            reader.isAttributeSpecified(i)));
+         return new StartElementImpl(location,
+                                     reader.getName(),
+Index: gnu/xml/stream/XMLEventFactoryImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 XMLEventFactoryImpl.java
+--- gnu/xml/stream/XMLEventFactoryImpl.java	3 Mar 2006 12:30:59 -0000	1.2
++++ gnu/xml/stream/XMLEventFactoryImpl.java	4 Mar 2008 16:02:44 -0000
+@@ -79,20 +79,20 @@
+   {
+     return new AttributeImpl(location,
+                              new QName(namespaceURI, localName, prefix),
+-                             value, QName.valueOf("CDATA"), true);
++                             value, "CDATA", true);
+   }
+   
+   public Attribute createAttribute(String localName, String value)
+   {
+     return new AttributeImpl(location,
+                              new QName(localName),
+-                             value, QName.valueOf("CDATA"), true);
++                             value, "CDATA", true);
+   }
+ 
+   public Attribute createAttribute(QName name, String value)
+   {
+     return new AttributeImpl(location, name, value,
+-                             QName.valueOf("CDATA"), true);
++                             "CDATA", true);
+   }
+ 
+   public Namespace createNamespace(String namespaceURI)
+Index: javax/xml/stream/events/Attribute.java
+===================================================================
+RCS file: /sources/classpath/classpath/javax/xml/stream/events/Attribute.java,v
+retrieving revision 1.2
+diff -u -r1.2 Attribute.java
+--- javax/xml/stream/events/Attribute.java	4 Sep 2005 09:44:30 -0000	1.2
++++ javax/xml/stream/events/Attribute.java	4 Mar 2008 16:02:48 -0000
+@@ -59,7 +59,7 @@
+   /**
+    * Returns the type of this attribute.
+    */
+-  QName getDTDType();
++  String getDTDType();
+ 
+   /**
+    * Indicates whether this attribute was specified in the input source, or
diff --git a/packages/dbench/dbench_3.04.bb b/packages/dbench/dbench_4.0.bb
index 1f6b703ba8..aade4170ba 100644
--- a/packages/dbench/dbench_3.04.bb
+++ b/packages/dbench/dbench_4.0.bb
@@ -3,10 +3,12 @@ DESCRIPTION_dbench = "Filesystem load benchmark"
 DESCRIPTION_tbench = "TCP load benchmark"
 HOMEPAGE = "http://samba.org/ftp/tridge/dbench/"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \
-           file://destdir.patch;patch=1"
+SRC_URI = "\
+  http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \
+  file://destdir.patch;patch=1 \
+  file://makefile.patch;patch=1"
 
 inherit autotools
 
diff --git a/packages/dbench/dbench/.mtn2git_empty b/packages/dbench/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbench/dbench/.mtn2git_empty
+++ b/packages/dbench/files/.mtn2git_empty
diff --git a/packages/dbench/dbench/destdir.patch b/packages/dbench/files/destdir.patch
index 9fe1508f97..9fe1508f97 100644
--- a/packages/dbench/dbench/destdir.patch
+++ b/packages/dbench/files/destdir.patch
diff --git a/packages/dbench/files/makefile.patch b/packages/dbench/files/makefile.patch
new file mode 100644
index 0000000000..4f57085e41
--- /dev/null
+++ b/packages/dbench/files/makefile.patch
@@ -0,0 +1,13 @@
+Index: dbench-4.0/Makefile.in
+===================================================================
+--- dbench-4.0.orig/Makefile.in
++++ dbench-4.0/Makefile.in
+@@ -35,7 +35,7 @@ install: all
+ 	${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir)
+ 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir)
+ 	${INSTALLCMD} client.txt $(DESTDIR)$(datadir)
+-	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir)
++	${INSTALLCMD} -m 644 dbench.1 $(DESTDIR)$(mandir)
+ 	ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1
+ 	ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1
+ 
diff --git a/packages/dbus/dbus-1.0.2/.mtn2git_empty b/packages/dbus/dbus-1.0.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-1.0.2/.mtn2git_empty
+++ b/packages/dbus/dbus-1.0.3/.mtn2git_empty
diff --git a/packages/dbus/dbus-1.0.2/cross.patch b/packages/dbus/dbus-1.0.3/cross.patch
index 268a3ae3de..268a3ae3de 100644
--- a/packages/dbus/dbus-1.0.2/cross.patch
+++ b/packages/dbus/dbus-1.0.3/cross.patch
diff --git a/packages/dbus/dbus-1.0.2/dbus-1.init b/packages/dbus/dbus-1.0.3/dbus-1.init
index 0725083c69..0725083c69 100644
--- a/packages/dbus/dbus-1.0.2/dbus-1.init
+++ b/packages/dbus/dbus-1.0.3/dbus-1.init
diff --git a/packages/dbus/dbus-1.0.2/fix-install-daemon.patch b/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
index c31786357d..c31786357d 100644
--- a/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
+++ b/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
diff --git a/packages/dbus/dbus-1.0.2/fix-waitpid.patch b/packages/dbus/dbus-1.0.3/fix-waitpid.patch
index 80c431809c..80c431809c 100644
--- a/packages/dbus/dbus-1.0.2/fix-waitpid.patch
+++ b/packages/dbus/dbus-1.0.3/fix-waitpid.patch
diff --git a/packages/dbus/dbus-1.0.2/tmpdir.patch b/packages/dbus/dbus-1.0.3/tmpdir.patch
index 838b903f0a..838b903f0a 100644
--- a/packages/dbus/dbus-1.0.2/tmpdir.patch
+++ b/packages/dbus/dbus-1.0.3/tmpdir.patch
diff --git a/packages/dbus/dbus-native_1.0.2.bb b/packages/dbus/dbus-native_1.0.3.bb
index 0149ab374f..0149ab374f 100644
--- a/packages/dbus/dbus-native_1.0.2.bb
+++ b/packages/dbus/dbus-native_1.0.3.bb
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.3.bb
index 6a54a62d9a..6a54a62d9a 100644
--- a/packages/dbus/dbus_1.0.2.bb
+++ b/packages/dbus/dbus_1.0.3.bb
diff --git a/packages/dropbear/dropbear-0.50/.mtn2git_empty b/packages/dropbear/dropbear-0.50/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dropbear/dropbear-0.50/.mtn2git_empty
diff --git a/packages/dropbear/dropbear-0.50/configure.patch b/packages/dropbear/dropbear-0.50/configure.patch
new file mode 100644
index 0000000000..fa24efc066
--- /dev/null
+++ b/packages/dropbear/dropbear-0.50/configure.patch
@@ -0,0 +1,27 @@
+Index: dropbear-0.50/configure.in
+===================================================================
+--- dropbear-0.50.orig/configure.in
++++ dropbear-0.50/configure.in
+@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty,
+ 			AC_MSG_NOTICE(Not using openpty)
+ 		else
+ 			AC_MSG_NOTICE(Using openpty if available)
+-			AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)])
++			AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
+ 		fi
+ 	],
+ 	[
+ 		AC_MSG_NOTICE(Using openpty if available)
+-		AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)])
++		AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
+ 	]
+ )
++
++if test "x$dropbear_cv_func_have_openpty" = "xyes"; then
++	AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)
++	no_ptc_check=yes
++	no_ptmx_check=yes
++fi
+ 		
+ 
+ AC_ARG_ENABLE(syslog,
diff --git a/packages/dropbear/dropbear-0.50/fix-2kb-keys.patch b/packages/dropbear/dropbear-0.50/fix-2kb-keys.patch
new file mode 100644
index 0000000000..bb7a4d32ac
--- /dev/null
+++ b/packages/dropbear/dropbear-0.50/fix-2kb-keys.patch
@@ -0,0 +1,12 @@
+Index: dropbear-0.50/kex.h
+===================================================================
+--- dropbear-0.50.orig/kex.h
++++ dropbear-0.50/kex.h
+@@ -59,6 +59,6 @@ struct KEXState {
+ 
+ };
+ 
+-#define MAX_KEXHASHBUF 2000
++#define MAX_KEXHASHBUF 3000
+ 
+ #endif /* _KEX_H_ */
diff --git a/packages/dropbear/dropbear-0.50/urandom-xauth-changes-to-options.h.patch b/packages/dropbear/dropbear-0.50/urandom-xauth-changes-to-options.h.patch
new file mode 100644
index 0000000000..787b801643
--- /dev/null
+++ b/packages/dropbear/dropbear-0.50/urandom-xauth-changes-to-options.h.patch
@@ -0,0 +1,13 @@
+Index: dropbear-0.50/options.h
+===================================================================
+--- dropbear-0.50.orig/options.h
++++ dropbear-0.50/options.h
+@@ -197,7 +197,7 @@ etc) slower (perhaps by 50%). Recommende
+ /* The command to invoke for xauth when using X11 forwarding.
+  * "-q" for quiet */
+ #ifndef XAUTH_COMMAND
+-#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
++#define XAUTH_COMMAND "xauth -q"
+ #endif
+ 
+ /* if you want to enable running an sftp server (such as the one included with
diff --git a/packages/dropbear/dropbear/chansession-security-fix.patch b/packages/dropbear/dropbear/chansession-security-fix.patch
deleted file mode 100644
index bc4c461fee..0000000000
--- a/packages/dropbear/dropbear/chansession-security-fix.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Date: Sun, 11 Dec 2005 23:30:02 +0800
-From: Matt Johnston <matt@ucc.asn.au>
-To: dropbear@ucc.gu.uwa.edu.au
-Subject: Dropbear 0.47 (and security fix)
-Message-ID: <20051211153002.GH28839@ucc.gu.uwa.edu.au>
-
-Hi all.
-
-I've put up a new release 0.47 of Dropbear, which has
-various fixes and new features - see the change summary
-below. 
-http://matt.ucc.asn.au/dropbear/dropbear.html is the
-url as usual or directly at 
-http://matt.ucc.asn.au/dropbear/dropbear-0.47.tar.bz2
-
-This release also fixes a potential security issue, which
-may allow authenticated users to run arbitrary code as the
-server user. I'm unsure exactly how likely it is to be
-exploitable, but anyone who's running a multi-user server is
-advised to upgrade. For older releases, the patch is:
-(against chanesssion.c for 0.43 and earlier).
-
---- dropbear/svr-chansession.c
-+++ dropbear/svr-chansession.c
-@@ -810,7 +810,7 @@
- 	/* need to increase size */
- 	if (i == svr_ses.childpidsize) {
- 		svr_ses.childpids = (struct ChildPid*)m_realloc(svr_ses.childpids,
--				sizeof(struct ChildPid) * svr_ses.childpidsize+1);
-+				sizeof(struct ChildPid) * (svr_ses.childpidsize+1));
- 		svr_ses.childpidsize++;
- 	}
- 	
-
-Matt
-
-
-0.47 - Thurs Dec 8 2005
-
-- SECURITY: fix for buffer allocation error in server code, could potentially
-  allow authenticated users to gain elevated privileges. All multi-user systems
-  running the server should upgrade (or apply the patch available on the
-  Dropbear webpage).
-
-- Fix channel handling code so that redirecting to /dev/null doesn't use
-  100% CPU.
-
-- Turn on zlib compression for dbclient.
-
-- Set "low delay" TOS bit, can significantly improve interactivity
-  over some links.
-
-- Added client keyboard-interactive mode support, allows operation with
-  newer OpenSSH servers in default config.
-
-- Log when pubkey auth fails because of bad ~/.ssh/authorized_keys permissions
-
-- Improve logging of assertions
-
-- Added aes-256 cipher and sha1-96 hmac.
-
-- Fix twofish so that it actually works.
-
-- Improve PAM prompt comparison.
-
-- Added -g (dbclient) and -a (dropbear server) options to allow
-  connections to listening forwarded ports from remote machines.
-
-- Various other minor fixes
-
-- Compile fixes for glibc 2.1 (ss_family vs __ss_family) and NetBSD
-  (netinet/in_systm.h needs to be included).
-
-
diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb
deleted file mode 100644
index 68c6e87e75..0000000000
--- a/packages/dropbear/dropbear_0.45.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require dropbear.inc
-
-PR = "r4"
-
-SRC_URI += "file://chansession-security-fix.patch;patch=1 "
diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
deleted file mode 100644
index d34787fa64..0000000000
--- a/packages/dropbear/dropbear_0.46.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require dropbear.inc
-
-PR = "r6"
-
-SRC_URI += "file://chansession-security-fix.patch;patch=1 "
diff --git a/packages/dropbear/dropbear_0.47.bb b/packages/dropbear/dropbear_0.47.bb
deleted file mode 100644
index b8467e1e7c..0000000000
--- a/packages/dropbear/dropbear_0.47.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require dropbear.inc
-
-PR = "r2"
diff --git a/packages/dropbear/dropbear_0.48.1.bb b/packages/dropbear/dropbear_0.48.1.bb
deleted file mode 100644
index f98c0ac8f6..0000000000
--- a/packages/dropbear/dropbear_0.48.1.bb
+++ /dev/null
@@ -1 +0,0 @@
-require dropbear.inc
diff --git a/packages/dropbear/dropbear_0.50.bb b/packages/dropbear/dropbear_0.50.bb
new file mode 100644
index 0000000000..21d46ef59c
--- /dev/null
+++ b/packages/dropbear/dropbear_0.50.bb
@@ -0,0 +1,6 @@
+PR = "r0"
+
+require dropbear.inc
+
+# testing
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/freesmartphone/enter_0.0.2.bb b/packages/freesmartphone/enter_0.0.2.bb
index 7f1dd09a25..2a51af6506 100644
--- a/packages/freesmartphone/enter_0.0.2.bb
+++ b/packages/freesmartphone/enter_0.0.2.bb
@@ -1,4 +1,4 @@
-DESCRIPTION="A easy-to-use virtual keyboard for small touchscreen displays"
+DESCRIPTION = "An easy-to-use virtual keyboard for small touchscreen displays"
 SECTION = "openmoko/inputmethods"
 DEPENDS = "ecore evas edje"
 PR = "r0"
diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb
index 6c3d29aed4..60ea915933 100644
--- a/packages/freesmartphone/gsm0710muxd_svn.bb
+++ b/packages/freesmartphone/gsm0710muxd_svn.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "gsm 07.10 muxer userspace daemon"
 HOMEPAGE = "http://www.freesmartphone.org"
 AUTHOR = "M. Dietrich"
 SECTION = "console/network"
-DEPENDS = "intltool-native dbus"
+DEPENDS = "intltool-native dbus dbus-glib"
 RCONFLICTS = "gsmd"
 RREPLACES = "gsmd"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
 S = "${WORKDIR}/gsm0710muxd"
diff --git a/packages/freesmartphone/pylgrim_svn.bb b/packages/freesmartphone/pylgrim_svn.bb
new file mode 100644
index 0000000000..e70c839da8
--- /dev/null
+++ b/packages/freesmartphone/pylgrim_svn.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "A GPS moving map application featuring OpenStreetMap tiles"
+HOMEPAGE = "http://neo1973-germany.de/wiki/pylgrim"
+AUTHOR = "Josch"
+LICENSE = "GPL"
+SECTION = "x11/navigation"
+DEPENDS = "edje-native"
+RDEPENDS = "task-python-efl python-textutils"
+PV = "0.0+svn${SRCREV}"
+
+SRC_URI = "svn://neo1973-germany.de/svn;module=pylgrim;proto=http"
+S = "${WORKDIR}/pylgrim"
+
+do_compile() {
+	edje_cc pylgrim.edc
+}
+
+do_install() {
+	install -d ${D}${datadir}/pylgrim
+	for i in *.py pylgrim.edj; do
+		install -m 0755 $i ${D}${datadir}/pylgrim/
+	done
+}
+
+FILES_${PN} += "${datadir}"
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
index 1639511362..aff22fb694 100644
--- a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
@@ -1,2 +1,2 @@
-require gcc-cross_${PV}.bb
+require gcc-cross_csl-arm-2005q3.bb
 require gcc-cross-initial.inc
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index 4b7e7b715c..d9c818979c 100644
--- a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -7,7 +7,7 @@ SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 
-require gcc-cross-initial_${PV}.bb
+require gcc-cross-initial_csl-arm-2005q3.bb
 
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 
diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc
index c3ba231678..635ab6d1f4 100644
--- a/packages/gcc/gcc-package-sdk.inc
+++ b/packages/gcc/gcc-package-sdk.inc
@@ -1,18 +1,58 @@
-# Packages emitted by our gcc-cross builds.
 #
+# Note gcc-package.inc was already included before us. 
+#
+# We override PACKAGES and FILES to change the packaging
+#
+
 INHIBIT_PACKAGE_STRIP ?= ""
+HAS_G2C ?= "yes"
+HAS_GFORTRAN ?= "no"
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-python do_package() {
-	if bb.data.getVar('DEBIAN_NAMES', d, 1):
-		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
-	bb.build.exec_func('package_do_package', d)
-}
+# Having anything auto depending on gcc-cross-sdk is a really bad idea...
+EXCLUDE_FROM_SHLIBS = "1"
+
+PACKAGES = "${PN} ${PN}-doc"
 
+FILES_${PN} = "\
+    ${bindir}/* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+    ${includedir}/c++/${BINV} \
+    ${prefix}/${TARGET_SYS}/bin/* \
+    ${prefix}/${TARGET_SYS}/lib/* \
+    "
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
+	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+
+	# We care about g++ not c++
+	rm -f ${D}${bindir}/*c++
+
+	# We don't care about the gcc-<version> copies
+	rm -f ${D}${bindir}/*gcc-?.?*
+
+	# We use libiberty from binutils
+	rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a
+	rm -f ${D}${libdir}/libiberty.a
+
+	# Create the ${prefix}/${TARGET_SYS}/bin/* symlinks
+	install -d ${D}${prefix}/${TARGET_SYS}/bin/
+	for l in ${D}${bindir}/*; do
+		ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
+	done
+	ln -sf "${bindir}/${TARGET_PREFIX}gcc" "${D}${prefix}/${TARGET_SYS}/bin/cc"
+
 	# Manually run the target stripper since we won't get it run by
 	# the packaging.
 	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
@@ -22,15 +62,3 @@ do_install () {
 	fi
 }
 
-FILES_libgcc = "${prefix}/${TARGET_SYS}/lib/libgcc*.so.*"
-FILES_libgcc-dev = "${prefix}/${TARGET_SYS}/lib/libgcc*.so"
-
-FILES_libstdc++ = "${prefix}/${TARGET_SYS}/lib/libstdc++.so.*"
-FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
-                       ${prefix}/${TARGET_SYS}/lib/libstdc++.so \
-                       ${prefix}/${TARGET_SYS}/lib/libstdc++.a \
-                       ${prefix}/${TARGET_SYS}/lib/libsupc++.a"
-
-FILES_libmudflap = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so.*"
-FILES_libmudflap-dev = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so \
-                        ${prefix}/${TARGET_SYS}/lib/libmudflap*.a"
diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc
index d6af5fe933..b66c716505 100644
--- a/packages/gcc/gcc4-build-sdk.inc
+++ b/packages/gcc/gcc4-build-sdk.inc
@@ -1,12 +1,40 @@
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
 
-EXTRA_OECONF += "--with-sysroot=${prefix}/${TARGET_SYS} --with-build-sysroot=${STAGING_DIR_TARGET}"
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+                      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+                      --with-sysroot=${prefix}/${TARGET_SYS} \
+                      --with-build-sysroot=${STAGING_DIR_TARGET}"
+
+#
+# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
+# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
+#
+export AR_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ar"
+export AS_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/as"
+export DLLTOOL_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/dlltool"
+export LD_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ld"
+export LIPO_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/lipo"
+export NM_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/nm"
+export OBJDUMP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/objdump"
+export RANLIB_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ranlib"
+export STRIP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/strip"
+export WINDRES_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/windres"
+
+#
+# We need to override this and make sure the compiler can find staging
+#
+export ARCH_FLAGS_FOR_TARGET = "--sysroot=/media/build1/builds/oe/angstrom/tmp/staging/arm-angstrom-linux-gnueabi"
 
 do_configure () {
-       (cd ${S} && gnu-configize) || die "failure running gnu-configize"
-       (cd ${S}/libstdc++-v3 && autoreconf)
-       oe_runconf
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CXX_FOR_BUILD="${BUILD_CXX}"
+	export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+	export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
 }
 
 do_compile () {
@@ -16,5 +44,5 @@ do_compile () {
 	export LD_FOR_TARGET="${TARGET_SYS}-ld"
 	export NM_FOR_TARGET="${TARGET_SYS}-nm"
 	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}"
-	oe_runmake
+	base_do_compile
 }
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 4c8f8227a9..b90f6907bb 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -4,6 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 BINV = "3.4.4"
 PV = "3.4.4+csl-arm-2005q3"
+PV_chinook-compat = "3.4.4cs2005q3.2"
 PR = "r3"
 
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
diff --git a/packages/glib-2.0/glib-2.0-2.15.6/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.15.6/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.15.6/.mtn2git_empty
diff --git a/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch
new file mode 100644
index 0000000000..a52327c8c9
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch
@@ -0,0 +1,29 @@
+--- glib-2.12.10/configure.in.orig	2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in	2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+ 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ 	echo "void glib_plugin_test(void) { }" > plugin.c
+-	${SHELL} ./libtool --mode=compile ${CC} -shared \
++	${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ 		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ 		glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+ 
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
diff --git a/packages/glib-2.0/glib-2.0_2.15.6.bb b/packages/glib-2.0/glib-2.0_2.15.6.bb
new file mode 100644
index 0000000000..525a9d23de
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.15.6.bb
@@ -0,0 +1,6 @@
+require glib.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1 \
+          "
diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc
index 3fa6fe26ab..596b3bb90b 100644
--- a/packages/glib-2.0/glib.inc
+++ b/packages/glib-2.0/glib.inc
@@ -34,11 +34,7 @@ do_configure_prepend () {
 }
 
 do_stage () {
-	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
-	autotools_stage_includes
+	autotools_stage_all
 	install -d ${STAGING_INCDIR}/glib-2.0/glib
 	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
 	install -d ${STAGING_DATADIR}/aclocal
diff --git a/packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff b/packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff
new file mode 100644
index 0000000000..a552cf0d1f
--- /dev/null
+++ b/packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff
@@ -0,0 +1,13 @@
+Arm needs a similar fix as http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+
+--- /tmp/stdio-lock.h	2008-03-04 18:51:15.555038993 +0100
++++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/bits/stdio-lock.h	2008-03-04 18:51:28.445035052 +0100
+@@ -50,6 +50,8 @@
+   _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp));      \
+   _IO_flockfile (_fp)
+ 
++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
++
+ # define _IO_release_lock(_fp) \
+   _IO_funlockfile (_fp);						      \
+   _IO_cleanup_region_end (0)
diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb
index 357196e5a7..97ce488df4 100644
--- a/packages/glibc/glibc_2.7.bb
+++ b/packages/glibc/glibc_2.7.bb
@@ -57,6 +57,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
 #	   file://fixup-aeabi-syscalls.patch;patch=1 \
 #	   file://zecke-sane-readelf.patch;patch=1 \
            file://ldd-unbash.patch;patch=1 \
+	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
diff --git a/packages/gnome/epiphany_2.21.92.bb b/packages/gnome/epiphany_2.21.92.bb
new file mode 100644
index 0000000000..c385c1d208
--- /dev/null
+++ b/packages/gnome/epiphany_2.21.92.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+inherit gnome
+
+EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
+
+do_configure_prepend() {
+        touch ${S}/gnome-doc-utils.make
+        sed -i -e s:help::g Makefile.am
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
diff --git a/packages/gtk-webcore/midori-0.0.17/.mtn2git_empty b/packages/gtk-webcore/midori-0.0.17/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk-webcore/midori-0.0.17/.mtn2git_empty
diff --git a/packages/gtk-webcore/midori-0.0.17/webkit-update.patch b/packages/gtk-webcore/midori-0.0.17/webkit-update.patch
new file mode 100644
index 0000000000..d3d19123cf
--- /dev/null
+++ b/packages/gtk-webcore/midori-0.0.17/webkit-update.patch
@@ -0,0 +1,676 @@
+Update midori 0.17 to the new pkgconfig and header location. Taken from upstream git 
+
+diff -Nurd midori-0.0.17/src/browser.c midori/src/browser.c
+--- midori-0.0.17/src/browser.c	2008-01-23 02:20:22.000000000 +0100
++++ midori/src/browser.c	2008-03-05 10:43:08.028499025 +0100
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>
++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de>
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+@@ -290,6 +290,15 @@
+     g_free(source);*/
+ }
+ 
++void on_action_fullscreen_activate(GtkAction* action, CBrowser* browser)
++{
++    GdkWindowState state = gdk_window_get_state(browser->window->window);
++    if(state & GDK_WINDOW_STATE_FULLSCREEN)
++        gtk_window_unfullscreen(GTK_WINDOW(browser->window));
++    else
++        gtk_window_fullscreen(GTK_WINDOW(browser->window));
++}
++
+ void on_action_back_activate(GtkAction* action, CBrowser* browser)
+ {
+     webkit_web_view_go_back(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser)));
+@@ -1125,13 +1134,35 @@
+     update_search_engines(browser);
+ }
+ 
++static void on_window_state_changed(GtkWidget* widget
++ , GdkEventWindowState* event, CBrowser* browser)
++{
++    if(event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
++    {
++        if(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
++        {
++            gtk_widget_hide(browser->menubar);
++            g_object_set(browser->fullscreen, "stock-id"
++             , GTK_STOCK_LEAVE_FULLSCREEN, NULL);
++            gtk_widget_show(browser->fullscreen);
++        }
++        else
++        {
++            gtk_widget_show(browser->menubar);
++            gtk_widget_hide(browser->fullscreen);
++            g_object_set(browser->fullscreen, "stock-id"
++             , GTK_STOCK_FULLSCREEN, NULL);
++        }
++    }
++}
++
+ static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation
+  , CBrowser* browser)
+ {
+      if(GTK_WIDGET_REALIZED(widget))
+      {
+-         if(!(gdk_window_get_state(widget->window)
+-          & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)))
++         GdkWindowState state = gdk_window_get_state(widget->window);
++         if(!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)))
+          {
+              config->winWidth = allocation->width;
+              config->winHeight = allocation->height;
+@@ -1180,6 +1211,8 @@
+ 
+     // Setup the window metrics
+     browser->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
++    g_signal_connect(browser->window, "window-state-event"
++     , G_CALLBACK(on_window_state_changed), browser);
+     GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(browser->window));
+     const gint defaultWidth = (gint)gdk_screen_get_width(screen) / 1.7;
+     const gint defaultHeight = (gint)gdk_screen_get_height(screen) / 1.7;
+@@ -1351,6 +1384,13 @@
+     gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar)
+      , GTK_TOOL_ITEM(browser->closedTabs), -1);
+     sokoke_container_show_children(GTK_CONTAINER(browser->navibar));
++    action = gtk_action_group_get_action(browser->actiongroup, "Fullscreen");
++    browser->fullscreen = gtk_action_create_tool_item(action);
++    gtk_widget_hide(browser->fullscreen);
++    g_signal_connect(browser->fullscreen, "clicked"
++     , G_CALLBACK(on_action_fullscreen_activate), browser);
++    gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar)
++     , GTK_TOOL_ITEM(browser->fullscreen), -1);
+     action_set_active("ToolbarNavigation", config->toolbarNavigation, browser);
+ 
+     // Bookmarkbar
+@@ -1605,6 +1645,7 @@
+     browser->location = oldBrowser->location;
+     browser->webSearch = oldBrowser->webSearch;
+     browser->closedTabs = oldBrowser->closedTabs;
++    browser->fullscreen = oldBrowser->fullscreen;
+     browser->bookmarkbar = oldBrowser->bookmarkbar;
+     browser->panels = oldBrowser->panels;
+     browser->panels_notebook = oldBrowser->panels_notebook;
+@@ -1691,7 +1732,9 @@
+ 
+     // Connect signals
+     #define DOC_CONNECT(__sig, __func) g_signal_connect \
+-     (G_OBJECT(browser->webView), __sig, G_CALLBACK(__func), browser);
++     (browser->webView, __sig, G_CALLBACK(__func), browser);
++    #define DOC_CONNECTA(__sig, __func) g_signal_connect_after \
++     (browser->webView, __sig, G_CALLBACK(__func), browser);
+     DOC_CONNECT  ("navigation-requested"        , on_webView_navigation_requested)
+     DOC_CONNECT  ("title-changed"               , on_webView_title_changed)
+     DOC_CONNECT  ("icon-loaded"                 , on_webView_icon_changed)
+@@ -1704,11 +1747,13 @@
+     DOC_CONNECT  ("console-message"             , on_webView_console_message)
+ 
+     DOC_CONNECT  ("button-press-event"          , on_webView_button_press)
++    DOC_CONNECTA ("button-press-event"          , on_webView_button_press_after)
+     DOC_CONNECT  ("popup-menu"                  , on_webView_popup);
+     DOC_CONNECT  ("scroll-event"                , on_webView_scroll);
+     DOC_CONNECT  ("leave-notify-event"          , on_webView_leave)
+     DOC_CONNECT  ("destroy"                     , on_webView_destroy)
+     #undef DOC_CONNECT
++    #undef DOC_CONNECTA
+ 
+     webkit_web_view_set_settings(WEBKIT_WEB_VIEW(browser->webView), webSettings);
+ 
+diff -Nurd midori-0.0.17/src/browser.h midori/src/browser.h
+--- midori-0.0.17/src/browser.h	2008-01-20 19:16:17.000000000 +0100
++++ midori/src/browser.h	2008-03-05 10:43:08.028499025 +0100
+@@ -39,6 +39,7 @@
+     GtkWidget* location;
+     GtkWidget* webSearch;
+     GtkWidget* closedTabs;
++    GtkWidget* fullscreen;
+     GtkWidget* bookmarkbar;
+     // panels
+     GtkWidget* panels;
+@@ -161,6 +162,9 @@
+ on_action_source_view_activate(GtkAction*, CBrowser*);
+ 
+ void
++on_action_fullscreen_activate(GtkAction*, CBrowser*);
++
++void
+ on_action_back_activate(GtkAction*, CBrowser*);
+ 
+ void
+@@ -364,6 +368,9 @@
+  { "Properties", GTK_STOCK_PROPERTIES
+  , NULL, ""
+  , "hm?", NULL/*G_CALLBACK(on_action_properties_activate)*/ },
++ { "Fullscreen", GTK_STOCK_FULLSCREEN
++ , NULL, "F11"
++ , "Toggle fullscreen view", G_CALLBACK(on_action_fullscreen_activate) },
+ 
+  { "Go", NULL, "_Go" },
+  { "Back", GTK_STOCK_GO_BACK
+diff -Nurd midori-0.0.17/src/conf.c midori/src/conf.c
+--- midori-0.0.17/src/conf.c	2008-01-23 05:12:24.000000000 +0100
++++ midori/src/conf.c	2008-03-05 10:43:08.028499025 +0100
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>
++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de>
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+@@ -64,6 +64,7 @@
+     GET_INT(config->newPages, "NewPages", CONFIG_NEWPAGES_TAB_NEW);
+     GET_INT(config->openTabsInTheBackground, "OpenTabsInTheBackground", FALSE);
+     GET_INT(config->openPopupsInTabs, "OpenPopupsInTabs", FALSE);
++    GET_INT(config->middleClickGoto, "MiddleClickGoto", FALSE);
+     #undef GET_INT
+     #undef GET_STR
+ 
+@@ -73,6 +74,10 @@
+     #define GET_STR(var, key, default) \
+      var = sokoke_key_file_get_string_default( \
+      keyFile, "content", key, default, NULL)
++    GET_STR(config->defaultFontFamily, "DefaultFontFamily", "Sans");
++    GET_INT(config->defaultFontSize, "DefaultFontSize", 10);
++    GET_INT(config->minimumFontSize, "MinimumFontSize", 5);
++    GET_STR(config->defaultEncoding, "DefaultEncoding", "UTF-8");
+     GET_INT(config->autoLoadImages, "AutoLoadImages", TRUE);
+     GET_INT(config->autoShrinkImages, "AutoShrinkImages", TRUE);
+     GET_INT(config->printBackgrounds, "PrintBackgrounds", FALSE);
+@@ -143,7 +148,12 @@
+     g_key_file_set_integer(keyFile, "browser", "NewPages", config->newPages);
+     g_key_file_set_integer(keyFile, "browser", "OpenTabsInTheBackground", config->openTabsInTheBackground);
+     g_key_file_set_integer(keyFile, "browser", "OpenPopupsInTabs", config->openPopupsInTabs);
++    g_key_file_set_integer(keyFile, "browser", "MiddleClickGoto", config->middleClickGoto);
+ 
++    g_key_file_set_string (keyFile, "content", "DefaultFontFamily", config->defaultFontFamily);
++    g_key_file_set_integer(keyFile, "content", "DefaultFontSize", config->defaultFontSize);
++    g_key_file_set_integer(keyFile, "content", "MinimumFontSize", config->minimumFontSize);
++    g_key_file_set_string (keyFile, "content", "DefaultEncoding", config->defaultEncoding);
+     g_key_file_set_integer(keyFile, "content", "AutoLoadImages", config->autoLoadImages);
+     g_key_file_set_integer(keyFile, "content", "AutoShrinkImages", config->autoShrinkImages);
+     g_key_file_set_integer(keyFile, "content", "PrintBackgrounds", config->printBackgrounds);
+diff -Nurd midori-0.0.17/src/conf.h midori/src/conf.h
+--- midori-0.0.17/src/conf.h	2008-01-23 05:11:13.000000000 +0100
++++ midori/src/conf.h	2008-03-05 10:43:08.028499025 +0100
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>
++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de>
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+@@ -36,8 +36,12 @@
+     guint    newPages; // where to open new pages
+     gboolean openTabsInTheBackground;
+     gboolean openPopupsInTabs;
++    gboolean middleClickGoto;
+ 
+-    
++    gchar* defaultFontFamily;
++    guint defaultFontSize;
++    guint minimumFontSize;
++    gchar* defaultEncoding;
+     gboolean autoLoadImages;
+     gboolean autoShrinkImages;
+     gboolean printBackgrounds;
+diff -Nurd midori-0.0.17/src/global.h midori/src/global.h
+--- midori-0.0.17/src/global.h	2008-01-23 03:13:40.000000000 +0100
++++ midori/src/global.h	2008-03-05 10:43:08.028499025 +0100
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+ 
+ #include <gtk/gtk.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ // -- globals
+ 
+@@ -81,5 +81,9 @@
+ #if !GTK_CHECK_VERSION(2, 10, 0)
+ #define GTK_STOCK_SELECT_ALL     "gtk-select-all"
+ #endif
++#if !GTK_CHECK_VERSION(2, 8, 0)
++#define GTK_STOCK_FULLSCREEN "gtk-fullscreen"
++#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen"
++#endif
+ 
+ #endif /* !__GLOBAL_H__ */
+diff -Nurd midori-0.0.17/src/helpers.c midori/src/helpers.c
+--- midori-0.0.17/src/helpers.c	2008-01-20 17:46:16.000000000 +0100
++++ midori/src/helpers.c	2008-03-05 10:43:08.028499025 +0100
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+ 
+ #include <string.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ GtkIconTheme* get_icon_theme(GtkWidget* widget)
+ {
+@@ -417,7 +417,7 @@
+     if(!strstr(uri, "://"))
+     {
+         // Do we have a domain, ip address or localhost?
+-        if(strstr(uri, ".") != NULL || !strcmp(uri, "localhost"))
++        if(strchr(uri, '.') != NULL || !strcmp(uri, "localhost"))
+             return g_strconcat("http://", uri, NULL);
+         // We don't want to search? So return early.
+         if(!search)
+diff -Nurd midori-0.0.17/src/main.c midori/src/main.c
+--- midori-0.0.17/src/main.c	2008-01-23 05:13:21.000000000 +0100
++++ midori/src/main.c	2008-03-05 10:43:08.031832796 +0100
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>
++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de>
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+@@ -21,6 +21,7 @@
+ 
+ #include <string.h>
+ #include <gtk/gtk.h>
++#include <webkit/webkit.h>
+ 
+ #include "config.h"
+ 
+@@ -58,6 +59,10 @@
+         #if !GTK_CHECK_VERSION(2, 10, 0)
+         { GTK_STOCK_SELECT_ALL, "Select _All", 0, 0, (gchar*)"gtk20" },
+         #endif
++        #if !GTK_CHECK_VERSION(2, 8, 0)
++        { GTK_STOCK_FULLSCREEN, "_Fullscreen", 0, 0, (gchar*)"gtk20" },
++        { GTK_STOCK_FULLSCREEN, "_Leave Fullscreen", 0, 0, (gchar*)"gtk20" },
++        #endif
+     };
+     GtkIconFactory* factory = gtk_icon_factory_new();
+     guint i;
+@@ -244,8 +249,11 @@
+     stock_items_init();
+     browsers = NULL;
+ 
+-    webSettings = webkit_web_settings_new();
+-    g_object_set(webSettings
++    webSettings = g_object_new(WEBKIT_TYPE_WEB_SETTINGS
++     , "default-font-family" , config->defaultFontFamily
++     , "default-font-size"   , config->defaultFontSize
++     , "minimum-font-size"   , config->minimumFontSize
++     , "default-encoding"    , config->defaultEncoding
+      , "auto-load-images"    , config->autoLoadImages
+      , "auto-shrink-images"  , config->autoShrinkImages
+      , "print-backgrounds"   , config->printBackgrounds
+diff -Nurd midori-0.0.17/src/prefs.c midori/src/prefs.c
+--- midori-0.0.17/src/prefs.c	2008-01-23 05:10:45.000000000 +0100
++++ midori/src/prefs.c	2008-03-05 10:43:08.031832796 +0100
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>
++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de>
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+@@ -15,7 +15,8 @@
+ #include "global.h"
+ #include "sokoke.h"
+ 
+-#include "string.h"
++#include <stdlib.h>
++#include <string.h>
+ 
+ static gboolean on_prefs_homepage_focus_out(GtkWidget* widget
+  , GdkEventFocus event, CPrefs* prefs)
+@@ -29,11 +30,65 @@
+     config->startup = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
+ }
+ 
++static void on_prefs_defaultFont_changed(GtkWidget* widget, CPrefs* prefs)
++{
++    const gchar* font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget));
++    gchar** components = g_strsplit(font, " ", 0);
++    guint i, n = g_strv_length(components) - 1;
++    GString* fontName = g_string_new(NULL);
++    for(i = 0; i < n; i++)
++        g_string_append_printf(fontName, "%s ", components[i]);
++    katze_assign(config->defaultFontFamily, g_string_free(fontName, FALSE));
++    config->defaultFontSize = atoi(components[n]);
++    g_strfreev(components);
++    g_object_set(webSettings, "default-font-family", config->defaultFontFamily
++     , "default-font-size", config->defaultFontSize, NULL);
++}
++
++static void on_prefs_minimumFontSize_changed(GtkWidget* widget, CPrefs* prefs)
++{
++    config->minimumFontSize = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget));
++    g_object_set(webSettings, "minimum-font-size", config->minimumFontSize, NULL);
++}
++
++static void on_prefs_defaultEncoding_changed(GtkWidget* widget, CPrefs* prefs)
++{
++    gchar* encoding;
++    switch(gtk_combo_box_get_active(GTK_COMBO_BOX(widget)))
++    {
++    case 0:
++        encoding = g_strdup("BIG5");
++        break;
++    case 1:
++        encoding = g_strdup("SHIFT_JIS");
++        break;
++    case 2:
++        encoding = g_strdup("KOI8-R");
++        break;
++    case 3:
++        encoding = g_strdup("UTF-8");
++        break;
++    case 4:
++        encoding = g_strdup("ISO-8859-1");
++        break;
++    default:
++        encoding = g_strdup("UTF-8");
++        g_warning("Invalid default encoding");
++    }
++    katze_assign(config->defaultEncoding, encoding);
++    g_object_set(webSettings, "default-encoding", config->defaultEncoding, NULL);
++}
++
+ static void on_prefs_newpages_changed(GtkWidget* widget, CPrefs* prefs)
+ {
+     config->newPages = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
+ }
+ 
++void on_prefs_middleClickGoto_toggled(GtkWidget* widget, CPrefs* prefs)
++{
++    config->middleClickGoto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
++}
++
+ void on_prefs_openTabsInTheBackground_toggled(GtkWidget* widget, CPrefs* prefs)
+ {
+     config->openTabsInTheBackground = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+@@ -302,7 +357,7 @@
+     #define WIDGET_ADD(__widget, __left, __right, __top, __bottom)\
+      gtk_table_attach(GTK_TABLE(table), __widget\
+       , __left, __right, __top, __bottom\
+-      , 0, GTK_FILL, 8, 2)
++      , GTK_FILL, GTK_FILL, 8, 2)
+     #define FILLED_ADD(__widget, __left, __right, __top, __bottom)\
+      gtk_table_attach(GTK_TABLE(table), __widget\
+       , __left, __right, __top, __bottom\
+@@ -371,30 +426,42 @@
+     PAGE_NEW("Appearance");
+     FRAME_NEW("Font settings");
+     TABLE_NEW(5, 2);
+-    INDENTED_ADD(gtk_label_new("Standard font"), 0, 1, 0, 1);
+-    button = gtk_font_button_new_with_font("Sans 10"/*config->sFontStandard*/);
+-    gtk_widget_set_sensitive(button, FALSE); //...
++    INDENTED_ADD(gtk_label_new_with_mnemonic("Default _font"), 0, 1, 0, 1);
++    gchar* defaultFont = g_strdup_printf("%s %d"
++     , config->defaultFontFamily, config->defaultFontSize);
++    button = gtk_font_button_new_with_font(defaultFont);
++    g_free(defaultFont);
++    g_signal_connect(button, "font-set", G_CALLBACK(on_prefs_defaultFont_changed), prefs);
+     FILLED_ADD(button, 1, 2, 0, 1);
+-    INDENTED_ADD(gtk_label_new("Minimum font size"), 0, 1, 1, 2);
++    INDENTED_ADD(gtk_label_new_with_mnemonic("_Minimum font size"), 0, 1, 1, 2);
+     hbox = gtk_hbox_new(FALSE, 4);
+-    spinbutton = gtk_spin_button_new_with_range(5, 12, 1);
+-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 5/*config->iFontSizeMin*/);
+-    gtk_widget_set_sensitive(spinbutton, FALSE); //...
++    spinbutton = gtk_spin_button_new_with_range(1, G_MAXINT, 1);
++    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->minimumFontSize);
++    g_signal_connect(spinbutton, "value-changed"
++     , G_CALLBACK(on_prefs_minimumFontSize_changed), prefs);
+     gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0);
+     button = gtk_button_new_with_mnemonic("_Advanced");
+     gtk_widget_set_sensitive(button, FALSE); //...
+     gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4);
+     FILLED_ADD(hbox, 1, 2, 1, 2);
+-    INDENTED_ADD(gtk_label_new("Default encoding"), 0, 1, 2, 3);
++    INDENTED_ADD(gtk_label_new_with_mnemonic("Default _encoding"), 0, 1, 2, 3);
+     combobox = gtk_combo_box_new_text();
+-    const gchar* encoding = NULL; g_get_charset(&encoding);
+-    // TODO: Fallback to utf-8 if the encoding is not sane (e.g. when lang=C)
+-    gchar* sEncodingDefault = g_strdup_printf("System (%s)", encoding);
+     sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox)
+-     , sEncodingDefault, "Chinese", "Greek", "Japanese (SHIFT_JIS)"
+-     , "Korean", "Russian", "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL);
+-    gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); //...
+-    gtk_widget_set_sensitive(combobox, FALSE); //...
++     , "Chinese (BIG5)", "Japanese (SHIFT_JIS)", "Russian (KOI8-R)"
++     , "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL);
++    if(!strcmp(config->defaultEncoding, "BIG5"))
++        gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0);
++    else if(!strcmp(config->defaultEncoding, "SHIFT_JIS"))
++        gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1);
++    else if(!strcmp(config->defaultEncoding, "KOI8-R"))
++        gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 2);
++    else if(!strcmp(config->defaultEncoding, "UTF-8"))
++        gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 3);
++    else if(!strcmp(config->defaultEncoding, "ISO-8859-1"))
++        gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 4);
++    // FIXME: Provide a 'Custom' item
++    g_signal_connect(combobox, "changed"
++     , G_CALLBACK(on_prefs_defaultEncoding_changed), prefs);
+     FILLED_ADD(combobox, 1, 2, 2, 3);
+     button = gtk_button_new_with_label("Advanced settings");
+     gtk_widget_set_sensitive(button, FALSE); //...
+@@ -427,15 +494,19 @@
+     sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox)
+      , "New tab", "New window", "Current tab", NULL);
+     gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->newPages);
+-    g_signal_connect(combobox, "changed"
+-     , G_CALLBACK(on_prefs_newpages_changed), prefs);
++    g_signal_connect(combobox, "changed", G_CALLBACK(on_prefs_newpages_changed), prefs);
+     gtk_widget_set_sensitive(combobox, FALSE); //...
+     FILLED_ADD(combobox, 1, 2, 0, 1);
++    checkbutton = gtk_check_button_new_with_mnemonic("_Middle click goto");
++    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->middleClickGoto);
++    g_signal_connect(checkbutton, "toggled"
++     , G_CALLBACK(on_prefs_middleClickGoto_toggled), prefs);
++    INDENTED_ADD(checkbutton, 0, 1, 1, 2);
+     checkbutton = gtk_check_button_new_with_mnemonic("Open tabs in the _background");
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openTabsInTheBackground);
+     g_signal_connect(checkbutton, "toggled"
+      , G_CALLBACK(on_prefs_openTabsInTheBackground_toggled), prefs);
+-    SPANNED_ADD(checkbutton, 0, 2, 1, 2);
++    SPANNED_ADD(checkbutton, 1, 2, 1, 2);
+     checkbutton = gtk_check_button_new_with_mnemonic("Open popups in _tabs");
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openPopupsInTabs);
+     g_signal_connect(checkbutton, "toggled"
+@@ -448,7 +519,7 @@
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoLoadImages);
+     g_signal_connect(checkbutton, "toggled"
+      , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs);
+-    SPANNED_ADD(checkbutton, 0, 1, 0, 1);
++    INDENTED_ADD(checkbutton, 0, 1, 0, 1);
+     checkbutton = gtk_check_button_new_with_mnemonic("_Shrink images to fit");
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoShrinkImages);
+     g_signal_connect(checkbutton, "toggled"
+@@ -458,7 +529,7 @@
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->printBackgrounds);
+     g_signal_connect(checkbutton, "toggled"
+      , G_CALLBACK(on_prefs_printBackgrounds_toggled), prefs);
+-    SPANNED_ADD(checkbutton, 0, 1, 1, 2);
++    INDENTED_ADD(checkbutton, 0, 1, 1, 2);
+     checkbutton = gtk_check_button_new_with_mnemonic("_Resizable textareas");
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->resizableTextAreas);
+     g_signal_connect(checkbutton, "toggled"
+@@ -468,7 +539,7 @@
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableScripts);
+     g_signal_connect(checkbutton, "toggled"
+      , G_CALLBACK(on_prefs_enableJavaScript_toggled), prefs);
+-    SPANNED_ADD(checkbutton, 0, 1, 2, 3);
++    INDENTED_ADD(checkbutton, 0, 1, 2, 3);
+     checkbutton = gtk_check_button_new_with_mnemonic("Enable _plugins");
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enablePlugins);
+     g_signal_connect(checkbutton, "toggled"
+@@ -504,7 +575,7 @@
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarSmall);
+     g_signal_connect(checkbutton, "toggled"
+      , G_CALLBACK(on_prefs_toolbarSmall_toggled), prefs);
+-    SPANNED_ADD(checkbutton, 0, 1, 1, 2);
++    INDENTED_ADD(checkbutton, 0, 1, 1, 2);
+     checkbutton = gtk_check_button_new_with_mnemonic("Show web_search");
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarWebSearch);
+     g_signal_connect(checkbutton, "toggled"
+@@ -514,42 +585,34 @@
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarNewTab);
+     g_signal_connect(checkbutton, "toggled"
+      , G_CALLBACK(on_prefs_toolbarNewTab_toggled), prefs);
+-    SPANNED_ADD(checkbutton, 0, 1, 2, 3);
++    INDENTED_ADD(checkbutton, 0, 1, 2, 3);
+     checkbutton = gtk_check_button_new_with_mnemonic("Show _closed tabs button");
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarClosedTabs);
+     g_signal_connect(checkbutton, "toggled"
+      , G_CALLBACK(on_prefs_toolbarClosedTabs_toggled), prefs);
+     SPANNED_ADD(checkbutton, 1, 2, 2, 3);
+     FRAME_NEW("Miscellaneous");
+-    TABLE_NEW(3, 2);
+-    checkbutton = gtk_check_button_new_with_mnemonic
+-     ("Show close _buttons on tabs");
++    TABLE_NEW(2, 2);
++    checkbutton = gtk_check_button_new_with_mnemonic("Close _buttons on tabs");
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->tabClose);
+     g_signal_connect(checkbutton, "toggled"
+      , G_CALLBACK(on_prefs_tabClose_toggled), prefs);
+-    SPANNED_ADD(checkbutton, 0, 1, 0, 1);
++    INDENTED_ADD(checkbutton, 0, 1, 0, 1);
+     hbox = gtk_hbox_new(FALSE, 4);
+     gtk_box_pack_start(GTK_BOX(hbox)
+-     , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 0);
++     , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 4);
+     spinbutton = gtk_spin_button_new_with_range(0, 36, 1);
+     gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->tabSize);
+     g_signal_connect(spinbutton, "changed"
+      , G_CALLBACK(on_prefs_tabSize_changed), prefs);
+     gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0);
+     FILLED_ADD(hbox, 1, 2, 0, 1);
+-    INDENTED_ADD(gtk_label_new_with_mnemonic("Tabbar _placement"), 0, 1, 1, 2);
+-    combobox = gtk_combo_box_new_text();
+-    sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox)
+-     , "Left", "Top", "Right", "Bottom", NULL);
+-    gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); //...
+-    gtk_widget_set_sensitive(combobox, FALSE); //...
+-    FILLED_ADD(combobox, 1, 2, 1, 2);
+-    INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 2, 3);
++    INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 1, 2);
+     entry = gtk_entry_new();
+     gtk_entry_set_text(GTK_ENTRY(entry), config->locationSearch);
+     g_signal_connect(entry, "focus-out-event"
+      , G_CALLBACK(on_prefs_locationsearch_focus_out), prefs);
+-    FILLED_ADD(entry, 1, 2, 2, 3);
++    FILLED_ADD(entry, 1, 2, 1, 2);
+ 
+     // Page "Network"
+     PAGE_NEW("Network");
+diff -Nurd midori-0.0.17/src/ui.h midori/src/ui.h
+--- midori-0.0.17/src/ui.h	2008-01-20 19:16:17.000000000 +0100
++++ midori/src/ui.h	2008-03-05 10:43:08.071832738 +0100
+@@ -91,9 +91,8 @@
+     "<menuitem action='ZoomOut'/>"
+     "<menuitem action='ZoomNormal'/>"
+     "<separator/>"
+-    "<menuitem action='BackgroundImage'/>"
+     "<menuitem action='SourceView'/>"
+-    "<menuitem action='Properties'/>"
++    "<menuitem action='Fullscreen'/>"
+    "</menu>"
+    "<menu action='Go'>"
+     "<menuitem action='Back'/>"
+diff -Nurd midori-0.0.17/src/webSearch.h midori/src/webSearch.h
+--- midori-0.0.17/src/webSearch.h	2007-12-15 04:09:47.000000000 +0100
++++ midori/src/webSearch.h	2008-03-05 10:43:08.071832738 +0100
+@@ -16,7 +16,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <libsexy/sexy.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ // -- Types
+ 
+diff -Nurd midori-0.0.17/src/webView.c midori/src/webView.c
+--- midori-0.0.17/src/webView.c	2008-01-13 02:47:38.000000000 +0100
++++ midori/src/webView.c	2008-03-05 10:43:08.071832738 +0100
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2007 Christian Dywan <christian@twotoasts.de>
++ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de>
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+@@ -251,6 +251,27 @@
+     return FALSE;
+ }
+ 
++gboolean on_webView_button_press_after(GtkWidget* webView, GdkEventButton* event
++ , CBrowser* browser)
++{
++    if(event->button == 2 && config->middleClickGoto)
++    {
++        GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
++        gchar* text = gtk_clipboard_wait_for_text(clipboard);
++        gchar* uri = NULL;
++        if(text && strchr(text, '.') && !strchr(text, ' '))
++            uri = magic_uri(text, FALSE);
++        g_free(text);
++        if(uri)
++        {
++            webkit_web_view_open(WEBKIT_WEB_VIEW(browser->webView), uri);
++            g_free(uri);
++            return TRUE;
++        }
++    }
++    return FALSE;
++}
++
+ void on_webView_popup(GtkWidget* webView, CBrowser* browser)
+ {
+     webView_popup(webView, NULL, browser);
+diff -Nurd midori-0.0.17/src/webView.h midori/src/webView.h
+--- midori-0.0.17/src/webView.h	2008-01-04 08:46:44.000000000 +0100
++++ midori/src/webView.h	2008-03-05 10:43:08.071832738 +0100
+@@ -16,7 +16,7 @@
+ #include "browser.h"
+ #include "debug.h"
+ 
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ WebKitNavigationResponse
+ on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame
+@@ -60,6 +60,9 @@
+ gboolean
+ on_webView_button_press(GtkWidget*, GdkEventButton*, CBrowser*);
+ 
++gboolean
++on_webView_button_press_after(GtkWidget*, GdkEventButton*, CBrowser*);
++
+ void
+ on_webView_popup(GtkWidget*, CBrowser*);
+ 
+--- midori-0.0.17/configure.in	2008-01-24 03:47:18.000000000 +0100
++++ midori/configure.in	2008-03-05 10:43:08.025165254 +0100
+@@ -52,15 +52,15 @@
+ GTK_VER=`pkg-config --modversion gtk+-2.0`
+ AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version])
+ 
+-# Checks for WebKitGtk
+-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false)
++# Checks for WebKit
++PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false)
+ if test "x${have_webkit}" = "xfalse" ; then
+-    AC_MSG_ERROR([No WebKitGtk package information found])
++    AC_MSG_ERROR([No WebKit package information found])
+ fi
+ AC_SUBST(WEBKIT_CFLAGS)
+ AC_SUBST(WEBKIT_LIBS)
+-WEBKIT_VER=`pkg-config --modversion WebKitGtk`
+-AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version])
++WEBKIT_VER=`pkg-config --modversion webkit-1.0`
++AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKIT_VER", [WebKit version])
+ 
+ # Checks for libsexy
+ PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false)
diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc
index 77797151ff..e3a682bae4 100644
--- a/packages/gypsy/gypsy.inc
+++ b/packages/gypsy/gypsy.inc
@@ -13,4 +13,8 @@ do_configure_prepend () {
 	touch ${S}/gtk-doc.make
 }
 
+do_stage() {
+	autotools_stage_all
+}
+
 FILES_${PN} += "${datadir}/dbus-1/services/"
diff --git a/packages/gypsy/gypsy_svn.bb b/packages/gypsy/gypsy_svn.bb
index 116d39bb4f..45e283b6b7 100644
--- a/packages/gypsy/gypsy_svn.bb
+++ b/packages/gypsy/gypsy_svn.bb
@@ -3,7 +3,7 @@ require gypsy.inc
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \
-           file://fixups.patch;patch=1"
+           file://fixups.patch;patch=1;maxrev=107"
 
 PV = "0.0+svnr${SRCREV}"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/icu/files/.mtn2git_empty b/packages/icu/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/icu/files/.mtn2git_empty
diff --git a/packages/icu/files/use-g++-for-linking.patch b/packages/icu/files/use-g++-for-linking.patch
new file mode 100644
index 0000000000..4702abc065
--- /dev/null
+++ b/packages/icu/files/use-g++-for-linking.patch
@@ -0,0 +1,67 @@
+---
+ tools/genccode/Makefile.in |    2 +-
+ tools/gencmn/Makefile.in   |    2 +-
+ tools/genrb/Makefile.in    |    2 +-
+ tools/pkgdata/Makefile.in  |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- source.orig/tools/genccode/Makefile.in
++++ source/tools/genccode/Makefile.in
+@@ -76,11 +76,11 @@ check-local: all-local
+ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) \
+ 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ $(TARGET) : $(OBJECTS)
+-	$(LINK.c) $(OUTOPT)$@ $^ $(LIBS)
++	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 
+ 
+ %.$(SECTION): $(srcdir)/%.$(SECTION).in
+ 	cd $(top_builddir) \
+ 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+--- source.orig/tools/gencmn/Makefile.in
++++ source/tools/gencmn/Makefile.in
+@@ -76,11 +76,11 @@ check-local: all-local
+ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) \
+ 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ $(TARGET) : $(OBJECTS)
+-	$(LINK.c) $(OUTOPT)$@ $^ $(LIBS)
++	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 
+ %.$(SECTION): $(srcdir)/%.$(SECTION).in
+ 	cd $(top_builddir) \
+ 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+--- source.orig/tools/genrb/Makefile.in
++++ source/tools/genrb/Makefile.in
+@@ -84,11 +84,11 @@ Makefile: $(srcdir)/Makefile.in  $(top_b
+ 
+ $(TARGET) : $(OBJECTS)
+ 	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) 
+ 
+ $(DERB) : $(DERB_OBJ)
+-	$(LINK.c) $(OUTOPT)$@ $^ $(LIBS) 
++	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 
+ 
+ # This line is needed to serialize builds when the gmake -j option is used.
+ $(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION)
+ 
+--- source.orig/tools/pkgdata/Makefile.in
++++ source/tools/pkgdata/Makefile.in
+@@ -81,11 +81,11 @@ check-local: all-local
+ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) \
+ 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ $(TARGET) : $(OBJECTS)
+-	$(LINK.c) $(OUTOPT)$@ $^ $(LIBS) 
++	$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
+ 
+ 
+ %.$(SECTION): $(srcdir)/%.$(SECTION).in
+ 	cd $(top_builddir) \
+ 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/packages/icu/icu-3.6.inc b/packages/icu/icu-3.6.inc
index b9031e202a..ec95cabb84 100644
--- a/packages/icu/icu-3.6.inc
+++ b/packages/icu/icu-3.6.inc
@@ -5,6 +5,8 @@ SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-s
 
 S = "${WORKDIR}/icu/source"
 
+PARALLEL_MAKE = ""
+
 inherit autotools pkgconfig binconfig
 
 do_configure() {
diff --git a/packages/icu/icu_3.6.bb b/packages/icu/icu_3.6.bb
index 2e8dca925e..91b25adbe9 100644
--- a/packages/icu/icu_3.6.bb
+++ b/packages/icu/icu_3.6.bb
@@ -1,8 +1,9 @@
 require icu-3.6.inc
 
 DEPENDS += "icu-native"
+PR = "r3"
 
-PR = "r2"
+SRC_URI += "file://use-g++-for-linking.patch;patch=1"
 
 do_configure_append() {
         for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do
@@ -13,6 +14,10 @@ do_configure_append() {
 	sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true
 }
 
+do_compile() {
+	oe_runmake 'CXX=${CXX}'
+}
+
 do_install_append() {
         chmod +x ${D}${libdir}/lib*
 }
diff --git a/packages/kismet/kismet-2007-10-R1/.mtn2git_empty b/packages/kismet/kismet-2007-10-R1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/kismet-2007-10-R1/.mtn2git_empty
diff --git a/packages/kismet/kismet.inc b/packages/kismet/kismet.inc
index 57298c5c00..efc987cf0c 100644
--- a/packages/kismet/kismet.inc
+++ b/packages/kismet/kismet.inc
@@ -11,6 +11,9 @@ EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
 
 inherit autotools
 
+# .depend is needed by the main compile but can run in parallel
+PARALLE_MAKE = ""
+
 fakeroot do_install() {
      oe_runmake "DESTDIR=${D}" suidinstall
 }
diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb
index ef1cf86c98..4786543ec8 100644
--- a/packages/kismet/kismet_2007-10-R1.bb
+++ b/packages/kismet/kismet_2007-10-R1.bb
@@ -1,3 +1,5 @@
 require kismet.inc
 
-PR = "r3"
+SRC_URI += "file://fix_strip.patch;patch=1"
+
+PR = "r5"
diff --git a/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch b/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch
index dd5917e900..a4e5a65d65 100644
--- a/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch
+++ b/packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch
@@ -44,6 +44,6 @@ Index: libgcrypt-1.4.0/src/libgcrypt.pc.in
 +Description: GNU crypto library
 +URL: http://www.gnupg.org
 +Version: @VERSION@
-+Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@
-+Libs.private: @GPG_ERROR_LIBS@
-+Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@
++Libs: -L${libdir} -lgcrypt
++Libs.private: -L${libdir} -lgpg-error
++Cflags: -I${includedir} 
diff --git a/packages/libgcrypt/libgcrypt_1.4.0.bb b/packages/libgcrypt/libgcrypt_1.4.0.bb
index 2fe98d62e3..db3389b80e 100644
--- a/packages/libgcrypt/libgcrypt_1.4.0.bb
+++ b/packages/libgcrypt/libgcrypt_1.4.0.bb
@@ -1,3 +1,3 @@
 require libgcrypt.inc
 
-PR = "r2"
+PR = "r3"
diff --git a/packages/libsexy/files/.mtn2git_empty b/packages/libsexy/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsexy/files/.mtn2git_empty
diff --git a/packages/libsexy/files/libsexy-pkgconfig-fixes.patch b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch
new file mode 100644
index 0000000000..61da9474df
--- /dev/null
+++ b/packages/libsexy/files/libsexy-pkgconfig-fixes.patch
@@ -0,0 +1,15 @@
+Index: libsexy-0.1.11/libsexy.pc.in
+===================================================================
+--- libsexy-0.1.11.orig/libsexy.pc.in	2005-11-10 10:21:18.000000000 +0000
++++ libsexy-0.1.11/libsexy.pc.in	2008-03-05 14:36:39.000000000 +0000
+@@ -6,7 +6,8 @@
+ Name: libsexy
+ Description: Doing naughty things to good widgets
+ Version: @VERSION@
+-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
+-Cflags: -I${includedir} @PACKAGE_CFLAGS@
+ 
++Requires: pango glib-2.0 gtk+-2.0 libxml-2.0
++Libs: -L${libdir} -lsexy 
++Cflags: -I${includedir}
+ 
diff --git a/packages/libsexy/libsexy.inc b/packages/libsexy/libsexy.inc
index 522b7e0d63..27816c0800 100644
--- a/packages/libsexy/libsexy.inc
+++ b/packages/libsexy/libsexy.inc
@@ -5,7 +5,8 @@ SECTION = "x11/libs"
 
 DEPENDS = "gtk+ enchant libxml2"
 
-SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \
+           file://libsexy-pkgconfig-fixes.patch;patch=1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb
index 042ea757e9..91784ffb49 100644
--- a/packages/libsexy/libsexy_0.1.11.bb
+++ b/packages/libsexy/libsexy_0.1.11.bb
@@ -1,2 +1,2 @@
 require libsexy.inc
-PR = "r0"
+PR = "r1"
diff --git a/packages/libspiff/files/autofoo.patch b/packages/libspiff/files/autofoo.patch
index 2fcd7ebb47..5f96a2c217 100644
--- a/packages/libspiff/files/autofoo.patch
+++ b/packages/libspiff/files/autofoo.patch
@@ -1,17 +1,15 @@
-Index: libspiff-0.7.2/configure.in
+Index: libspiff-0.8.2/configure.in
 ===================================================================
---- libspiff-0.7.2.orig/configure.in	2007-08-25 15:47:29.000000000 +0000
-+++ libspiff-0.7.2/configure.in	2007-08-25 15:47:48.000000000 +0000
-@@ -78,26 +78,6 @@
- 	LDFLAGS="-L${withval} ${LDFLAGS}"
- ], [])
+--- libspiff-0.8.2.orig/configure.in
++++ libspiff-0.8.2/configure.in
+@@ -80,24 +80,6 @@ AC_ARG_WITH(uriparser-lib, [  --with-uri
+ 
+ 
  
--
--
 -# Local headers must come very first. Otherwise we
 -# risk including headers of an already installed
 -# libSpiff version if its path is in CPPFLAGS
--CPPFLAGS="-Iinclude ${CPPFLAGS}"
+-CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
 -
 -
 -
diff --git a/packages/libspiff/libspiff_0.7.2.bb b/packages/libspiff/libspiff_0.8.2.bb
index 06be4b3aa4..06be4b3aa4 100644
--- a/packages/libspiff/libspiff_0.7.2.bb
+++ b/packages/libspiff/libspiff_0.8.2.bb
diff --git a/packages/libxslt/libxslt_1.1.22.bb b/packages/libxslt/libxslt_1.1.22.bb
new file mode 100644
index 0000000000..53348becc9
--- /dev/null
+++ b/packages/libxslt/libxslt_1.1.22.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "GNOME XSLT library"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libxml2 (>=2.6.27)"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+
+# Something is wrong inside configure.ac, so we need to resort to sed in this stage :(
+# Koen - 20080305
+do_compile_append() {
+	sed -i -e s:-L${STAGING_LIBDIR}::g  libexslt.pc
+	sed -i -e s:-L${STAGING_LIBDIR}::g  libxslt.pc
+} 
+
+do_stage () {
+	autotools_stage_all
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
diff --git a/packages/linux-libc-headers/linux-libc-headers.inc b/packages/linux-libc-headers/linux-libc-headers.inc
index d9f4d687ee..aaf528dfb5 100644
--- a/packages/linux-libc-headers/linux-libc-headers.inc
+++ b/packages/linux-libc-headers/linux-libc-headers.inc
@@ -1,3 +1,6 @@
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 SECTION = "devel"
 LICENSE = "GPL"
+
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
index 595edde810..0e5debcfa3 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
diff --git a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig
index 418a1b4402..cfc7babcef 100644
--- a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig
+++ b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig
@@ -1031,14 +1031,15 @@ CONFIG_I2C_PXA=m
 #
 # Miscellaneous I2C Chip support
 #
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_TSC2003 is not set
+CONFIG_SENSORS_DS1337=m
+CONFIG_SENSORS_DS1374=m
+CONFIG_SENSORS_EEPROM=m
+CONFIG_SENSORS_PCF8574=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_TSC2003=m
+CONFIG_SENSORS_TSC2003_SYSFS=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1157,8 +1158,8 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
 # CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_6x11 is not set
-CONFIG_FONT_7x14=y
+CONFIG_FONT_6x11=y
+# CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_ACORN_8x8 is not set
 # CONFIG_FONT_MINI_4x6 is not set
diff --git a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig-nofb b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig-nofb
index 22e0ef0413..3840a395df 100644
--- a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig-nofb
+++ b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig-nofb
@@ -1031,14 +1031,15 @@ CONFIG_I2C_PXA=m
 #
 # Miscellaneous I2C Chip support
 #
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_TSC2003 is not set
+CONFIG_SENSORS_DS1337=m
+CONFIG_SENSORS_DS1374=m
+CONFIG_SENSORS_EEPROM=m
+CONFIG_SENSORS_PCF8574=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_TSC2003=m
+CONFIG_SENSORS_TSC2003_SYSFS=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
diff --git a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig
index 5a8728d26a..70a733a15c 100644
--- a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig
+++ b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig
@@ -1058,13 +1058,13 @@ CONFIG_I2C_PXA=m
 #
 # Miscellaneous I2C Chip support
 #
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
+CONFIG_SENSORS_DS1337=m
+CONFIG_SENSORS_DS1374=m
+CONFIG_SENSORS_EEPROM=m
+CONFIG_SENSORS_PCF8574=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_MAX6875=m
 CONFIG_SENSORS_TSC2003=m
 CONFIG_SENSORS_TSC2003_SYSFS=m
 # CONFIG_I2C_DEBUG_CORE is not set
@@ -1187,8 +1187,8 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
 # CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_6x11 is not set
-CONFIG_FONT_7x14=y
+CONFIG_FONT_6x11=y
+# CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_ACORN_8x8 is not set
 # CONFIG_FONT_MINI_4x6 is not set
@@ -1244,7 +1244,7 @@ CONFIG_SND_PXA2XX_AC97=m
 #
 # USB devices
 #
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=m
 
 #
 # PCMCIA devices
@@ -1426,7 +1426,7 @@ CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 # CONFIG_USB_SERIAL_TI is not set
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_SERIAL_OMNINET is not set
 # CONFIG_USB_SERIAL_DEBUG is not set
 CONFIG_USB_EZUSB=y
diff --git a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig-nofb b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig-nofb
index 0634a90a94..144b3c6e3a 100644
--- a/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig-nofb
+++ b/packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig-nofb
@@ -1058,13 +1058,13 @@ CONFIG_I2C_PXA=m
 #
 # Miscellaneous I2C Chip support
 #
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
+CONFIG_SENSORS_DS1337=m
+CONFIG_SENSORS_DS1374=m
+CONFIG_SENSORS_EEPROM=m
+CONFIG_SENSORS_PCF8574=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_MAX6875=m
 CONFIG_SENSORS_TSC2003=m
 CONFIG_SENSORS_TSC2003_SYSFS=m
 # CONFIG_I2C_DEBUG_CORE is not set
@@ -1244,7 +1244,7 @@ CONFIG_SND_PXA2XX_AC97=m
 #
 # USB devices
 #
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=m
 
 #
 # PCMCIA devices
@@ -1426,7 +1426,7 @@ CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 # CONFIG_USB_SERIAL_TI is not set
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_SERIAL_OMNINET is not set
 # CONFIG_USB_SERIAL_DEBUG is not set
 CONFIG_USB_EZUSB=y
diff --git a/packages/linux/gumstix-kernel-2.6.21/one-wire.patch b/packages/linux/gumstix-kernel-2.6.21/one-wire.patch
new file mode 100644
index 0000000000..b4994c3e61
--- /dev/null
+++ b/packages/linux/gumstix-kernel-2.6.21/one-wire.patch
@@ -0,0 +1,35 @@
+--- linux-2.6.21/drivers/w1/w1.c
++++ linux-2.6.21/drivers/w1/w1.c
+@@ -675,7 +675,6 @@ static void w1_slave_found(void *data, u64 rn)
+ 	struct w1_slave *sl;
+ 	struct list_head *ent;
+ 	struct w1_reg_num *tmp;
+-	int family_found = 0;
+ 	struct w1_master *dev;
+ 	u64 rn_le = cpu_to_le64(rn);
+ 
+@@ -698,9 +697,6 @@ static void w1_slave_found(void *data, u64 rn)
+ 		    sl->reg_num.crc == tmp->crc) {
+ 			set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
+ 			break;
+-		} else if (sl->reg_num.family == tmp->family) {
+-			family_found = 1;
+-			break;
+ 		}
+ 
+ 		slave_count++;
+@@ -874,11 +874,9 @@ void w1_search_process(struct w1_master *dev, u8 search_type)
+	w1_search_devices(dev, search_type, w1_slave_found);
+
+	list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
+-		if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl) {
++		if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl)
+			w1_slave_detach(sl);
+-
+-			dev->slave_count--;
+-		} else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
++		else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
+			sl->ttl = dev->slave_ttl;
+	}
+
+
diff --git a/packages/linux/gumstix-kernel-2.6.21/pxafb-backto16.patch b/packages/linux/gumstix-kernel-2.6.21/pxafb-backto16.patch
new file mode 100644
index 0000000000..a8b91daf37
--- /dev/null
+++ b/packages/linux/gumstix-kernel-2.6.21/pxafb-backto16.patch
@@ -0,0 +1,40 @@
+--- linux-2.6.21/arch/arm/mach-pxa/gumstix.c-orig	2008-02-20 16:18:57.000000000 -0800
++++ linux-2.6.21/arch/arm/mach-pxa/gumstix.c	2008-02-20 16:21:21.000000000 -0800
+@@ -146,8 +146,7 @@
+ 	.pixclock	= 110000,
+ 	.xres		= 480,
+ 	.yres		= 272,
+-	.bpp		= 18,
+-	.nonstd		= 24,
++	.bpp		= 16,
+ 	.hsync_len	= 41,
+ 	.left_margin	= 2,
+ 	.right_margin	= 2,
+@@ -161,7 +160,7 @@
+ 	.modes			= &gumstix_fb_mode,
+ 	.num_modes		= 1,
+ 	.lccr0			= LCCR0_Act | LCCR0_Sngl | LCCR0_Color,
+-	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (3 << 30),
++	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (0 << 30),
+ 	.pxafb_backlight_power	= &gumstix_lcd_backlight,
+ };
+ #elif defined(CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C)
+@@ -175,8 +174,7 @@
+ 	.vsync_len	= 10, // VLW from datasheet: 10 typ
+ 	.upper_margin	= 2, // VBP - VLW from datasheet: 12 - 10 = 2
+ 	.lower_margin	= 4, // VFP from datasheet: 4 typ
+-	.bpp		= 18,
+-	.nonstd		= 24,
++	.bpp		= 16,
+ 	.sync		= 0, // Hsync and Vsync both active low
+ };
+ 
+@@ -184,7 +182,7 @@
+ 	.modes			= &gumstix_fb_mode,
+ 	.num_modes		= 1,
+ 	.lccr0			= LCCR0_Act | LCCR0_Sngl | LCCR0_Color,
+-	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (3 << 30),
++	.lccr3			= LCCR3_OutEnH | LCCR3_PixFlEdg | (0 << 30),
+ 	.pxafb_backlight_power	= &gumstix_lcd_backlight,
+ };
+ #endif
diff --git a/packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch b/packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch
new file mode 100644
index 0000000000..0d4425412c
--- /dev/null
+++ b/packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch
@@ -0,0 +1,58 @@
+--- linux-2.6.21/drivers/net/gumstix-smc91x.c-orig	2008-02-24 22:06:30.000000000 -0800
++++ linux-2.6.21/drivers/net/gumstix-smc91x.c	2008-02-25 08:12:57.000000000 -0800
+@@ -90,18 +90,42 @@
+ 	pxa_gpio_mode(GPIO49_nPWE_MD);
+ 
+ 	pxa_gpio_mode(GPIO78_nCS_2_MD);
+-	// If either if statement fails, then we'll drop out and turn_off_eth1,
++
++  // First look for smc91x0
++	// If either if statement fails, then we'll drop out and turn_off_eth0,
++	// if both succeed, then we'll skip that and just proceed
++  // to test for 2 smc91x chips
++	if(request_mem_region(gumstix_smc91x0_resources[0].start, SMC_IO_EXTENT, "smc91x0 probe"))
++	{
++		ioaddr = ioremap(gumstix_smc91x0_resources[0].start, SMC_IO_EXTENT);
++		val = ioread16(ioaddr + BANK_SELECT);
++		iounmap(ioaddr);
++		release_mem_region(gumstix_smc91x0_resources[0].start, SMC_IO_EXTENT);
++		if ((val & 0xFF00) == 0x3300) {
++			goto proceed;
++		}
++	}
++
++  printk(KERN_ERR "%s: smc91x chip not found, returning -ENXIO\n", __FUNCTION__);
++  return -ENXIO;
++
++proceed:
++  printk(KERN_ERR "%s: smc91x chip found\n", __FUNCTION__);
++
++  // Now look for a second smc91x
++	// If either if statement fails, then we'll drop out and return -ENXIO
+ 	// if both succeed, then we'll skip that and just proceed with 2 cards
+-	if(request_mem_region(gumstix_smc91x1_resources[0].start, SMC_IO_EXTENT, "smc91x probe"))
++	if(request_mem_region(gumstix_smc91x1_resources[0].start, SMC_IO_EXTENT, "smc91x1 probe"))
+ 	{
+ 		ioaddr = ioremap(gumstix_smc91x1_resources[0].start, SMC_IO_EXTENT);
+ 		val = ioread16(ioaddr + BANK_SELECT);
+ 		iounmap(ioaddr);
+ 		release_mem_region(gumstix_smc91x1_resources[0].start, SMC_IO_EXTENT);
+ 		if ((val & 0xFF00) == 0x3300) {
+-			goto proceed;
++			goto proceed1;
+ 		}
+ 	}
++  
+ 
+ turn_off_eth1:
+ 	// This is apparently not an SMC91C111
+@@ -110,7 +134,8 @@
+ 	smc91x_devices[1] = NULL;
+ 	pxa_gpio_mode(78 | GPIO_IN);
+ 	
+-proceed:
++proceed1:
++  printk(KERN_ERR "%s: found %d smc91x chip(s)\n", __FUNCTION__);
+ 	pxa_gpio_mode(GPIO15_nCS_1_MD);
+ 
+ 	if(smc91x_devices[1]) pxa_gpio_mode(GPIO_GUMSTIX_ETH1_RST_MD);
diff --git a/packages/linux/gumstix-kernel-2.6.21/tsc2003.c b/packages/linux/gumstix-kernel-2.6.21/tsc2003.c
index d0f496617e..a4a68b756d 100644
--- a/packages/linux/gumstix-kernel-2.6.21/tsc2003.c
+++ b/packages/linux/gumstix-kernel-2.6.21/tsc2003.c
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2005 Bill Gatliff <bgat at billgatliff.com>
  *  Changes for 2.6.20 kernel by Nicholas Chen <nchen at cs.umd.edu>
+ *  Changes for 2.6.21 kernel by Chris Dollar <chris.dollar at gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -25,669 +26,442 @@
 #include <linux/delay.h>
 #include <asm-arm/arch-pxa/irqs.h>
 
-static unsigned short normal_i2c[]
-= {0x48, I2C_CLIENT_END };
+#define DRIVER_NAME "tsc2003"
+#define TSC2003_CMD(cn,pdn,m) (((cn) << 4) | ((pdn) << 2) | ((m) << 1))
+#define ADC_MAX ((1 << 12) - 1)
 
-I2C_CLIENT_INSMOD_1(tsc2003);
+//#define CONFIG_I2C_DEBUG_CHIP 1
 
-#define DRIVER_NAME "tsc2003"
+static unsigned short normal_i2c[] = { 0x48, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD_1(tsc2003);
 
 enum tsc2003_pd {
-  PD_POWERDOWN = 0, /* penirq */
-  PD_IREFOFF_ADCON = 1, /* no penirq */
-  PD_IREFON_ADCOFF = 2, /* penirq */
-  PD_IREFON_ADCON = 3, /* no penirq */
-  PD_PENIRQ_ARM = PD_IREFON_ADCOFF,
-  PD_PENIRQ_DISARM = PD_IREFON_ADCON,
+	PD_POWERDOWN = 0, /* penirq */
+	PD_IREFOFF_ADCON = 1, /* no penirq */
+	PD_IREFON_ADCOFF = 2, /* penirq */
+	PD_IREFON_ADCON = 3, /* no penirq */
+	PD_PENIRQ_ARM = PD_IREFON_ADCOFF,
+	PD_PENIRQ_DISARM = PD_IREFON_ADCON,
 };
 
 enum tsc2003_m {
-  M_12BIT = 0,
-  M_8BIT = 1
+	M_12BIT = 0,
+	M_8BIT = 1
 };
 
 enum tsc2003_cmd {
-  MEAS_TEMP0 = 0,
-  MEAS_VBAT1 = 1,
-  MEAS_IN1 = 2,
-  MEAS_TEMP1 = 4,
-  MEAS_VBAT2 = 5,
-  MEAS_IN2 = 6,
-  ACTIVATE_NX_DRIVERS = 8,
-  ACTIVATE_NY_DRIVERS = 9,
-  ACTIVATE_YNX_DRIVERS = 10,
-  MEAS_XPOS = 12,
-  MEAS_YPOS = 13,
-  MEAS_Z1POS = 14,
-  MEAS_Z2POS = 15
+	MEAS_TEMP0 = 0,
+	MEAS_VBAT1 = 1,
+	MEAS_IN1 = 2,
+	MEAS_TEMP1 = 4,
+	MEAS_VBAT2 = 5,
+	MEAS_IN2 = 6,
+	ACTIVATE_NX_DRIVERS = 8,
+	ACTIVATE_NY_DRIVERS = 9,
+	ACTIVATE_YNX_DRIVERS = 10,
+	MEAS_XPOS = 12,
+	MEAS_YPOS = 13,
+	MEAS_Z1POS = 14,
+	MEAS_Z2POS = 15
 };
 
-#define TSC2003_CMD(cn,pdn,m) (((cn) << 4) | ((pdn) << 2) | ((m) << 1))
-
-#define ADC_MAX ((1 << 12) - 1)
-
 struct tsc2003_data {
-  struct i2c_client client;
-  struct device_driver driver;
-  struct input_dev *idev;
-  struct timer_list penirq_timer;
-  struct semaphore sem;
-  struct task_struct *tstask;
-  struct completion tstask_completion;
-  struct completion penirq_completion;
-  enum tsc2003_pd pd;
-  enum tsc2003_m m;
-  int penirq;
-
-  int vbat1;
-  int vbat2;
-  int temp0;
-  int temp1;
-  int in1;
-  int in2;
+	struct i2c_client client;
+	struct device_driver driver;
+	struct input_dev *idev;
+	struct semaphore sem;
+	struct task_struct *tstask;
+	struct completion tstask_completion;
+	struct completion penirq_completion;
+	enum tsc2003_pd pd;
+	enum tsc2003_m m;
+	int penirq;
+
+	int vbat1;
+	int vbat2;
+	int temp0;
+	int temp1;
+	int in1;
+	int in2;
 };
 
-static int tsc2003_i2c_detect (struct i2c_adapter *adapter, int address, 
-int kind);
+static int
+		tsc2003_i2c_detect(struct i2c_adapter *adapter, int address, int kind);
 
-static inline int tsc2003_command (struct tsc2003_data *data,
-                                   enum tsc2003_cmd cmd,
-                                   enum tsc2003_pd pd)
-{
-  char c;
-  int ret;
-  down(&data->sem);
-  c = TSC2003_CMD(cmd, pd, data->m);
-  ret = i2c_master_send(&data->client, &c, 1);
-  up(&data->sem);
-  return ret;
-}
+static int tsc2003_read(struct tsc2003_data *data, enum tsc2003_cmd cmd,
+		enum tsc2003_pd pd, int *val) {
+	char c;
+	char d[2];
+	int ret;
 
-static int tsc2003_read (struct tsc2003_data *data,
-                         enum tsc2003_cmd cmd,
-                         enum tsc2003_pd pd,
-                         int *val)
-{
-  char c;
-  char d[2];
-  int ret;
-
-  c = TSC2003_CMD(cmd, pd, data->m);
-  ret = i2c_master_send(&data->client, &c, 1);
-  if (ret <= 0) goto err;
-
-  udelay(20);
-  ret = i2c_master_recv(&data->client, d, data->m == M_12BIT ? 2 : 1);
-  if (ret <= 0) goto err;
-
-  if (val)
-    {
-      *val = d[0];
-      *val <<= 4;
-      if (data->m == M_12BIT)
-        *val += (d[1] >> 4);
-    }
+	c = TSC2003_CMD(cmd, pd, data->m);
+	ret = i2c_master_send(&data->client, &c, 1);
+	if (ret <= 0)
+		goto err;
+
+	udelay(20);
+	ret = i2c_master_recv(&data->client, d, data->m == M_12BIT ? 2 : 1);
+	if (ret <= 0)
+		goto err;
+
+	if (val) {
+		*val = d[0];
+		*val <<= 4;
+		if (data->m == M_12BIT)
+			*val += (d[1] >> 4);
+	}
 
 #if defined(CONFIG_I2C_DEBUG_CHIP)
-  printk(KERN_ERR "%s: val[%x] = %d\n",
-         __FUNCTION__, cmd, (((int)d[0]) << 8) + d[1]);
+	printk(KERN_ERR "%s: val[%x] = %d\n",
+			__FUNCTION__, cmd, (((int)d[0]) << 8) + d[1]);
 #endif
 
-  return 0;
- err:
-  if (!ret) ret = -ENODEV;
-  return ret;
+	return 0;
+	err: if (!ret)
+		ret = -ENODEV;
+	return ret;
 }
 
-static inline int tsc2003_read_temp0 (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *t)
-{
-  return tsc2003_read(d, MEAS_TEMP0, pd, t);
+static inline int tsc2003_read_temp0(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *t) {
+	return tsc2003_read(d, MEAS_TEMP0, pd, t);
 }
 
-static inline int tsc2003_read_temp1 (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *t)
-{
-  return tsc2003_read(d, MEAS_TEMP1, pd, t);
+static inline int tsc2003_read_temp1(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *t) {
+	return tsc2003_read(d, MEAS_TEMP1, pd, t);
 }
 
-static inline int tsc2003_read_xpos (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *x)
-{
-  return tsc2003_read(d, MEAS_XPOS, pd, x);
+static inline int tsc2003_read_xpos(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *x) {
+	return tsc2003_read(d, MEAS_XPOS, pd, x);
 }
 
-static inline int tsc2003_read_ypos (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *y)
-{
-  return tsc2003_read(d, MEAS_YPOS, pd, y);
+static inline int tsc2003_read_ypos(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *y) {
+	return tsc2003_read(d, MEAS_YPOS, pd, y);
 }
 
-static inline int tsc2003_read_pressure (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *p)
-{
-  return tsc2003_read(d, MEAS_Z1POS, pd, p);
+static inline int tsc2003_read_pressure(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *p) {
+	return tsc2003_read(d, MEAS_Z1POS, pd, p);
 }
 
-static inline int tsc2003_read_in1 (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *t)
-{
-  return tsc2003_read(d, MEAS_IN1, pd, t);
+static inline int tsc2003_read_in1(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *t) {
+	return tsc2003_read(d, MEAS_IN1, pd, t);
 }
 
-static inline int tsc2003_read_in2 (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *t)
-{
-  return tsc2003_read(d, MEAS_IN2, pd, t);
+static inline int tsc2003_read_in2(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *t) {
+	return tsc2003_read(d, MEAS_IN2, pd, t);
 }
 
-static inline int tsc2003_read_vbat1 (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *t)
-{
-  return tsc2003_read(d, MEAS_VBAT1, pd, t);
+static inline int tsc2003_read_vbat1(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *t) {
+	return tsc2003_read(d, MEAS_VBAT1, pd, t);
 }
 
-static inline int tsc2003_read_vbat2 (struct tsc2003_data *d, enum 
-tsc2003_pd pd, int *t)
-{
-  return tsc2003_read(d, MEAS_VBAT2, pd, t);
+static inline int tsc2003_read_vbat2(struct tsc2003_data *d, enum
+tsc2003_pd pd, int *t) {
+	return tsc2003_read(d, MEAS_VBAT2, pd, t);
 }
 
-static inline int tsc2003_powerdown (struct tsc2003_data *d)
-{
-  /* we don't have a distinct powerdown command,
-     so do a benign read with the PD bits cleared */
-  return tsc2003_read(d, MEAS_IN1, PD_POWERDOWN, 0);
+static inline int tsc2003_powerdown(struct tsc2003_data *d) {
+	/* we don't have a distinct powerdown command,
+	 so do a benign read with the PD bits cleared */
+	return tsc2003_read(d, MEAS_IN1, PD_POWERDOWN, 0);
 }
 
-void tsc2003_init_client (struct i2c_client *client)
-{
-  struct tsc2003_data *data = i2c_get_clientdata(client);
+void tsc2003_init_client(struct i2c_client *client) {
+	struct tsc2003_data *data = i2c_get_clientdata(client);
 
-  data->pd = PD_PENIRQ_DISARM;
-  data->m = M_8BIT;
-  return;
+	data->pd = PD_PENIRQ_DISARM;
+	data->m = M_8BIT;
+	return;
 }
 
-#define PENUP_TIMEOUT 50 /* msec */
+static irqreturn_t tsc2003_penirq(int irq, void *v) {
+	struct tsc2003_data *d = v;
 
-static irqreturn_t tsc2003_penirq (int irq, void *v)
-{
-  struct tsc2003_data *d = v;
-  complete(&d->penirq_completion);
-  return IRQ_HANDLED;
-}
+	printk(KERN_INFO "penirq: %Ld\n", jiffies);
 
-/*
-static int tsc2003_remove (struct device *dev)
-{
-  struct tsc2003_data *d = container_of(dev->driver, struct tsc2003_data, driver);
-  free_irq(d->penirq,d);
-  input_unregister_device(d->idev);
-  return 0;
-}
-*/
+    // disable the penirq while we take the sample					
+	disable_irq_nosync(d->penirq);
 
-static void tsc2003_pen_up (unsigned long v)
-{
-  struct tsc2003_data *d = (struct tsc2003_data *)v;
-  input_report_abs(d->idev, ABS_PRESSURE, 0);
-  input_sync(d->idev);
-  return;
+	complete(&d->penirq_completion);
+	return IRQ_HANDLED;
 }
 
-static inline void tsc2003_restart_pen_up_timer (struct tsc2003_data *d)
-{
-  mod_timer(&d->penirq_timer, jiffies + (PENUP_TIMEOUT * HZ) / 1000);
+static void tsc2003_pen_up(unsigned long v) {
+    printk(KERN_INFO "tsc2003_pen_up - re-enable irq now\n");
+	struct tsc2003_data *d = (struct tsc2003_data *)v;
+
+    enable_irq(d->penirq);
+
+	input_report_abs(d->idev, ABS_PRESSURE, 0);
+	input_sync(d->idev);
+	return;
 }
 
-static int tsc2003ts_thread (void *v)
-{
-  struct tsc2003_data *d = v;
-  struct task_struct *tsk = current;
-  int ret;
-  
-  d->tstask = tsk;
+static int tsc2003ts_thread(void *v) {
+	struct tsc2003_data *d = v;
+	struct task_struct *tsk = current;
+	int ret;
+	int err = 0;
+
+	d->tstask = tsk;
 
-  daemonize(DRIVER_NAME "tsd");
-  allow_signal(SIGKILL);
+	daemonize(DRIVER_NAME "tsd");
+	allow_signal(SIGKILL);
 
-  complete(&d->tstask_completion);
+	complete(&d->tstask_completion);
 
 #if defined(CONFIG_I2C_DEBUG_CHIP)
-  printk(KERN_INFO "%s: address 0x%x\n",
-         __FUNCTION__, d->client.addr);
-#endif
+	printk(KERN_INFO "%s: address 0x%x\n",
+			__FUNCTION__, d->client.addr);
+#endif		
+			
+	do {
+      unsigned int x, y, p, fp;
+      int pen_is_up = 0;
+      
+      down(&d->sem);         
+
+      // take the sample
+      d->pd = PD_PENIRQ_DISARM;
+      tsc2003_read_xpos(d, PD_PENIRQ_DISARM, &x);
+      tsc2003_read_ypos(d, PD_PENIRQ_DISARM, &y);
+      tsc2003_read_pressure(d, PD_PENIRQ_DISARM, &p);
+
+      if (p < 64) {
+        p=0;
+      }
 
-  while (!signal_pending(tsk))
-    {
-      unsigned int x, y, p;
-     
-      if (!down_interruptible(&d->sem))
-        {
-          d->pd = PD_PENIRQ_DISARM;
-          disable_irq(d->penirq);
-          tsc2003_read_xpos(d, PD_PENIRQ_DISARM, &x);
-          tsc2003_read_ypos(d, PD_PENIRQ_DISARM, &y);
-          tsc2003_read_pressure(d, PD_PENIRQ_DISARM, &p);
-         
-          /* non-X-Y driver read to avoid glitch in penirq (errata?) */
-          tsc2003_read_vbat1(d, PD_PENIRQ_DISARM, 0);
-          enable_irq(d->penirq);
-         
-	  
-          input_report_abs(d->idev, ABS_X, 4096 - x);
-          input_report_abs(d->idev, ABS_Y, 4096 - y);
-          input_report_abs(d->idev, ABS_PRESSURE, p);
-         input_sync(d->idev);
-  
-         
-          do
-            {
-              ret = wait_for_completion_interruptible_timeout(&d->penirq_completion, HZ / 100);
-              if (ret)
-                {
-                  if (d->pd == PD_PENIRQ_DISARM)
-                    {
-                      /* fake penirq, avoid glitch and then start watching for real now */
-                      d->pd = PD_PENIRQ_ARM;
-                      tsc2003_read_vbat1(d, PD_PENIRQ_ARM, 0);
-                      up(&d->sem);
-                    }
-                  else
-                    {
-                      /* pen down event, (re)start the pen up timer */
-                      tsc2003_restart_pen_up_timer(d);
-                    }
-                }
-              else
-                {
-                  if (d->pd != PD_PENIRQ_ARM)
-                    {
-                      /* fake penirq never arrived, which would be the case
-                         for a level-triggered irq line */
-                      tsc2003_read_vbat1(d, PD_PENIRQ_ARM, 0);
-                      d->pd = PD_PENIRQ_ARM;
-                      up(&d->sem);
-                    }
-                  if (timer_pending(&d->penirq_timer))
-                    {
-                      /* pen is down, time to send (another) sample */
-                      break;
-                    }
-                  else
-                    {
-                      /* pen is up, nothing to do but wait for it to 
-			come down */			
-			wait_for_completion_interruptible(&d->penirq_completion);
-                      /* pen is down, (re)start the pen up timer */
-                      tsc2003_restart_pen_up_timer(d);
-                      break;
-                    }
-                }
-            }
-          while (!signal_pending(tsk));
-        }
-    }
-     
-  d->tstask = NULL;
-  complete_and_exit(&d->tstask_completion, 0);
-}
+#if defined(CONFIG_I2C_DEBUG_CHIP)
+      printk(KERN_INFO "TSD X: %d Y: %d P: %d\n", x, y, p);
+#endif		
+
+      if (!pen_is_up) {
+        // report our touch to the input layer
+        input_report_abs(d->idev, ABS_X, 4096 - x);
+        input_report_abs(d->idev, ABS_Y, 4096 - y);
+        input_report_abs(d->idev, ABS_PRESSURE, p);
+        input_sync(d->idev);
+      }
+
+      if(p == 0) {
+#if defined(CONFIG_I2C_DEBUG_CHIP)
+        printk(KERN_INFO "No pressure - pen is up!\n");
+#endif		
+        // set our pen as up
+        pen_is_up = 1;                            
+      }                    
+      else {                    
+#if defined(CONFIG_I2C_DEBUG_CHIP)
+        printk(KERN_INFO "Pen is still down - sleeping and will re-sample!\n");
+#endif		
+        // set our pen as down
+        pen_is_up = 0;                            
+      }
 
-static int tsc2003_idev_open (struct input_dev *idev)
-{
-  struct tsc2003_data *d = idev->private;
-  int ret = 0;
+      // sleep for 3 jiffies to give us about 30 updates/sec
+      msleep (3);
 
-  if (down_interruptible(&d->sem))
-    return -EINTR;
+      up(&d->sem);
 
-  if (d->tstask)
-    panic(DRIVER_NAME "tsd already running (!). abort.");
-  
-  d->penirq_timer.data = (unsigned long)d;
-  d->penirq_timer.function = tsc2003_pen_up;
+	} while (!signal_pending(tsk));
 
-  ret = kernel_thread(tsc2003ts_thread, d, CLONE_KERNEL);
-  if (ret >= 0)
-  {
-      wait_for_completion(&d->tstask_completion);
-      ret = 0;
-   }
+	d->tstask = NULL;
+	complete_and_exit(&d->tstask_completion, 0);
+}
 
-   
+static int tsc2003_idev_open(struct input_dev *idev) {
+	struct tsc2003_data *d = idev->private;
+	int ret = 0;
 
-  up(&d->sem);
-  return ret;
-}
+	if (down_interruptible(&d->sem))
+		return -EINTR;
 
-static void tsc2003_idev_close (struct input_dev *idev)
-{
-  struct tsc2003_data *d = idev->private;
-  down_interruptible(&d->sem);
-  if (d->tstask)
-    {
-      send_sig(SIGKILL, d->tstask, 1);
-      wait_for_completion(&d->tstask_completion);
-    }
-
-  if (timer_pending(&d->penirq_timer))
-    del_timer(&d->penirq_timer);
-  up(&d->sem);
-  return;
-}
+	if (d->tstask)
+		panic(DRIVER_NAME "tsd already running (!). abort.");
 
-#if defined(CONFIG_SYSFS) && defined(CONFIG_SENSORS_TSC2003_SYSFS)
-static ssize_t show_addr (struct device *dev, char *buf)
-{
-  struct tsc2003_data *d = container_of(dev->driver, struct 
-tsc2003_data, driver);
-  return sprintf(buf, "%d\n", d->client.addr);
-}
-static DEVICE_ATTR(addr, S_IRUGO, show_addr, NULL);
+	ret = kernel_thread(tsc2003ts_thread, d, CLONE_KERNEL);
+	if (ret >= 0) {
+		wait_for_completion(&d->tstask_completion);
+		ret = 0;
+	}
 
-static ssize_t show_vbat1 (struct device *dev, char *buf)
-{
-  struct tsc2003_data *d = container_of(dev->driver, struct 
-tsc2003_data, driver);
-  return sprintf(buf, "%d\n", d->vbat1);
+	up(&d->sem);
+	return ret;
 }
-static DEVICE_ATTR(vbat1, S_IRUGO, show_vbat1, NULL);
 
-static ssize_t show_vbat2 (struct device *dev, char *buf)
-{
-  struct tsc2003_data *d = container_of(dev->driver, struct 
-tsc2003_data, driver);
-  return sprintf(buf, "%d\n", d->vbat2);
-}
-static DEVICE_ATTR(vbat2, S_IRUGO, show_vbat2, NULL);
+static void tsc2003_idev_close(struct input_dev *idev) {
+	struct tsc2003_data *d = idev->private;
+	down_interruptible(&d->sem);
+	if (d->tstask) {
+		send_sig(SIGKILL, d->tstask, 1);
+		wait_for_completion(&d->tstask_completion);
+	}
 
-static ssize_t show_in1 (struct device *dev, char *buf)
-{
-  struct tsc2003_data *d = container_of(dev->driver, struct 
-tsc2003_data, driver);
-  return sprintf(buf, "%d\n", d->in1);
+	up(&d->sem);
+	return;
 }
-static DEVICE_ATTR(in1, S_IRUGO, show_in1, NULL);
 
-static ssize_t show_in2 (struct device *dev, char *buf)
-{
-  struct tsc2003_data *d = container_of(dev->driver, struct 
-tsc2003_data, driver);
-  return sprintf(buf, "%d\n", d->in2);
+static int tsc2003_detect_irq(struct tsc2003_data *d) {
+	d->penirq = IRQ_GPIO(16); //PWM0 GPIO
+	return 0;
 }
-static DEVICE_ATTR(in2, S_IRUGO, show_in2, NULL);
 
-static ssize_t show_temp0 (struct device *dev, char *buf)
-{
-  struct tsc2003_data *d = container_of(dev->driver, struct 
-tsc2003_data, driver);
-  return sprintf(buf, "%d\n", d->temp0);
-}
-static DEVICE_ATTR(temp0, S_IRUGO, show_temp0, NULL);
+static int tsc2003_driver_register(struct tsc2003_data *data) {
+	struct input_dev *idev;
+	int ret = 0;
+	int error;
 
-static ssize_t show_temp1 (struct device *dev, char *buf)
-{
-  struct tsc2003_data *d = container_of(dev->driver, struct 
-tsc2003_data, driver);
-  return sprintf(buf, "%d\n", d->temp1);
-}
-static DEVICE_ATTR(temp1, S_IRUGO, show_temp1, NULL);
+	init_MUTEX(&data->sem);
 
-#warning "TODO: this daemon sometimes hangs the touchscreen daemon"
-#warning "TODO: under periods of heavy touch screen activity."
-#warning "TODO: Use with caution until the bug is squashed."
-static int tsc2003s_thread (void *v)
-{
-  struct tsc2003_data *d = v;
-
-  daemonize(DRIVER_NAME "sd");
-  allow_signal(SIGKILL);
-
-  printk(KERN_INFO "%s: address 0x%x\n",
-         __FUNCTION__, d->client.addr);
-
-  while (!signal_pending(current))
-    {
-      if (!down_interruptible(&d->sem))
-        {
-          if (!timer_pending(&d->penirq_timer))
-            {
-              tsc2003_read_vbat1(d, d->pd, &d->vbat1);
-              tsc2003_read_vbat2(d, d->pd, &d->vbat2);
-              tsc2003_read_in1(d, d->pd, &d->in1);
-              tsc2003_read_in2(d, d->pd, &d->in2);
-              tsc2003_read_temp0(d, d->pd, &d->temp0);
-              tsc2003_read_temp1(d, d->pd, &d->temp1);
-            }
-          up(&d->sem);
-        }
-      set_task_state(current, TASK_INTERRUPTIBLE);
-      schedule_timeout(5 * HZ);
-    }
-  do_exit(0);
-}
-#endif
+	error = tsc2003_detect_irq(data);
+	if (error) {
+		printk(KERN_ERR "TSC2003: IRQ probe failed\n");
+	}
 
-static int tsc2003_detect_irq (struct tsc2003_data *d)
-{
-	d->penirq = IRQ_GPIO(16);	//PWM0 GPIO
-	return 0;
-}
+	if (data->penirq) {
+		ret = request_irq(data->penirq, tsc2003_penirq, SA_INTERRUPT | IRQF_TRIGGER_LOW,
+				DRIVER_NAME, data);
+		if (!ret) {
+			printk(KERN_INFO "%s: irq %d\n", __FUNCTION__, data->penirq);
+			init_completion(&data->tstask_completion);
+			init_completion(&data->penirq_completion);
+		} else {
+			printk(KERN_ERR "%s: cannot grab irq %d\n", __FUNCTION__, data->penirq);
+		}
+	}
 
-/*
-static int tsc2003_probe (struct device *dev)
-{
-  //struct platform_device *p = to_platform_device(dev);  
-  struct tsc2003_data *d = container_of(dev->driver, struct tsc2003_data, driver);
-  int ret = 0;  
-  int error;
- 
-  printk(KERN_ERR "TSC2003: tsc2003_probe probing...\n"); 
-
-  error = tsc2003_detect_irq(d);
-   if(error)
-   {
-	printk(KERN_ERR "TSC2003: IRQ probe failed\n");
-   }
-
-   if (d->penirq)
-   {
-      ret = request_irq(d->penirq, tsc2003_penirq, IRQF_TRIGGER_FALLING, DRIVER_NAME, d);
-      if (!ret)
-        {
-          printk(KERN_INFO "%s: irq %d\n", __FUNCTION__, d->penirq);
-        }
-       else
-        {
-	  printk(KERN_INFO "%s: cannot grab irq %d\n", __FUNCTION__, d->penirq);
-        }
-    }
-
-#if defined(CONFIG_SYSFS) && defined(CONFIG_SENSORS_TSC2003_SYSFS)
-  ret = kernel_thread(tsc2003s_thread, d, CLONE_KERNEL);
-  if (ret >= 0)
-    ret = 0;
-
-  device_create_file(dev, &dev_attr_addr);
-  device_create_file(dev, &dev_attr_vbat1);
-  device_create_file(dev, &dev_attr_vbat2);
-  device_create_file(dev, &dev_attr_in1);
-  device_create_file(dev, &dev_attr_in2);
-  device_create_file(dev, &dev_attr_temp0);
-  device_create_file(dev, &dev_attr_temp1);
-#endif
+	idev = input_allocate_device();
+	data->idev = idev;
 
+	idev->private = data;
+	idev->name = DRIVER_NAME;
+	idev->evbit[0] = BIT(EV_ABS);
+	idev->open = tsc2003_idev_open;
+	idev->close = tsc2003_idev_close;
+	idev->absbit[LONG(ABS_X)] = BIT(ABS_X);
+	idev->absbit[LONG(ABS_Y)] = BIT(ABS_Y);
+	idev->absbit[LONG(ABS_PRESSURE)] = BIT(ABS_PRESSURE);
+	input_set_abs_params(idev, ABS_X, 0, ADC_MAX, 0, 0);
+	input_set_abs_params(idev, ABS_Y, 0, ADC_MAX, 0, 0);
+	input_set_abs_params(idev, ABS_PRESSURE, 0, 0, 0, 0);
 
-  return ret;
-}
-*/
+	if (!ret) {
+		input_register_device(idev);
+		printk(KERN_INFO "tsc2003 - registering input device\n");
+	}
 
-static int tsc2003_driver_register (struct tsc2003_data *data)
-{
-  struct input_dev *idev;
-  int ret = 0;
-  int error;  
-
-  init_MUTEX(&data->sem);
-
-  init_timer(&data->penirq_timer);
-  data->penirq_timer.data = (unsigned long)data;
-  data->penirq_timer.function = tsc2003_pen_up;  
-
-  error = tsc2003_detect_irq(data);
-   if(error)
-   {
-	printk(KERN_ERR "TSC2003: IRQ probe failed\n");
-   }
-
-   if (data->penirq)
-   {
-      ret = request_irq(data->penirq, tsc2003_penirq, IRQF_TRIGGER_FALLING, DRIVER_NAME, data);
-      if (!ret)
-        {
-          printk(KERN_INFO "%s: irq %d\n", __FUNCTION__, data->penirq);
-	  init_completion(&data->tstask_completion);
-	  init_completion(&data->penirq_completion);
-        }
-       else
-        {
-	  printk(KERN_ERR "%s: cannot grab irq %d\n", __FUNCTION__, data->penirq);
-        }
-    }
-  
-  idev = input_allocate_device();
-  data->idev = idev;
-
-  idev->private = data;
-  idev->name = DRIVER_NAME;
-  idev->evbit[0] = BIT(EV_ABS);
-  idev->open = tsc2003_idev_open;
-  idev->close = tsc2003_idev_close;
-  idev->absbit[LONG(ABS_X)] = BIT(ABS_X);
-  idev->absbit[LONG(ABS_Y)] = BIT(ABS_Y);
-  idev->absbit[LONG(ABS_PRESSURE)] = BIT(ABS_PRESSURE);
-  input_set_abs_params(idev, ABS_X, 0, ADC_MAX, 0, 0);
-  input_set_abs_params(idev, ABS_Y, 0, ADC_MAX, 0, 0);
-  input_set_abs_params(idev, ABS_PRESSURE, 0, 0, 0, 0);
-
-  if (!ret)
-  {
-    input_register_device(idev);
-        printk(KERN_INFO "tsc2003 - registering input device\n");
-  }
-
-  return ret;
+	return ret;
 }
 
-static int tsc2003_i2c_attach_adapter(struct i2c_adapter *adapter)
-{
-  printk(KERN_INFO "tsc2003 i2c touch screen controller\n");
-  printk(KERN_INFO "Bill Gatliff <bgat at billgatliff.com\n");
-  printk(KERN_INFO "Nicholas Chen <nchen at cs.umd.edu>\n");
- 
-  return i2c_probe(adapter, &addr_data, tsc2003_i2c_detect);
+static int tsc2003_i2c_attach_adapter(struct i2c_adapter *adapter) {
+	printk(KERN_INFO "tsc2003 i2c touch screen controller\n");
+	printk(KERN_INFO "Bill Gatliff <bgat at billgatliff.com\n");
+    printk(KERN_INFO "Nicholas Chen <nchen at cs.umd.edu>\n");
+
+    return i2c_probe(adapter, &addr_data, tsc2003_i2c_detect);
 }
 
-static int tsc2003_i2c_detach_client(struct i2c_client *client)
-{
-  int err;  
-  struct tsc2003_data *d = i2c_get_clientdata(client);
+static int tsc2003_i2c_detach_client(struct i2c_client *client) {
+	int err;
+	struct tsc2003_data *d = i2c_get_clientdata(client);
 
-  free_irq(d->penirq,d);
-  input_unregister_device(d->idev);
+	free_irq(d->penirq, d);
+	input_unregister_device(d->idev);
 
-  if ((err = i2c_detach_client(client))) {
-    dev_err(&client->dev, "Client deregistration failed, "
-            "client not detached.\n");
-    return err;
-  }
+	if ((err = i2c_detach_client(client))) {
+		dev_err(&client->dev, "Client deregistration failed, "
+			"client not detached.\n");
+		return err;
+	}
 
-  return 0;
+	return 0;
 }
 
-static struct i2c_driver tsc2003_driver = {
-  .driver = {
-	  .owner        = THIS_MODULE,
-	  .name         = DRIVER_NAME,
-   },
-  .attach_adapter    = tsc2003_i2c_attach_adapter,
-  .detach_client    = tsc2003_i2c_detach_client,
-  //  .command              = tsc2003_command,
+static struct i2c_driver tsc2003_driver = { 
+    .driver = {
+	    .owner = THIS_MODULE,
+	    .name = DRIVER_NAME,
+    }, 
+    .attach_adapter = tsc2003_i2c_attach_adapter,
+    .detach_client = tsc2003_i2c_detach_client, 
 };
 
-static int tsc2003_i2c_detect (struct i2c_adapter *adapter, int address, 
-int kind)
-{
-  struct i2c_client *new_client;
-  struct tsc2003_data *data;
-
-  int err = 0;
-  const char *name = "";
-
-  if (!i2c_check_functionality(adapter,
-                               I2C_FUNC_SMBUS_BYTE_DATA
-                               | I2C_FUNC_I2C
-                               | I2C_FUNC_SMBUS_WORD_DATA))
-    goto exit;
-
-  data = kcalloc(1, sizeof(*data), GFP_KERNEL);
-  if (!data) {
-    err = -ENOMEM;
-    goto exit;
-  }
-
-  new_client = &data->client;
-  i2c_set_clientdata(new_client, data);
-  new_client->addr = address;
-  new_client->adapter = adapter;
-  new_client->driver = &tsc2003_driver;
-  new_client->flags = 0;
-
-  /* TODO: I'm pretty sure I'm not dealing with kind correctly */
-  if (kind == 0 /* identification */ || kind < 0 /* detection */)
-      kind = tsc2003;
-
-  if (kind == tsc2003)
-    name = DRIVER_NAME;
-
-  /* try a command, see if we get an ack;
-     if we do, assume it's our device */
-  printk(KERN_INFO "%s: probing address 0x%x\n",
-         __FUNCTION__, address);
-  err = tsc2003_powerdown(data);
-  if (err >= 0)
-    {
-      strlcpy(new_client->name, name, I2C_NAME_SIZE);
-      err = i2c_attach_client(new_client);
-      if (err) goto exit_free;
-
-      tsc2003_init_client(new_client);
-
-      err = tsc2003_driver_register(data);
-      if (err < 0) goto exit_free;
-     
-      printk(KERN_INFO "%s: device address 0x%x attached.\n",
-             __FUNCTION__, address);
-      return 0;
-    }
-  /* failure to detect when everything else is ok isn't an error */
-  else err = 0;
-
- exit_free:
-  kfree(new_client);
- exit:
-  return err;
+static int tsc2003_i2c_detect(struct i2c_adapter *adapter, int address, int kind) {
+	struct i2c_client *new_client;
+	struct tsc2003_data *data;
+
+	int err = 0;
+	const char *name = "";
+
+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA
+			| I2C_FUNC_I2C | I2C_FUNC_SMBUS_WORD_DATA))
+		goto exit;
+
+	data = kcalloc(1, sizeof(*data), GFP_KERNEL);
+	if (!data) {
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	new_client = &data->client;
+	i2c_set_clientdata(new_client, data);
+	new_client->addr = address;
+	new_client->adapter = adapter;
+	new_client->driver = &tsc2003_driver;
+	new_client->flags = 0;
+
+	/* TODO: I'm pretty sure I'm not dealing with kind correctly */
+	if (kind == 0 /* identification */|| kind < 0 /* detection */)
+		kind = tsc2003;
+
+	if (kind == tsc2003)
+		name = DRIVER_NAME;
+
+	/* try a command, see if we get an ack;
+	 if we do, assume it's our device */
+	printk(KERN_INFO "%s: probing address 0x%x\n",
+			__FUNCTION__, address);
+	err = tsc2003_powerdown(data);
+	if (err >= 0) {
+		strlcpy(new_client->name, name, I2C_NAME_SIZE);
+		err = i2c_attach_client(new_client);
+		if (err)
+			goto exit_free;
+
+		tsc2003_init_client(new_client);
+
+		err = tsc2003_driver_register(data);
+		if (err < 0)
+			goto exit_free;
+
+		printk(KERN_INFO "%s: device address 0x%x attached.\n",
+				__FUNCTION__, address);
+		return 0;
+	}
+	/* failure to detect when everything else is ok isn't an error */
+	else
+		err = 0;
+
+	exit_free: kfree(new_client);
+	exit: return err;
 }
 
 static int __init tsc2003_init(void)
 {
-  return i2c_add_driver(&tsc2003_driver);
+	return i2c_add_driver(&tsc2003_driver);
 }
 
 static void __exit tsc2003_exit(void)
 {
-  i2c_del_driver(&tsc2003_driver);
+	i2c_del_driver(&tsc2003_driver);
 }
 
 MODULE_AUTHOR("Bill Gatliff <bgat at billgatliff.com>");
@@ -696,4 +470,3 @@ MODULE_LICENSE("GPL");
 
 module_init(tsc2003_init);
 module_exit(tsc2003_exit);
-
diff --git a/packages/linux/gumstix-kernel_2.6.21.bb b/packages/linux/gumstix-kernel_2.6.21.bb
index 3bc7df238a..e71c972053 100644
--- a/packages/linux/gumstix-kernel_2.6.21.bb
+++ b/packages/linux/gumstix-kernel_2.6.21.bb
@@ -1,7 +1,7 @@
 require gumstix-linux.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-       ${@base_contains('MACHINE_FEATURES', 'lcd','file://defconfig', 'file://defconfig-nofb',d)} \
+       file://defconfig \
        file://tsc2003.c \
        file://tsc2003-config.diff;patch=1 \
        file://pxa-regs-additions.patch;patch=1 \
@@ -46,9 +46,37 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
        file://gumstix-pxa270-mmc.patch;patch=1 \
        file://pxafb-18bpp-mode.patch;patch=1 \
        file://smc911x-fixup.patch;patch=1 \
+       file://smc91x-fail-if-no-chip.patch;patch=1 \
+       file://one-wire.patch;patch=1 \
+       ${@base_contains('MACHINE_FEATURES', 'rgb16','file://pxafb-backto16.patch;patch=1', '',d)} \
        "
 
 do_configure_prepend() {
-       ${@base_contains('MACHINE_FEATURES', 'lcd','','mv ${WORKDIR}/defconfig-nofb ${WORKDIR}/defconfig',d)}
+
        cp ${WORKDIR}/tsc2003.c ${S}/drivers/i2c/chips/
+
+       # turn off frame buffer support in kernel if lcd MACHINE_FEATURES not defined    
+       ${@base_contains('MACHINE_FEATURES', 'lcd','','sed -i "s/CONFIG_FB=y/# CONFIG_FB is not set/" ${WORKDIR}/defconfig',d)}
+       ${@base_contains('MACHINE_FEATURES', 'lcd','','sed -i "s/CONFIG_FB_PXA=y/# CONFIG_FB_PXA is not set/" ${WORKDIR}/defconfig',d)}
+       ${@base_contains('MACHINE_FEATURES', 'lcd','','sed -i "s/CONFIG_FRAMEBUFFER_CONSOLE=y/# CONFIG_FRAMEBUFFER_CONSOLE is not set/" ${WORKDIR}/defconfig',d)}
+       ${@base_contains('MACHINE_FEATURES', 'lcd','','sed -i "s/CONFIG_LOGO=y/# CONFIG_LOGO is not set/" ${WORKDIR}/defconfig',d)}
+
+       # if mmcroot MACHINE_FEATURES requested disable jffs2 and enable mmc and ext2 support in kernel
+       ${@base_contains('MACHINE_FEATURES', 'mmcroot','sed -i "s/CONFIG_JFFS2_FS=y/CONFIG_JFFS2_FS=m/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'mmcroot','sed -i "s/CONFIG_EXT2_FS=m/CONFIG_EXT2_FS=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'mmcroot','sed -i "s/CONFIG_MMC=m/CONFIG_MMC=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'mmcroot','sed -i "s/CONFIG_MMC_PXA=m/CONFIG_MMC_PXA=y/" ${WORKDIR}/defconfig','',d)} 
+       ${@base_contains('MACHINE_FEATURES', 'mmcroot','sed -i "s/CONFIG_MMC_BLOCK=m/CONFIG_MMC_BLOCK=y/" ${WORKDIR}/defconfig','',d)} 
+
+       # if cfroot MACHINE_FEATURES requested disable jffs2 and enable pcmcia and ext2 support in kernel
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_JFFS2_FS=y/CONFIG_JFFS2_FS=m/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_EXT2_FS=m/CONFIG_EXT2_FS=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_PCCARD=m/CONFIG_PCCARD=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_PCMCIA=m/CONFIG_PCMCIA=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_PCMCIA_PXA2XX=m/CONFIG_PCMCIA_PXA2XX=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_IDE=m/CONFIG_IDE=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_BLK_DEV_IDE=m/CONFIG_BLK_DEV_IDE=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_BLK_DEV_IDEDISK=m/CONFIG_BLK_DEV_IDEDISK=y/" ${WORKDIR}/defconfig','',d)}
+       ${@base_contains('MACHINE_FEATURES', 'cfroot','sed -i "s/CONFIG_BLK_DEV_IDECS=m/CONFIG_BLK_DEV_IDECS=y/" ${WORKDIR}/defconfig','',d)}
+
 }
diff --git a/packages/linux/linux-2.6.21/simpad/.mtn2git_empty b/packages/linux/linux-2.6.21/simpad/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-2.6.21/simpad/.mtn2git_empty
diff --git a/packages/linux/linux/simpad/defconfig b/packages/linux/linux-2.6.21/simpad/defconfig
index 420d531dc4..420d531dc4 100644
--- a/packages/linux/linux/simpad/defconfig
+++ b/packages/linux/linux-2.6.21/simpad/defconfig
diff --git a/packages/maemo4/libhildonfm.inc b/packages/maemo4/libhildonfm.inc
index b6c20a4499..26c1555e52 100644
--- a/packages/maemo4/libhildonfm.inc
+++ b/packages/maemo4/libhildonfm.inc
@@ -16,6 +16,11 @@ PARALLEL_MAKE = ""
 
 do_stage() {
 	autotools_stage_all
+  if [ ! -d ${STAGING_INCDIR}/hildon-widgets ]
+  then
+    mkdir -p ${STAGING_INCDIR}/hildon-widgets
+  fi
+
 	ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/
 }
 
diff --git a/packages/matchbox-stroke/matchbox-stroke_svn.bb b/packages/matchbox-stroke/matchbox-stroke_svn.bb
index 7afa80d589..a6d6dce07e 100644
--- a/packages/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/packages/matchbox-stroke/matchbox-stroke_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft"
 SECTION = "x11/wm"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
 
 PR="r2"
 
diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb
index 42d92edd9a..b325bb03d3 100644
--- a/packages/mtd/mtd-utils_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils_1.0.0+git.bb
@@ -36,12 +36,12 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
 
 do_install () {
 	install -d ${D}${bindir}
-	install -d ${D}${includedir}
+	install -d ${D}${includedir}/mtd
 	for binary in ${mtd_utils}; do
 		install -m 0755 $binary ${D}${bindir}
 	done
 	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${D}${includedir}
+		install -m 0644 $f ${D}${includedir}/mtd
 	done
 }
 
diff --git a/packages/mtd/mtd-utils_1.1.0.bb b/packages/mtd/mtd-utils_1.1.0.bb
index 679fc7e79e..ed9a8b8441 100644
--- a/packages/mtd/mtd-utils_1.1.0.bb
+++ b/packages/mtd/mtd-utils_1.1.0.bb
@@ -33,12 +33,12 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
 
 do_install () {
 	install -d ${D}${bindir}
-	install -d ${D}${includedir}
+	install -d ${D}${includedir}/mtd
 	for binary in ${mtd_utils}; do
 		install -m 0755 $binary ${D}${bindir}
 	done
 	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${D}${includedir}
+		install -m 0644 $f ${D}${includedir}/mtd
 	done
 }
 
diff --git a/packages/openmoko2/openmoko-browser2/webkit-update.patch b/packages/openmoko2/openmoko-browser2/webkit-update.patch
new file mode 100644
index 0000000000..18e8a88e25
--- /dev/null
+++ b/packages/openmoko2/openmoko-browser2/webkit-update.patch
@@ -0,0 +1,99 @@
+diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac
+--- openmoko-browser2.orig/configure.ac	2007-10-02 09:00:38.000000000 +0200
++++ openmoko-browser2/configure.ac	2008-03-05 12:12:32.954623867 +0100
+@@ -40,7 +40,7 @@
+ # base deps
+ PKG_CHECK_MODULES(OPENMOKO,  libmokoui2    >= 0.1.0)
+ PKG_CHECK_MODULES(GTHREAD,   gthread-2.0           )
+-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk)
++PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0)
+ 
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h
+--- openmoko-browser2.orig/src/browser-data.h	2007-12-12 20:31:07.000000000 +0100
++++ openmoko-browser2/src/browser-data.h	2008-03-05 12:12:50.497959252 +0100
+@@ -27,7 +27,7 @@
+ #ifndef OPENMOKO_BROWSER_DATA_H
+ #define OPENMOKO_BROWSER_DATA_H
+ 
+-#include "webkitwebview.h"
++#include <webkit/webkitwebview.h>
+ 
+ #include <glib.h>
+ #include <gtk/gtk.h>
+diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c
+--- openmoko-browser2.orig/src/current-page.c	2007-12-12 20:31:07.000000000 +0100
++++ openmoko-browser2/src/current-page.c	2008-03-05 12:13:56.032884030 +0100
+@@ -28,8 +28,8 @@
+ #include "current-page.h"
+ 
+ #include <moko-finger-scroll.h>
+-#include <webkitwebframe.h>
+-#include <webkitwebview.h>
++#include <webkit/webkitwebframe.h>
++#include <webkit/webkitwebview.h>
+ 
+ /*
+  * From a list of BrowserPage's in BrowserData::currentPage show
+@@ -42,7 +42,7 @@
+ static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
+ {
+     g_return_if_fail (data->currentPage);
+-    webkit_web_view_go_backward(data->currentPage->webKitPage);
++    webkit_web_view_go_back(data->currentPage->webKitPage);
+ }
+ 
+ static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
+@@ -66,7 +66,7 @@
+     g_assert (page == data->currentPage->webKitPage);
+ 
+     if (prog == 100) {
+-        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page));
++        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page));
+         gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page));
+         gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL);
+     }
+@@ -176,7 +176,7 @@
+      * Update the GtkToolItems
+      */
+     /* XXX ### FIXME TODO check if we should show stop/reload */
+-    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage));
++    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage));
+     gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage));
+     gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL);
+     gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE);
+diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c
+--- openmoko-browser2.orig/src/main.c	2007-12-12 20:31:07.000000000 +0100
++++ openmoko-browser2/src/main.c	2008-03-05 12:14:46.337942098 +0100
+@@ -33,7 +33,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ 
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ #include <moko-finger-scroll.h>
+ #include <moko-stock.h>
+@@ -55,7 +55,6 @@
+     gdk_threads_init ();
+     gdk_threads_enter ();
+     gtk_init (&argc, &argv);
+-    webkit_init ();
+     moko_stock_register ();
+     g_set_application_name (_("Browser"));
+ 
+diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c
+--- openmoko-browser2.orig/src/open-pages-page.c	2007-12-12 20:31:07.000000000 +0100
++++ openmoko-browser2/src/open-pages-page.c	2008-03-05 12:13:37.671282983 +0100
+@@ -28,8 +28,8 @@
+ #include "open-pages-page.h"
+ #include "current-page.h"
+ 
+-#include <webkitwebframe.h>
+-#include <webkitwebview.h>
++#include <webkit/webkitwebframe.h>
++#include <webkit/webkitwebview.h>
+ #include <moko-finger-scroll.h>
+ 
+ #include <glib/gi18n.h>
diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb
index b9c7efed02..b0b56d3e71 100644
--- a/packages/openmoko2/openmoko-browser2_svn.bb
+++ b/packages/openmoko2/openmoko-browser2_svn.bb
@@ -2,10 +2,15 @@ DESCRIPTION = "The OpenMoko Webbrowser"
 SECTION = "openmoko/apps"
 DEPENDS += "intltool libmokoui2 check webkit-gtk"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2
 
+SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
+
 #SRC_URI += "file://fingerscroll.diff;patch=1"
 
+do_compile_prepend() {
+        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
+}
 
diff --git a/packages/opkg/opkg_svn.bb b/packages/opkg/opkg_svn.bb
index 51c83f8968..149f3050cf 100644
--- a/packages/opkg/opkg_svn.bb
+++ b/packages/opkg/opkg_svn.bb
@@ -1,26 +1,21 @@
 DESCRIPTION = "Open Package Manager"
-DESCRIPTION_libipkg = "Open Package Manager Library"
+DESCRIPTION_libopkg = "Open Package Manager Library"
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "curl gpgme"
 PV = "0.0+svnr${SRCREV}"
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http"
+PR = "r1"
 
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http"
 S = "${WORKDIR}/opkg"
 
 inherit autotools pkgconfig
 
 do_stage() {
-        oe_libinstall -so libopkg ${STAGING_LIBDIR}
-        install -d ${STAGING_INCDIR}/libopkg/
-        for f in *.h
-        do
-                install -m 0644 $f ${STAGING_INCDIR}/libopkg/
-        done
+	autotools_stage_all
 }
 
 PACKAGES =+ "libopkg-dev libopkg"
 
 FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
 FILES_libopkg = "${libdir}/*.so.*"
-
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 5288bafbf4..9c4e68dfce 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
-########################################################################################################################
-### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Wed Feb 27 13:29:38 2008
+#######################################################################################################################
+### AUTO-GENERATED by './contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Mar  6 18:04:21 2008
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -127,7 +127,7 @@ PR_python-unixadmin="ml0"
 RDEPENDS_python-unixadmin="python-core"
 FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* "
 
-DESCRIPTION_python-syslog="Python's syslog Interface"
+DESCRIPTION_python-syslog="Python's Syslog Interface"
 PR_python-syslog="ml0"
 RDEPENDS_python-syslog="python-core"
 FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so "
@@ -213,9 +213,9 @@ RDEPENDS_python-mime="python-core python-io"
 FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
 
 DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
-PR_python-sqlite3="ml0"
+PR_python-sqlite3="ml1"
 RDEPENDS_python-sqlite3="python-core"
-FILES_python-sqlite3="${libdir}/python2.5/sqlite3 "
+FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3 "
 
 DESCRIPTION_python-tests="Python Tests"
 PR_python-tests="ml0"
@@ -278,7 +278,7 @@ RDEPENDS_python-db="python-core"
 FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* "
 
 DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
-PR_python-crypt="ml0"
+PR_python-crypt="ml1"
 RDEPENDS_python-crypt="python-core"
 FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so "
 
diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb
index a74c59fdaa..9bb2fdfcd8 100644
--- a/packages/python/python-pycairo_1.4.0.bb
+++ b/packages/python/python-pycairo_1.4.0.bb
@@ -3,7 +3,7 @@ SECTION = "python-devel"
 HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 DEPENDS = "cairo"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz"
 S = "${WORKDIR}/pycairo-${PV}"
@@ -13,4 +13,7 @@ inherit distutils pkgconfig
 do_stage() {
 	install -d ${STAGING_INCDIR}
 	install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
+
+    # nasty pkgconfig fix necessary here
+    sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc
 }
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index e6667cc04b..af907f23c9 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -5,9 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-
-# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml0"
+PR = "ml1"
 
 PYTHON_MAJMIN = "2.5"
 
@@ -82,11 +80,10 @@ do_install() {
 
 require python-${PYTHON_MAJMIN}-manifest.inc
 
-# manual additions
+# manual dependency additions
 RPROVIDES_python-core = "python"
 RRECOMMENDS_python-core = "python-readline"
 RRECOMMENDS_python-crypt = "openssl"
-PR_python-crypt = "ml1"
 
 # add sitecustomize
 FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc
index 43b4b1cd3d..d98a7f88df 100644
--- a/packages/roadmap/roadmap.inc
+++ b/packages/roadmap/roadmap.inc
@@ -1,9 +1,7 @@
 DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." 
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
+AUTHOR = "Paul Fox <pgf@foxharp.boston.ma.us>"
 HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 LICENSE = "GPL"
-RRECOMMENDS = "gpsd flite"
 DEPENDS = "expat"
 
 FILES_${PN} += "${datadir}/roadmap"
@@ -16,3 +14,6 @@ do_install() {
         oe_runmake install
         install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
 }
+
+RRECOMMENDS = "gpsd flite"
+FILES_${PN} += "${datadir}/roadmap"
diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
index e52ab34392..aa7c98affd 100644
--- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -8,10 +8,15 @@ PROVIDES_sharprom-compatible = "\
   virtual/arm-linux-libc-for-gcc \
   virtual/arm-linux-binutils \
   virtual/libc \
+  virtual/libintl \
+  virtual/libiconv \
   virtual/arm-linux-gcc \
   virtual/arm-linux-gcc-initial "
 PR = "r1"
 
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+PACKAGES_DYNAMIC = "glibc-gconv-*"
+
 # This needs to be extracted to /usr/local/arm :
 # SRC_URI = "http://handhelds.org/download/projects/toolchain/archive/cross-2.95.3.tar.bz2"
 
diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb
index 1eea1a14a1..cef9a25931 100644
--- a/packages/tasks/task-openmoko-pim.bb
+++ b/packages/tasks/task-openmoko-pim.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r71"
+PR = "r72"
 
 inherit task
 
@@ -14,7 +14,7 @@ RDEPENDS_task-openmoko-pim = "\
   openmoko-calculator2 \
   openmoko-contacts2 \
   openmoko-dates2 \
-  openmoko-feedreader2 \
+#  openmoko-feedreader2 \
   openmoko-browser2 \
   openmoko-appmanager2 \
   openmoko-tasks2 \
diff --git a/packages/uclibc/uclibc-initial_0.9.26.bb b/packages/uclibc/uclibc-initial_0.9.26.bb
index 840acafeac..c29a498a96 100644
--- a/packages/uclibc/uclibc-initial_0.9.26.bb
+++ b/packages/uclibc/uclibc-initial_0.9.26.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.27.bb b/packages/uclibc/uclibc-initial_0.9.27.bb
index 840acafeac..c29a498a96 100644
--- a/packages/uclibc/uclibc-initial_0.9.27.bb
+++ b/packages/uclibc/uclibc-initial_0.9.27.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.28.bb b/packages/uclibc/uclibc-initial_0.9.28.bb
index 840acafeac..c29a498a96 100644
--- a/packages/uclibc/uclibc-initial_0.9.28.bb
+++ b/packages/uclibc/uclibc-initial_0.9.28.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.29.bb b/packages/uclibc/uclibc-initial_0.9.29.bb
index 840acafeac..aa42fa3d19 100644
--- a/packages/uclibc/uclibc-initial_0.9.29.bb
+++ b/packages/uclibc/uclibc-initial_0.9.29.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_svn.bb b/packages/uclibc/uclibc-initial_svn.bb
index b85dd0e18d..eb57f85b24 100644
--- a/packages/uclibc/uclibc-initial_svn.bb
+++ b/packages/uclibc/uclibc-initial_svn.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb
index d5d1bae4be..4d3a8d9d03 100644
--- a/packages/uclibc/uclibc_0.9.28.bb
+++ b/packages/uclibc/uclibc_0.9.28.bb
@@ -1,12 +1,12 @@
 DEFAULT_PREFERENCE = "1"
-PR = "r10"
+PR = "r11"
 
 require uclibc.inc
 
 # This is the correct KERNEL_SOURCE location, if the uClibc
 # fix_includes.sh script is run (see nokernelheader.patch below)
 # this must be correct.
-KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
+KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}"
 
 SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2"
 
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index 484477c084..9051029cdf 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -33,7 +33,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #as stated above, uclibc needs real kernel-headers
 #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
-KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
+KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}"
 
 SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2"
 
diff --git a/packages/vte/files/.mtn2git_empty b/packages/vte/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vte/files/.mtn2git_empty
diff --git a/packages/vte/files/vte-pkgconfig-fixes.patch b/packages/vte/files/vte-pkgconfig-fixes.patch
new file mode 100644
index 0000000000..2acc7348e7
--- /dev/null
+++ b/packages/vte/files/vte-pkgconfig-fixes.patch
@@ -0,0 +1,47 @@
+Index: vte-0.16.9/configure.in
+===================================================================
+--- vte-0.16.9.orig/configure.in	2007-09-17 23:07:18.000000000 +0100
++++ vte-0.16.9/configure.in	2008-03-05 15:59:04.000000000 +0000
+@@ -381,8 +381,6 @@
+ 
+ # Search for the required modules.
+ PKG_CHECK_MODULES(VTE,[$wantedmodules])
+-NEEDEDPACKAGES="$wantedmodules"
+-AC_SUBST(NEEDEDPACKAGES)
+ 
+ # Check for various optional functions within those modules
+ save_CFLAGS="$CFLAGS"
+@@ -403,10 +401,12 @@
+ 
+ # Require Freetype2. First see if there is suitable pkgconfig file...
+ PKG_CHECK_EXISTS(freetype2 >= 6.1.0,
+-		 [PKG_CHECK_MODULES(FT2, freetype2)], [
++		 [PKG_CHECK_MODULES(FT2, freetype2)
++                 wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [
+ 	# We use our local copy of the macro because packages of
+ 	# freetype's development files don't always include the proper macro.
+-	VTE_CHECK_FT2(6.1.0,,
++	VTE_CHECK_FT2(6.1.0,[
++                      wantedmodules="$wantedmodules freetype2 >= 6.1.0" ],
+ 		      [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])])
+ 
+ # Temporarily pull in the Freetype cflags and libs for checking what's
+@@ -508,6 +508,8 @@
+ CFLAGS="$savecflags"
+ CPPFLAGS="$savecppflags"
+ 
++NEEDEDPACKAGES="$wantedmodules"
++AC_SUBST(NEEDEDPACKAGES)
+ 
+ wcs_funcs_includes="
+ #ifdef HAVE_STRING_H
+Index: vte-0.16.9/vte.pc.in
+===================================================================
+--- vte-0.16.9.orig/vte.pc.in	2007-02-26 21:05:19.000000000 +0000
++++ vte-0.16.9/vte.pc.in	2008-03-05 15:56:37.000000000 +0000
+@@ -11,4 +11,4 @@
+ Requires: @NEEDEDPACKAGES@
+ Libs: -L${libdir} -lvte @OTHERLIBS@
+ Libs.private: @FT2_LIBS@
+-Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@
++Cflags: -I${includedir} @OTHERCFLAGS@
diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc
index e575a5a3fb..e9313cd861 100644
--- a/packages/vte/vte.inc
+++ b/packages/vte/vte.inc
@@ -5,6 +5,8 @@ RDEPENDS = "termcap"
 
 inherit gnome
 
+SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1"
+
 EXTRA_OECONF = "--disable-gtk-doc"
 
 do_stage() {
diff --git a/packages/vte/vte_0.16.9.bb b/packages/vte/vte_0.16.9.bb
index f408632430..5875fd317f 100644
--- a/packages/vte/vte_0.16.9.bb
+++ b/packages/vte/vte_0.16.9.bb
@@ -1,2 +1,2 @@
 require vte.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/webkit/files/GNUmakefile.am b/packages/webkit/files/GNUmakefile.am
index f3ec252ee8..977770a1ed 100644
--- a/packages/webkit/files/GNUmakefile.am
+++ b/packages/webkit/files/GNUmakefile.am
@@ -21,8 +21,10 @@
 #
 # global_cppflags   = CPPFLAGS that apply to JSC, WebCore, and to any
 #                     specific port
-# global_cflags     = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to
+# global_cflags     = CFLAGS that apply to JSC, WebCore, and to
 #                     any specific port
+# global_cxxflags   = CXXFLAGS that apply to JSC, WebCore, and to any
+#                     specific port
 
 srcdir = @srcdir@
 VPATH = @srcdir@
@@ -34,8 +36,6 @@ GENSOURCES := $(top_builddir)/DerivedSources
 CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table
 
 # Libraries and support components
-noinst_LTLIBRARIES :=
-
 noinst_HEADERS :=
 
 noinst_PROGRAMS :=
@@ -49,140 +49,203 @@ EXTRA_DIST :=
 
 #
 # Global flags to CPP
-global_cppflags := 
+global_cppflags :=
 
 global_cppflags += \
-	-I $(srcdir)/JavaScriptCore \
-	-I $(srcdir)/JavaScriptCore/ForwardingHeaders \
-	-I $(srcdir)/JavaScriptCore/wtf \
-	-I $(srcdir)/JavaScriptCore/kjs \
-	-I $(top_builddir)/DerivedSources
+	-I$(srcdir)/JavaScriptCore \
+	-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
+	-I$(srcdir)/JavaScriptCore/wtf \
+	-I$(srcdir)/JavaScriptCore/kjs \
+	-I$(top_builddir)/DerivedSources
 
 # Default compiler flags
 global_cflags := \
 	-Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
 	-Wformat -Wformat-security -Wno-format-y2k -Wundef \
 	-Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
-	-Wno-unused-parameter -fno-exceptions -fno-strict-aliasing
+	-Wno-unused-parameter
 
-# Libraries
-lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la
+global_cxxflags := \
+	$(SYMBOL_VISIBILITY_INLINES)
+
+if !ENABLE_DEBUG
+global_cflags += \
+	-fno-exceptions \
+	$(SYMBOL_VISIBILITY)
+
+global_cxxflags += \
+	-fno-rtti
+endif
+
+# Shared libraries
+lib_LTLIBRARIES = \
+	libwebkit-1.0.la
+
+# Convenience libraries
+noinst_LTLIBRARIES = \
+	libJavaScriptCore.la \
+	libWebCore.la
 
 #
 # JavaScriptCore
 javascriptcore_h_api :=
 javascriptcore_cppflags:=
 javascriptcore_sources :=
-javascriptcore_built_sources := 
+javascriptcore_built_sources :=
 javascriptcore_built_nosources :=
 
 # The variables above are already included below so no need to touch
 # these variables unless you really have to
-libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore
-libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api)
+libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
+libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
 
-libJavaScriptCore_la_SOURCES := \
+libJavaScriptCore_la_SOURCES = \
 	$(javascriptcore_built_sources) \
 	$(javascriptcore_sources)
 
-libJavaScriptCore_la_LDFLAGS := -lpthread
+libJavaScriptCore_la_LIBADD = \
+	$(ICU_LIBS) \
+	$(GLOBALDEPS_LIBS) \
+	-lpthread
 
-libJavaScriptCore_la_CXXFLAGS := $(global_cflags)
+libJavaScriptCore_la_CXXFLAGS = \
+	$(global_cxxflags) \
+	$(global_cflags) \
+	$(GLOBALDEPS_CFLAGS) \
+	-fstrict-aliasing
 
-libJavaScriptCore_la_CFLAGS := $(global_cflags)
+libJavaScriptCore_la_CFLAGS = \
+	$(global_cflags) \
+	$(GLOBALDEPS_CFLAGS) \
+	-fstrict-aliasing
 
-libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags)
+libJavaScriptCore_la_CPPFLAGS = \
+	$(global_cppflags) \
+	$(javascriptcore_cppflags) \
+	$(ICU_CPPFLAGS)
 
 #
 # WebCore
 webcore_cppflags :=
 webcore_sources :=
 webcore_headers :=
+webcore_libadd :=
 webcore_built_sources :=
 webcore_built_nosources :=
 
-# WebKitGtk
+webcore_cppflags += $(HILDON_CPPFLAGS)
+
+# WebKit
 webkitgtk_h_api :=
 webkitgtk_headers :=
 webkitgtk_sources :=
 webkitgtk_cppflags :=
-webkitgtk_ldflags :=
 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
 webkitgtk_cleanfiles :=
 
-# No need to touch the following variables unless you have to. If you need to change the values
-# for the following variables, use the "webkitgtk_" variables above
-libWebKitGtk_ladir := $(prefix)/include/WebKit
-
-libWebKitGtk_la_HEADERS := $(webkitgtk_h_api)
-
-libWebKitGtk_la_SOURCES := \
+libWebCore_la_SOURCES = \
 	$(webcore_built_sources) \
 	$(webcore_headers) \
-	$(webcore_sources) \
-	$(webkitgtk_built_sources) \
-	$(webkitgtk_headers) \
-	$(webkitgtk_sources)
+	$(webcore_sources)
 
-libWebKitGtk_la_CXXFLAGS := \
-	-fno-rtti \
+libWebCore_la_CXXFLAGS = \
+	-fno-strict-aliasing \
+	$(global_cxxflags) \
 	$(global_cflags) \
-	$(DEPENDENCIES_CFLAGS) \
+	$(GLOBALDEPS_CFLAGS) \
+	$(WEBKITDEPS_CFLAGS) \
+	$(LIBCURL_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(LIBXSLT_CFLAGS) \
-	$(COVERAGE_CFLAGS)
+	$(COVERAGE_CFLAGS) \
+	$(HILDON_CFLAGS)
 
-libWebKitGtk_la_CFLAGS := \
+libWebCore_la_CFLAGS = \
+	-fno-strict-aliasing \
 	$(global_cflags) \
-	$(DEPENDENCIES_CFLAGS) \
+	$(GLOBALDEPS_CFLAGS) \
+	$(WEBKITDEPS_CFLAGS) \
+	$(LIBCURL_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(LIBXSLT_CFLAGS) \
-	$(COVERAGE_CFLAGS)
+	$(COVERAGE_CFLAGS) \
+	$(HILDON_CFLAGS)
 
-libWebKitGtk_la_CPPFLAGS := \
+libWebCore_la_CPPFLAGS = \
+	$(ICU_CPPFLAGS) \
 	$(global_cppflags) \
 	$(webcore_cppflags) \
 	$(webkitgtk_cppflags)
 
-libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la
-
-libWebKitGtk_la_LDFLAGS := \
-	$(webkitgtk_ldflags) \
-	$(DEPENDENCIES_LIBS) \
+libWebCore_la_LIBADD = \
+	libJavaScriptCore.la \
+	$(webcore_libadd) \
+	$(GLOBALDEPS_LIBS) \
+	$(WEBKITDEPS_LIBS) \
+	$(LIBCURL_LIBS) \
 	$(ICU_LIBS) \
 	$(SQLITE3_LIBS) \
 	$(GSTREAMER_LIBS) \
 	$(LIBXSLT_LIBS) \
-	$(COVERAGE_LDFLAGS) \
+	$(HILDON_LIBS) \
 	-lpthread \
-	-ljpeg \
+	-ljpeg
+
+libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
+libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api)
+
+libwebkit_1_0_la_SOURCES = \
+	$(webkitgtk_built_sources) \
+	$(webkitgtk_headers) \
+	$(webkitgtk_sources)
+
+libwebkit_1_0_la_CXXFLAGS = \
+	$(libWebCore_la_CXXFLAGS)
+
+libwebkit_1_0_la_CFLAGS = \
+	$(libWebCore_la_CFLAGS)
+
+libwebkit_1_0_la_CPPFLAGS = \
+	$(libWebCore_la_CPPFLAGS)
+
+libwebkit_1_0_la_LDFLAGS = \
+	$(COVERAGE_LDFLAGS) \
 	-version-info @LIBWEBKITGTK_VERSION@
 
+libwebkit_1_0_la_LIBADD = \
+	libWebCore.la
+
 #
 # Extra checks and flags
 global_cppflags += \
 	-DBUILDING_GTK__=1 \
-	-DUSE_SYSTEM_MALLOC \
 	-DWTF_CHANGES
 
+if !ENABLE_FAST_MALLOC
+global_cppflags += \
+	-DUSE_SYSTEM_MALLOC
+endif
+
 if TARGET_X11
 global_cppflags += -DXP_UNIX
 endif
 
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
-else 
+else
 webkitgtk_cppflags += \
 	-DG_DISABLE_DEPRECATED \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED \
 	-DGDK_DISABLE_DEPRECATED \
 	-DGTK_DISABLE_DEPRECATED \
-	-DPANGO_DISABLE_DEPRECATED \
-	-DGDK_MULTIHEAD_SAFE \
-	-DGTK_MULTIHEAD_SAFE
+	-DPANGO_DISABLE_DEPRECATED
+
+# Might be useful in the future
+#	-DGDK_MULTIHEAD_SAFE \
+#	-DGTK_MULTIHEAD_SAFE
 endif
 
 if !ENABLE_DATABASE
@@ -200,30 +263,30 @@ global_cppflags += \
 endif
 
 if ENABLE_VIDEO
-webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10
+webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
 endif
 
-#
-# WEBKIT GTK+
 webkitgtk_cppflags += \
--I $(top_builddir)/WebKit/gtk/WebView \
+-I$(top_builddir)/WebKit/gtk/webkit \
 -DBUILDING_CAIRO__=1 \
 -DBUILD_WEBKIT
 
 webkitgtk_h_api += \
-	WebKit/gtk/WebView/webkit.h \
-	WebKit/gtk/WebView/webkitdefines.h \
-	WebKit/gtk/WebView/webkitnetworkrequest.h \
-	WebKit/gtk/WebView/webkitwebframe.h \
-	WebKit/gtk/WebView/webkitwebview.h 
+	WebKit/gtk/webkit/webkit.h \
+	WebKit/gtk/webkit/webkitdefines.h \
+	WebKit/gtk/webkit/webkitnetworkrequest.h \
+	WebKit/gtk/webkit/webkitwebbackforwardlist.h \
+	WebKit/gtk/webkit/webkitwebframe.h \
+	WebKit/gtk/webkit/webkitwebhistoryitem.h \
+	WebKit/gtk/webkit/webkitwebsettings.h \
+	WebKit/gtk/webkit/webkitwebview.h
 
 webkitgtk_built_sources += \
-	WebKit/gtk/WebView/webkit-marshal.h \
-	WebKit/gtk/WebView/webkit-marshal.cpp
+	WebKit/gtk/webkit/webkit-marshal.h \
+	WebKit/gtk/webkit/webkit-marshal.cpp
 
 webkitgtk_headers += \
-	WebKit/gtk/WebView/webkitprivate.h \
-	WebKit/gtk/WebView/webkitsettings.h \
+	WebKit/gtk/webkit/webkitprivate.h \
 	WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
 	WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
 	WebKit/gtk/WebCoreSupport/DragClientGtk.h \
@@ -233,37 +296,39 @@ webkitgtk_headers += \
 	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
 
 webkitgtk_sources += \
-	WebKit/gtk/WebView/webkitnetworkrequest.cpp \
-	WebKit/gtk/WebView/webkitprivate.cpp \
-	WebKit/gtk/WebView/webkitsettings.cpp \
-	WebKit/gtk/WebView/webkitwebframe.cpp \
-	WebKit/gtk/WebView/webkitwebview.cpp \
+	WebKit/gtk/webkit/webkitnetworkrequest.cpp \
+	WebKit/gtk/webkit/webkitprivate.cpp \
+	WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
+	WebKit/gtk/webkit/webkitwebframe.cpp \
+	WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
+	WebKit/gtk/webkit/webkitwebsettings.cpp \
+	WebKit/gtk/webkit/webkitwebview.cpp \
 	WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp 
+	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
 
 webkitgtk_cleanfiles += \
 	$(top_builddir)/Programs/GtkLauncher \
-	$(top_builddir)/WebKit/gtk/WebKitGtk.pc
+	$(top_builddir)/WebKit/gtk/webkit-1.0.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc
+pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
 
-WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/WebView/webkit-marshal
-WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/WebView/webkit-marshal.list
+WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal
+WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
 
 stamp_files := \
 	stamp-webkit-marshal.cpp \
 	stamp-webkit-marshal.h
 
-WebKit/gtk/WebView/webkit-marshal.cpp: stamp-webkit-marshal.cpp
+WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp
 	@true
 
-WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h
+WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h
 	@true
 
 stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
@@ -289,7 +354,7 @@ include WebKitTools/GNUmakefile.am
 
 
 # Autogenerated sources
-BUILT_SOURCES := \
+BUILT_SOURCES = \
 	$(javascriptcore_built_sources) \
 	$(javascriptcore_built_nosources) \
 	$(webcore_built_sources) \
@@ -302,7 +367,6 @@ CLEANFILES += \
 	$(webkitgtk_cleanfiles) \
 	$(top_builddir)/Programs/DumpRenderTree \
 	$(top_builddir)/Programs/testkjs \
-	$(top_builddir)/Programs/dftables \
 	$(GENSOURCES)
 
 MAINTAINERCLEANFILES += \
diff --git a/packages/webkit/files/Makefile b/packages/webkit/files/Makefile
index 89344f7a58..fa7ea02426 100644
--- a/packages/webkit/files/Makefile
+++ b/packages/webkit/files/Makefile
@@ -7,16 +7,23 @@ all:
 debug d development dev develop:
 	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
 	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-	
+
 release r deployment dep deploy:
 	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
 	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-	
+
 universal u:
 	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
 	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-clean:
+64:
 	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
 	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
+64u:
+	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+clean:
+	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
diff --git a/packages/webkit/files/Makefile.shared b/packages/webkit/files/Makefile.shared
index a036aacc50..096d32e948 100644
--- a/packages/webkit/files/Makefile.shared
+++ b/packages/webkit/files/Makefile.shared
@@ -15,6 +15,12 @@ release r deployment dep deploy: force
 universal u: force
 	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
 
+64: force
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+64u: force
+	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
 clean:
 	( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri
index 640fa34174..36404ac803 100644
--- a/packages/webkit/files/WebKit.pri
+++ b/packages/webkit/files/WebKit.pri
@@ -58,6 +58,11 @@ CONFIG(release) {
     DEFINES += NDEBUG
 }
 
+gtk-port:CONFIG(debug) {
+    DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED
+# maybe useful for debugging   DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE
+}
+
 BASE_DIR = $$PWD
 qt-port:INCLUDEPATH += \
     $$PWD/WebKit/qt/Api
diff --git a/packages/webkit/files/autogen.sh b/packages/webkit/files/autogen.sh
index b7f7d37b2f..1c0fc61156 100644
--- a/packages/webkit/files/autogen.sh
+++ b/packages/webkit/files/autogen.sh
@@ -1,8 +1,11 @@
 #! /bin/sh
 
+# Allow invocation from a separate build directory; in that case, we change
+# to the source directory to run the auto*, then change back before running configure
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
+ORIGDIR=`pwd`
 cd $srcdir
 
 DIE=0
@@ -37,4 +40,6 @@ autoheader || exit $?
 automake --foreign --add-missing || exit $?
 autoconf || exit $?
 
-./configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+cd $ORIGDIR || exit 1
+
+$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
diff --git a/packages/webkit/files/configure.ac b/packages/webkit/files/configure.ac
index 05c25b94a8..404e5a0d6a 100644
--- a/packages/webkit/files/configure.ac
+++ b/packages/webkit/files/configure.ac
@@ -9,9 +9,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h])
 LIBWEBKITGTK_VERSION=1:0:0
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
-AM_INIT_AUTOMAKE([1.9 foreign tar-ustar subdir-objects])
-
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 AC_CANONICAL_HOST
 
@@ -35,6 +33,9 @@ case "$host" in
      *-*-freebsd*)
        os_freebsd=yes
        ;;
+     *-*-darwin*)
+       os_darwin=yes
+       ;;
 esac
 
 # If CXXFLAGS and CFLAGS are unset, default to -O2
@@ -53,9 +54,20 @@ AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 AM_PROG_CC_STDC
 AC_PROG_CXX
-AC_PROG_CXX_C_O
 AM_PROG_CC_C_O
 
+# check for -fvisibility=hidden compiler support (GCC >= 4)
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
+AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden])
+AC_COMPILE_IFELSE([char foo;],
+      [ AC_MSG_RESULT([yes])
+        SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ],
+        AC_MSG_RESULT([no]))
+CFLAGS="$saved_CFLAGS"
+AC_SUBST(SYMBOL_VISIBILITY)
+AC_SUBST(SYMBOL_VISIBILITY_INLINES)
+
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then
    AC_MSG_ERROR([You need 'perl' to compile WebKit])
@@ -101,10 +113,12 @@ AC_C_VOLATILE
 AC_HEADER_STDC
 AC_HEADER_STDBOOL
 
-# pthread
+# pthread (not needed on Windows)
+if test "$os_win32" = "no"; then
 AC_CHECK_HEADERS([pthread.h],
                  AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exist]),
                  AC_MSG_ERROR([pthread support is required to build WebKit]))
+fi
 
 # libjpeg headers
 AC_CHECK_HEADERS([jpeglib.h])
@@ -116,75 +130,126 @@ if test "$PKG_CONFIG" = "no"; then
 fi
 
 # check for icu-config
+if test "$os_darwin" = "yes"; then
+ICU_CPPFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu"
+ICU_LIBS="-licucore"
+else
 AC_PATH_PROG(icu_config, icu-config, no)
 if test "$icu_config" = "no"; then
    AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.])
 fi
-ICU_CFLAGS=`$icu_config --cflags`
+
+# We don't use --cflags as this gives us a lot of things that we don't
+# necessarily want, like debugging and optimization flags
+# See man (1) icu-config for more info.
+ICU_CPPFLAGS=`$icu_config --cppflags`
 ICU_LIBS=`$icu_config --ldflags`
-AC_SUBST([ICU_CFLAGS])
+AC_SUBST([ICU_CPPFLAGS])
 AC_SUBST([ICU_LIBS])
+fi
 
 # determine the GDK/GTK+ target
-AC_MSG_CHECKING([the target for WebKit GTK+])
-AC_ARG_WITH(webkit_target,
-            AC_HELP_STRING([--with-webkit-target=@<:@x11/win32/quartz/directfb@:>@],
+AC_MSG_CHECKING([the target windowing system])
+AC_ARG_WITH(target,
+            AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@],
                            [Select webkit target [default=x11]]),
-            [],[with_webkit_target="x11"])
+            [],[with_target="x11"])
 
-case "$with_webkit_target" in
+case "$with_target" in
      x11|win32|quartz|directfb) ;;
      *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;;
 esac
 
-AC_MSG_RESULT([$with_webkit_target])
+AC_MSG_RESULT([$with_target])
+
+AC_MSG_CHECKING([for Hildon UI extensions])
+AC_ARG_WITH(hildon,
+            AC_HELP_STRING([--with-hildon],
+                           [Use Hildon UI extensions [default=no]]),
+            [],[with_hildon="no"])
+AC_MSG_RESULT([$with_hildon])
+
+if test "$with_hildon" = "yes"; then
+    HILDON_CPPFLAGS="-DMAEMO_CHANGES"
+    PKG_CHECK_MODULES([HILDON], [hildon-1])
+    AC_SUBST([HILDON_CPPFLAGS])
+    AC_SUBST([HILDON_CFLAGS])
+    AC_SUBST([HILDON_LIBS])
+fi
+
+# determine the http backend
+AC_MSG_CHECKING([the HTTP backend to use])
+AC_ARG_WITH(http_backend,
+            AC_HELP_STRING([--with-http-backend=@<:@curl@:>@],
+                           [Select HTTP backend [default=curl]]),
+            [],[http_backend="curl"])
+
+case "$http_backend" in
+     curl) ;;
+     *) AC_MSG_ERROR([Invalid HTTP backend: must be curl.]) ;;
+esac
+
+AC_MSG_RESULT([$http_backend])
 
 # minimum base dependencies
+CAIRO_REQUIRED_VERSION=1.4
+FONTCONFIG_REQUIRED_VERSION=2.4
+FREETYPE2_REQUIRED_VERSION=9.0
+LIBXML_REQUIRED_VERSION=2.6
+
+# minimum GTK+ base dependencies
 GLIB_REQUIRED_VERSION=2.0
 GOBJECT_REQUIRED_VERSION=2.0
 GTHREAD_REQUIRED_VERSION=2.0
 PANGO_REQUIRED_VERSION=1.0
-CAIRO_REQUIRED_VERSION=1.2
-FONTCONFIG_REQUIRED_VERSION=2.4
-FREETYPE2_REQUIRED_VERSION=9.0
-LIBCURL_REQUIRED_VERSION=7.15
-LIBXML_REQUIRED_VERSION=2.6
+GTK_REQUIRED_VERSION=2.8
 
 # optional modules
-GTK_REQUIRED_VERSION=2.0
+LIBCURL_REQUIRED_VERSION=7.15
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
 GSTREAMER_REQUIRED_VERSION=0.10
 GNOME_VFS_REQUIRED_VERSION=2.0
 
-PKG_CHECK_MODULES([DEPENDENCIES],
+PKG_CHECK_MODULES([GLOBALDEPS],
                   [glib-2.0 >= $GLIB_REQUIRED_VERSION
                   gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
-                  gthread-2.0 >= $GTHREAD_REQUIRED_VERSION
-                  gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                  gthread-2.0 >= $GTHREAD_REQUIRED_VERSION])
+AC_SUBST([GLOBALDEPS_CFLAGS])
+AC_SUBST([GLOBALDEPS_LIBS])
+
+PKG_CHECK_MODULES([WEBKITDEPS],
+                  [gtk+-2.0 >= $GTK_REQUIRED_VERSION
                   pango >= $PANGO_REQUIRED_VERSION
-                  libcurl >= $LIBCURL_REQUIRED_VERSION
                   cairo >= $CAIRO_REQUIRED_VERSION
                   cairo-ft,
                   fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                   freetype2 >= $FREETYPE2_REQUIRED_VERSION
                   libxml-2.0 >= $LIBXML_REQUIRED_VERSION])
-AC_SUBST([DEPENDENCIES_CFLAGS])
-AC_SUBST([DEPENDENCIES_LIBS])
+AC_SUBST([WEBKITDEPS_CFLAGS])
+AC_SUBST([WEBKITDEPS_LIBS])
 
 # check whether to build with debugging enabled
 AC_MSG_CHECKING([whether to do a debug build])
 AC_ARG_ENABLE(debug,
               AC_HELP_STRING([--enable-debug],
                              [turn on debugging [default=no]]),
-              [enable_debug="yes"],[enable_debug="no"])
+              [],[enable_debug="no"])
 AC_MSG_RESULT([$enable_debug])
 
+# check whether to build with cross-document messaging support
+AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support])
+AC_ARG_ENABLE(cross_document_messaging,
+              AC_HELP_STRING([--enable-cross-document-messaging],
+                             [enable HTML5 cross-document messaging support [default=yes]]),
+              [],[enable_cross_document_messaging="yes"])
+AC_MSG_RESULT([$enable_cross_document_messaging])
+
 # check whether to build with database support
 AC_MSG_CHECKING([whether to enable HTML5 client-side storage support])
 AC_ARG_ENABLE(database,
               AC_HELP_STRING([--enable-database],
-                             [enable HTML5 client-side storage support [default=no]]),
+                             [enable HTML5 client-side storage support [default=yes]]),
               [],[enable_database="yes"])
 AC_MSG_RESULT([$enable_database])
 
@@ -201,14 +266,14 @@ AC_MSG_CHECKING([whether to enable HTML5 video support])
 AC_ARG_ENABLE(video,
               AC_HELP_STRING([--enable-video],
                              [enable HTML5 video support [default=no]]),
-              [enable_video="yes"],[enable_video="no"])
+              [],[enable_video="no"])
 AC_MSG_RESULT([$enable_video])
 
 # check whether to enable XPath support
 AC_MSG_CHECKING([whether to enable XPath support])
 AC_ARG_ENABLE(xpath,
               AC_HELP_STRING([--enable-xpath],
-                             [enable support for XPath [default=no]]),
+                             [enable support for XPath [default=yes]]),
               [],[enable_xpath="yes"])
 AC_MSG_RESULT([$enable_xpath])
 
@@ -216,10 +281,29 @@ AC_MSG_RESULT([$enable_xpath])
 AC_MSG_CHECKING([whether to enable XSLT support])
 AC_ARG_ENABLE(xslt,
               AC_HELP_STRING([--enable-xslt],
-                             [enable support for XSLT [default=no]]),
+                             [enable support for XSLT [default=yes]]),
               [],[enable_xslt="yes"])
 AC_MSG_RESULT([$enable_xslt])
 
+# check whether to enable SVG experimental features
+# Enable all SVG if it is
+AC_MSG_CHECKING([whether to enable SVG experimental features])
+AC_ARG_ENABLE(svg_experimental,
+              AC_HELP_STRING([--enable-svg-experimental],
+                             [enable support for SVG experimental features [default=no]]),
+              [],[enable_svg_experimental="no"])
+AC_MSG_RESULT([$enable_svg_experimental])
+
+if test "$enable_svg_experimental" = "yes"; then
+   enable_svg=yes
+   enable_svg_animation=yes
+#   enable_svg_filters=yes
+   enable_svg_fonts=yes
+   enable_svg_foreign_object=yes
+   enable_svg_as_image=yes
+   enable_svg_use_element=yes
+fi
+
 # check whether to enable SVG support
 AC_MSG_CHECKING([whether to enable SVG support])
 AC_ARG_ENABLE(svg,
@@ -229,10 +313,10 @@ AC_ARG_ENABLE(svg,
 AC_MSG_RESULT([$enable_svg])
 
 # check whether to enable support for SVG animation
-AC_MSG_CHECKING([whether to enable support for SVG animataion])
+AC_MSG_CHECKING([whether to enable support for SVG animation])
 AC_ARG_ENABLE(svg_animation,
               AC_HELP_STRING([--enable-svg-animation],
-                             [enable support for SVG animation feature (experimental) [default=no]]),
+                             [enable support for SVG animation (experimental) [default=no]]),
               [],[enable_svg_animation="no"])
 AC_MSG_RESULT([$enable_svg_animation])
 
@@ -252,6 +336,14 @@ AC_ARG_ENABLE(svg_fonts,
               [],[enable_svg_fonts="no"])
 AC_MSG_RESULT([$enable_svg_fonts])
 
+# check whether to enable foreign objects support for SVG
+AC_MSG_CHECKING([whether to enable support for SVG foreign objects])
+AC_ARG_ENABLE(svg_foreign_object,
+              AC_HELP_STRING([--enable-svg-foreign-object],
+                             [enable support for SVG foreign objects (experimental) [default=no]]),
+              [],[enable_svg_foreign_object="no"])
+AC_MSG_RESULT([$enable_svg_foreign_object])
+
 # check whether to enable SVG As Image support
 AC_MSG_CHECKING([whether to enable SVG as Image support])
 AC_ARG_ENABLE(svg_as_image,
@@ -276,19 +368,35 @@ AC_ARG_ENABLE(coverage,
               [],[enable_coverage="no"])
 AC_MSG_RESULT([$enable_coverage])
 
+# check whether to enable FastMalloc
+AC_MSG_CHECKING([whether to enable optimized memory allocator])
+AC_ARG_ENABLE(fast_malloc,
+              AC_HELP_STRING([--enable-fast-malloc],
+                             [enable optimized memory allocator default=yes, default=no for debug builds]),
+              [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi])
+AC_MSG_RESULT([$enable_fast_malloc])
+
 # Add '-g' flag to gcc if it's debug build
 if test "$enable_debug" = "yes"; then
    CXXFLAGS="$CXXFLAGS -g"
    CFLAGS="$CFLAGS -g"
 fi
 
+# check if curl is available
+if test "$http_backend" = "curl"; then
+   PKG_CHECK_MODULES([LIBCURL],
+                     [libcurl >= $LIBCURL_REQUIRED_VERSION])
+   AC_SUBST([LIBCURL_CFLAGS])
+   AC_SUBST([LIBCURL_LIBS])
+fi
+
 # check if sqlite 3 is available
 if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then
    PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION])
    AC_SUBST([SQLITE3_CFLAGS])
    AC_SUBST([SQLITE3_LIBS])
 fi
-  
+
 # check if libxslt is available
 if test "$enable_xslt" = "yes"; then
    PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION])
@@ -316,16 +424,17 @@ if test "$enable_coverage" = "yes"; then
 fi
 
 # check for SVG features, enabling SVG if necessary
-if test "$enable_svg" = "no" && (\
-   test "$enable_svg_animation" = "yes" || \
+if test "$enable_svg_animation" = "yes" || \
    test "$enable_svg_filters" = "yes" || \
    test "$enable_svg_fonts" = "yes" || \
+   test "$enable_svg_foreign_object" = "yes" || \
    test "$enable_svg_as_image" = "yes" || \
-   test "$enable_svg_use_element" = "yes"); then
-
-   AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
-   enable_svg = yes
-   svg_flags = yes
+   test "$enable_svg_use_element" = "yes"; then
+   svg_flags=yes
+   if test "$enable_svg" = "no"; then
+       AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
+       enable_svg=yes
+   fi
 fi
 
 # OS conditionals
@@ -335,13 +444,17 @@ AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"])
 AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
 
 # target conditionals
-AM_CONDITIONAL([TARGET_X11], [test "$with_webkit_target" = "x11"])
-AM_CONDITIONAL([TARGET_WIN32], [test "$with_webkit_target" = "win32"])
-AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_webkit_target" = "quartz"])
-AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_webkit_target" = "directfb"])
+AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"])
+AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
+AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
+AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
+
+# HTTP backend conditionals
+AM_CONDITIONAL([USE_CURL], [test "$http_backend" = "curl"])
 
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
+AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"])
 AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
 AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
 AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
@@ -351,14 +464,16 @@ AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
+AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"])
 AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
+AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
 AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
 
 AC_CONFIG_FILES([
 GNUmakefile
-WebKit/gtk/WebKitGtk.pc:WebKit/gtk/WebKitGtk.pc.in
+WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in
 ]
 )
 
@@ -367,9 +482,13 @@ AC_OUTPUT
 echo "
 WebKit was configured with the following options:
 
- Target                            : $with_webkit_target
- Enable debug                      : $enable_debug
+Build configuration:
+ Enable debugging (slow)           : $enable_debug
  Code coverage support             : $enable_coverage
+ HTTP backend                      : $http_backend
+ Optimized memory allocator        : $enable_fast_malloc
+Features:
+ HTML5 cross-document messaging    : $enable_cross_document_messaging
  HTML5 client-side storage support : $enable_database
  HTML5 video element support       : $enable_video
  Icon database support             : $enable_icon_database
@@ -377,8 +496,12 @@ WebKit was configured with the following options:
  SVG animation support             : $enable_svg_animation
  SVG filters support               : $enable_svg_filters
  SVG fonts support                 : $enable_svg_fonts
+ SVG foreign object support        : $enable_svg_foreign_object
  SVG as image support              : $enable_svg_as_image
  SVG use element support           : $enable_svg_use_element
  XPATH support                     : $enable_xpath
  XSLT support                      : $enable_xslt
+GTK+ configuration:
+ GDK target                        : $with_target
+ Hildon UI extensions              : $with_hildon
 "
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 6a99a96001..4fe9cb8a00 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -1,32 +1,59 @@
-DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
+DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3"
 
-# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need:
-# DEPENDS += " gstreamer gst-plugins-base gnome-vfs "
+SRCREV_FORMAT = "webcore-rwebkit"
 
+# Yes, this is wrong...
+PV = "0.1+svnr${SRCREV}"
+PR = "r4"
 
-WEBKIT_PORT = "gtk-port"
-WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
-
-FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
-FILES_webkit-gtklauncher-dbg += "${bindir}/.debug/GtkLauncher"
-
-require webkit.inc
+SRC_URI = "\
+  svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
+  file://Makefile \
+  file://Makefile.shared \
+  file://autogen.sh \
+  file://configure.ac \
+  file://GNUmakefile.am \
+ "
+
+S = "${WORKDIR}/"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+                --enable-debug=no \
+                --enable-svg \
+                --enable-icon-database=yes \
+               "
+
+do_compile_prepend() {
+        mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+        mkdir -p ${S}/Programs/
+	cd ${S}/JavaScriptCore/pcre
+        if test -e dftables.c
+        then
+            ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+        elif test -e dftables.cpp
+        then
+            ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
+        fi
+        cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+        cp dftables ${S}/Programs/        
+	cd ${S}
+}
 
-SRC_URI += "file://autogen.sh \
-            file://configure.ac \
-            file://GNUmakefile.am \
-	   "
+do_stage() {
+	autotools_stage_all
+}
 
-PR = "r4"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore"
+FILES_${PN}launcher = "${bindir}/GtkLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
+FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*"
 
-do_install() {
-	install -d ${D}${bindir}
-	install -d ${D}${libdir}
-	install -d ${D}${libdir}/pkgconfig
 
-	install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir}
-	cd ${S}/WebKitBuilds/Debug
-	PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
-	oe_runmake install
-}
 
diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc
index 81c2d91bf8..087115de09 100644
--- a/packages/webkit/webkit.inc
+++ b/packages/webkit/webkit.inc
@@ -1,3 +1,4 @@
+DESCRIPTION = "WebKit browser engine, GTK+ edition"
 DEPENDS += "flex-native gperf-native perl-native sqlite3"
 SRCREV_FORMAT = "webcore-rwebkit"
 
diff --git a/packages/woodstox/.mtn2git_empty b/packages/woodstox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/woodstox/.mtn2git_empty
diff --git a/packages/woodstox/woodstox2_2.0.6.bb b/packages/woodstox/woodstox2_2.0.6.bb
new file mode 100644
index 0000000000..390c4ff3f0
--- /dev/null
+++ b/packages/woodstox/woodstox2_2.0.6.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "High-performance XML processor."
+LICENSE = "AL2.0 LGPL2.1"
+
+AUTHOR = "Codehaus"
+HOMEPAGE = "http://woodstox.codehaus.org"
+
+SRC_URI = "http://woodstox.codehaus.org/2.0.6/wstx-src.tar.gz"
+
+S = "${WORKDIR}"
+
+inherit java-library
+
+DEPENDS = "fastjar-native"
+
+do_compile() {
+  mkdir -p build/META-INF/services
+
+  javac -nowarn -sourcepath src/java -d build \
+		`find src/java/org -name "*.java"` \
+		`find src/java/com -name "*.java"`
+
+  cp -r src/resources/* build/META-INF/services
+
+  fastjar -C build -c -f ${JARFILENAME} .
+}
diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb
index 231122194b..e9cd7ee9b7 100644
--- a/packages/xoo/xoo_svn.bb
+++ b/packages/xoo/xoo_svn.bb
@@ -3,7 +3,7 @@ It is intended for embedded developers that want to simulate a target device \
 (with an accurate display size, working hardware buttons, etc) on a desktop machine."
 HOMEPAGE = "http://projects.o-hand.com/xoo"
 LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
+DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat"
 PV = "0.7+svnr${SRCREV}"
 PR = "r1"
 
diff --git a/packages/xorg-lib/libx11/include_fix.patch b/packages/xorg-lib/libx11/include_fix.patch
new file mode 100644
index 0000000000..565308834e
--- /dev/null
+++ b/packages/xorg-lib/libx11/include_fix.patch
@@ -0,0 +1,62 @@
+---
+ configure.ac |   44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+Index: libX11-1.1.2/configure.ac
+===================================================================
+--- libX11-1.1.2.orig/configure.ac	2008-01-02 15:30:47.000000000 +0000
++++ libX11-1.1.2/configure.ac	2008-01-02 15:47:25.000000000 +0000
+@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
+ #
+ KEYSYMDEF=""
+ AC_MSG_CHECKING([keysymdef.h])
+-for flag in $XPROTO_CFLAGS -I/usr/include; do
+-	case "$KEYSYMDEF" in
+-	"")
+-		case "$flag" in
+-		*-I*)
+-			dir=`echo "$flag" | sed 's/ *-I//'`
+-			file="$dir/X11/keysymdef.h"
+-			if test -f "$file"; then
+-				KEYSYMDEF="$file"
+-			fi
++AC_ARG_WITH(keysymdef,
++	AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),  
++	KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++	for flag in $XPROTO_CFLAGS -I/usr/include; do
++		case "$KEYSYMDEF" in
++		"")
++			case "$flag" in
++			*-I*)
++				dir=`echo "$flag" | sed 's/ *-I//'`
++				file="$dir/X11/keysymdef.h"
++				if test -f "$file"; then
++					KEYSYMDEF="$file"
++				fi
++				;;
++			esac
+ 			;;
+ 		esac
+-		;;
+-	esac
+-done
+-case "$KEYSYMDEF" in
+-"")
+-	AC_MSG_ERROR([Cannot find keysymdef.h])
+-	;;
+-*)
++	done
++fi
++
++if test -f "$KEYSYMDEF"; then
+ 	AC_MSG_RESULT([$KEYSYMDEF])
+-        ;;
+-esac
++else
++	AC_MSG_ERROR([Cannot find keysymdef.h])
++fi
+ AC_SUBST(KEYSYMDEF)
+ 
+ AC_ARG_ENABLE(udc,
diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
index e6b0ec5d8b..5243de4259 100644
--- a/packages/xorg-lib/libx11_1.1.2.bb
+++ b/packages/xorg-lib/libx11_1.1.2.bb
@@ -5,19 +5,21 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r1"
+PR = "r3"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb"
+SRC_URI += "file://include_fix.patch;patch=1" 
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
 do_compile() {
-        (
-         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-         cd ../../
-        ) || exit 1
-        oe_runmake
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+		cd ../../
+	) || exit 1
+	oe_runmake
 }
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
diff --git a/packages/xorg-lib/libx11_1.1.3.bb b/packages/xorg-lib/libx11_1.1.3.bb
index 4035c77cdc..5243de4259 100644
--- a/packages/xorg-lib/libx11_1.1.3.bb
+++ b/packages/xorg-lib/libx11_1.1.3.bb
@@ -5,19 +5,21 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
-PR = "r0"
+PR = "r3"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += "--without-xcb"
+SRC_URI += "file://include_fix.patch;patch=1" 
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
 
 do_compile() {
-        (
-         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-         cd ../../
-        ) || exit 1
-        oe_runmake
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+		cd ../../
+	) || exit 1
+	oe_runmake
 }
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
new file mode 100644
index 0000000000..a30a37c893
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/packages/zlib/zlib-native_1.2.3.bb b/packages/zlib/zlib-native_1.2.3.bb
index 8ad4a8c03c..246bf2835c 100644
--- a/packages/zlib/zlib-native_1.2.3.bb
+++ b/packages/zlib/zlib-native_1.2.3.bb
@@ -1,4 +1,3 @@
-SECTION = "libs"
 require zlib_${PV}.bb
 ZLIB_EXTRA = ""
 inherit native
diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc
index 81d2c54aae..5120795f7a 100644
--- a/site/arm-linux-uclibc
+++ b/site/arm-linux-uclibc
@@ -4,6 +4,7 @@ ac_cv_func_setgrent_void=yes
 ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_malloc_works=yes
 ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
 ac_cv_func_setvbuf_reversed=no
 ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/site/armeb-linux b/site/armeb-linux
index 1b170ab191..d75c1c8bb1 100644
--- a/site/armeb-linux
+++ b/site/armeb-linux
@@ -4,6 +4,7 @@ ac_cv_func_setgrent_void=yes
 ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_malloc_works=yes
 ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
 ac_cv_func_setvbuf_reversed=no
 ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/site/armeb-linux-uclibc b/site/armeb-linux-uclibc
index 1ab44977dd..02c63e4258 100644
--- a/site/armeb-linux-uclibc
+++ b/site/armeb-linux-uclibc
@@ -4,6 +4,7 @@ ac_cv_func_setgrent_void=yes
 ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_malloc_works=yes
 ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
 ac_cv_func_setvbuf_reversed=no
 ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
diff --git a/site/ix86-common b/site/ix86-common
index 00c544f382..a5c4b60805 100644
--- a/site/ix86-common
+++ b/site/ix86-common
@@ -134,6 +134,7 @@ glib_cv_stack_grows=${glib_cv_stack_grows=no}
 utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
 ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
 glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
 
 # guile
 ac_cv_sys_restartable_syscalls=yes